[SCM] Civilization turn-based strategy game branch, master, updated. debian/2.1.5-2-6-gefbe270

Clint Adams schizo at debian.org
Thu Feb 19 02:34:10 UTC 2009


The following commit has been merged in the master branch:
commit 78cedb15188cc70bbf5839dc87387086d7451e11
Author: Clint Adams <schizo at debian.org>
Date:   Wed Feb 18 20:37:25 2009 -0500

    Imported Upstream version 2.1.8

diff --git a/ChangeLog b/ChangeLog
index a6d2838..4523e45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,1199 @@
 
+Sun, 30 Nov 2008 03:48:06 -0800  dmarks:
+
+	Changed paths:
+	   M /branches/S2_1/po/ar.po
+	   M /branches/S2_1/po/ca.po
+	   M /branches/S2_1/po/cs.po
+	   M /branches/S2_1/po/da.po
+	   M /branches/S2_1/po/de.po
+	   M /branches/S2_1/po/el.po
+	   M /branches/S2_1/po/en_GB.po
+	   M /branches/S2_1/po/eo.po
+	   M /branches/S2_1/po/es.po
+	   M /branches/S2_1/po/et.po
+	   M /branches/S2_1/po/fa.po
+	   M /branches/S2_1/po/fi.po
+	   M /branches/S2_1/po/fr.po
+	   M /branches/S2_1/po/he.po
+	   M /branches/S2_1/po/hu.po
+	   M /branches/S2_1/po/it.po
+	   M /branches/S2_1/po/ja.po
+	   M /branches/S2_1/po/lt.po
+	   M /branches/S2_1/po/nl.po
+	   M /branches/S2_1/po/no.po
+	   M /branches/S2_1/po/pl.po
+	   M /branches/S2_1/po/pt.po
+	   M /branches/S2_1/po/pt_BR.po
+	   M /branches/S2_1/po/ro.po
+	   M /branches/S2_1/po/ru.po
+	   M /branches/S2_1/po/sv.po
+	   M /branches/S2_1/po/tr.po
+	   M /branches/S2_1/po/uk.po
+	   M /branches/S2_1/po/zh_CN.po
+
+	Commit updates after running 'make update-po'
+
+
+Sun, 30 Nov 2008 03:46:45 -0800  dmarks:
+
+	Changed paths:
+	   M /branches/S2_1/po/ko.po
+
+	2463 translated messages, 1827 untranslated messages.
+
+
+Fri, 28 Nov 2008 16:59:19 -0800  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/common/connection.c
+	   M /branches/S2_1/server/sernet.c
+
+	Fix longstanding connection freezing bug.
+
+	- Add missing initialization of compression.frozen_level
+	  in connection_common_init().
+	- Also, make finish_processing_request() check for
+	  valid connection to avoid benign warning.
+
+	See #39131
+
+	Reported by: pepeto <pepeto69 at free.fr>
+
+
+Fri, 28 Nov 2008 09:00:54 -0800  jcreus:
+
+	Changed paths:
+	   M /branches/S2_1/po/ca.po
+
+	Ready for takeoff, thanks for the warning
+
+
+Thu, 27 Nov 2008 21:42:33 -0800  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/connecthand.c
+
+	Send information about lost connections not attached to players.
+
+	See #39613
+
+	Reported by: pepeto <pepeto69 at free.fr>
+
+
+Thu, 27 Nov 2008 16:53:06 -0800  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/stdinhand.c
+
+	Send connection info when cmdlevel is changed.
+
+	See #40479
+
+
+Thu, 27 Nov 2008 15:23:31 -0800  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/srv_main.c
+
+	Make aifill player removal recursion safe.
+
+	See #40579
+
+	Reported by: Marko Lindqvist <cazfi74 at gmail.com>
+
+
+Tue, 25 Nov 2008 19:03:25 -0800  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/auth.c
+	   M /branches/S2_1/utility/md5.c
+	   M /branches/S2_1/utility/md5.h
+
+	Fix buffer overrun by create_md5sum().
+
+	See #40578
+
+
+Sun, 23 Nov 2008 12:12:11 -0800  chrisk:
+
+	Changed paths:
+	   M /branches/S2_1/po/de.po
+
+	4290 translated messages.
+
+
+Sun, 23 Nov 2008 07:08:52 -0800  chrisk:
+
+	Changed paths:
+	   M /branches/S2_1/po/de.po
+
+	4289 translated messages, 1 untranslated message.
+
+
+Sat, 22 Nov 2008 23:46:15 -0800  dmarks:
+
+	Changed paths:
+	   M /branches/S2_1/version.in
+
+	Bump version to 2.1.7+
+
+
+Sat, 22 Nov 2008 23:22:25 -0800  dmarks:
+
+	Changed paths:
+	   M /branches/S2_1/ChangeLog
+
+	Update changelog for 2.1.7
+
+
+Sat, 22 Nov 2008 23:02:22 -0800  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/stdinhand.c
+
+	Minor fixes relating to the take command.
+
+	See #40529
+
+
+Sat, 22 Nov 2008 17:39:58 -0800  dmarks:
+
+	Changed paths:
+	   M /branches/S2_1/po/ar.po
+	   M /branches/S2_1/po/ca.po
+	   M /branches/S2_1/po/cs.po
+	   M /branches/S2_1/po/da.po
+	   M /branches/S2_1/po/de.po
+	   M /branches/S2_1/po/el.po
+	   M /branches/S2_1/po/en_GB.po
+	   M /branches/S2_1/po/eo.po
+	   M /branches/S2_1/po/es.po
+	   M /branches/S2_1/po/et.po
+	   M /branches/S2_1/po/fa.po
+	   M /branches/S2_1/po/fi.po
+	   M /branches/S2_1/po/fr.po
+	   M /branches/S2_1/po/he.po
+	   M /branches/S2_1/po/hu.po
+	   M /branches/S2_1/po/it.po
+	   M /branches/S2_1/po/ja.po
+	   M /branches/S2_1/po/ko.po
+	   M /branches/S2_1/po/lt.po
+	   M /branches/S2_1/po/nl.po
+	   M /branches/S2_1/po/no.po
+	   M /branches/S2_1/po/pl.po
+	   M /branches/S2_1/po/pt.po
+	   M /branches/S2_1/po/pt_BR.po
+	   M /branches/S2_1/po/ro.po
+	   M /branches/S2_1/po/ru.po
+	   M /branches/S2_1/po/sv.po
+	   M /branches/S2_1/po/tr.po
+	   M /branches/S2_1/po/uk.po
+	   M /branches/S2_1/po/zh_CN.po
+
+	Commit updates after running 'make update-po'
+
+
+Wed, 12 Nov 2008 20:06:29 -0800  cproc:
+
+	Changed paths:
+	   M /branches/S2_1/m4/win32-client.m4
+	   M /branches/S2_1/m4/xaw-client.m4
+
+	Explicitly call PKG_PROG_PKG_CONFIG for the case that the first call to PKG_CHECK_MODULES does not happen. See PR#40555.
+
+
+Fri, 07 Nov 2008 21:47:59 -0800  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/client/packhand.c
+
+	Remove a hack causing an inconsistent turn done button state.
+
+	See #40550
+
+	Reported by: HanduMan <HanduMan at Savageclub.org>
+
+
+Fri, 07 Nov 2008 10:14:58 -0800  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/po/da.po
+
+	Updated translation by Joe Dalton
+
+
+Mon, 03 Nov 2008 07:35:18 -0800  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/ai/ailog.c
+
+	Renamed OUT as AILOG_OUT to avoid namespace conflicts.
+
+	See #40541
+
+
+Sun, 02 Nov 2008 07:09:02 -0800  chrisk:
+
+	Changed paths:
+	   M /branches/S2_1/po/de.po
+
+	4287 translated messages.
+
+
+Thu, 30 Oct 2008 11:05:29 -0800  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/server/auth.c
+
+	Fixed compiler warnings from auth build
+
+	See #40544
+
+
+Wed, 29 Oct 2008 09:14:38 -0800  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/po/fi.po
+
+	Updated translation by Sini Ruohomaa.
+
+
+Tue, 21 Oct 2008 16:31:10 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/report.c
+	   M /branches/S2_1/server/report.h
+	   M /branches/S2_1/server/settings.c
+	   M /branches/S2_1/server/settings.h
+	   M /branches/S2_1/server/stdinhand.c
+
+	Disallow setting timeout less than 30 for non-hack connections.
+
+	- Added 'struct connection' parameter to all setting validate
+	  callback functions.
+	- Improved some style and formatting in set_command.
+
+	See #40466
+
+
+Sun, 19 Oct 2008 14:00:20 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/generator/mapgen.c
+
+	Fix bug that filled land tiles with water terrain.
+
+	- Thus fix random "infinite loop" assertion failure in map_fractal_generate.
+
+	See #40453
+
+	Reported by:
+	  Christian Knoke <chrisk at cknoke.de>
+	  Madeline Book <madeline.book at gmail.com>
+
+
+Fri, 17 Oct 2008 19:11:29 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/data/stdsounds.soundspec
+
+	Fix typo in soundspec file.
+
+	See #39369
+
+	Reported by:
+	  Castanier Carl <woodswolf at gmail.com>
+	  Jacob Nevins <jacobn+freecivrt at chiark.greenend.org.uk>
+
+
+Thu, 16 Oct 2008 09:42:27 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/ai/ailog.c
+	   M /branches/S2_1/client/agents/cma_fec.c
+	   M /branches/S2_1/client/citydlg_common.c
+	   M /branches/S2_1/client/gui-gtk-2.0/dialogs.c
+	   M /branches/S2_1/client/gui-gtk-2.0/pages.c
+	   M /branches/S2_1/client/gui-gtk-2.0/repodlgs.c
+	   M /branches/S2_1/client/gui-xaw/cma_fe.c
+	   M /branches/S2_1/client/helpdata.c
+	   M /branches/S2_1/client/mapview_common.c
+	   M /branches/S2_1/client/packhand.c
+	   M /branches/S2_1/client/text.c
+	   M /branches/S2_1/server/cityhand.c
+	   M /branches/S2_1/server/savegame.c
+	   M /branches/S2_1/server/scripting/script.c
+	   M /branches/S2_1/server/sernet.c
+	   M /branches/S2_1/server/stdinhand.c
+	   M /branches/S2_1/utility/registry.c
+
+	Fixed "format not a string literal and no format arguments" -warnings
+
+	See #40504
+
+
+Fri, 10 Oct 2008 14:13:58 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/plrhand.c
+	   M /branches/S2_1/server/srv_main.c
+
+	Minor aifill fixes.
+
+	- Setting aifill=0 actually removes all aifill AIs.
+	- Refill AIs when a player is removed.
+
+	See #40481
+
+
+Fri, 10 Oct 2008 13:46:53 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-gtk-2.0/dialogs.c
+
+	Fix assertion failure when picking nation.
+
+	See #40516
+
+
+Tue, 07 Oct 2008 02:56:06 -0700  chrisk:
+
+	Changed paths:
+	   M /branches/S2_1/po/de.po
+
+	4286 translated messages.
+
+
+Tue, 30 Sep 2008 13:10:28 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-gtk-2.0/gotodlg.c
+
+	Fix bad packing parameters in gtk goto dialog.
+
+	See #40119
+
+	Report and patch by: Jacob Nevins <jacobn+freecivrt at chiark.greenend.org.uk>
+
+
+Sat, 27 Sep 2008 20:08:30 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/client/tilespec.c
+	   M /branches/S2_1/client/tilespec.h
+
+	Fix fortress foreground drawing over fog.
+
+	See #40500
+
+	Reported by: Marko Lindqvist <cazfi74 at gmail.com>
+
+
+Sat, 27 Sep 2008 16:17:23 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/client/helpdata.c
+
+	Fix government help text buffer truncation.
+
+	See #40505
+
+	Reported by: Martijn Plass <korenn at live.nl>
+
+
+Sat, 27 Sep 2008 15:54:41 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/plrhand.c
+
+	Do not reveal gold and government information when sending player info.
+
+	- This information was being sent even when players had
+	  no contact. This is changed so that players of less
+	  than INFO_MEETING info level only receive placeholder
+	  values.
+	- Zero is sent as a placeholder for gold.
+	- The "government during revolution" (i.e. anarchy) is
+	  sent as a placeholder for government.
+
+	See #40495
+
+	Reported by: pepeto <pepeto69 at free.fr>
+
+
+Sat, 27 Sep 2008 07:24:45 -0700  cproc:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-sdl/gui_main.c
+	   M /branches/S2_1/client/gui-sdl/widget.c
+	   M /branches/S2_1/client/gui-sdl/widget.h
+
+	Made the meaning of some functions more clear.
+
+
+Thu, 25 Sep 2008 14:29:37 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/sernet.c
+
+	Fix compile warning due to debug message format string.
+
+	See #40445
+
+	Reported by: Tristan Hoffmann <info at tristanhoffmann.de>
+
+
+Wed, 17 Sep 2008 13:06:07 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/client/connectdlg_common.c
+
+	Remove hardcoded sending of autotoggle=1 on savegame load.
+
+	See #40465
+
+
+Fri, 12 Sep 2008 19:15:34 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/settings.c
+	   M /branches/S2_1/server/stdinhand.c
+
+	Move side-effects in setting validate callbacks to set command body.
+
+	See #40480
+
+
+Mon, 08 Sep 2008 11:59:03 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/server/generator/startpos.c
+
+	Do not require so many specials for continent to be acceptable
+	starting place. Also try harder to get acceptable starting positions.
+	Finding acceptable starting positions started fail when separatepoles
+	was fixed, and polar oil is no longer contributing to goodness of
+	continents.
+
+	Problem reported by Madeline, ticket #40453
+
+
+Wed, 27 Aug 2008 12:48:14 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/client/packhand.c
+
+	Do not close races dialog on user join or quit.
+
+	See #40455
+
+	Reported by: Michael Mielke <michael at theta.private.mielke.cc>
+
+
+Sun, 24 Aug 2008 20:31:16 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/client/repodlgs_common.c
+
+	Only send private saved settings on forked servers.
+
+	See #40449
+
+
+Sun, 24 Aug 2008 20:08:30 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/server/commands.c
+
+	Remove out-of-date information in vote command help text.
+
+	See #40448
+
+
+Sun, 17 Aug 2008 07:29:33 -0700  cproc:
+
+	Changed paths:
+	   M /branches/S2_1/utility/shared.c
+
+	Fix absolute path detection on Windows. See PR#40439.
+
+
+Tue, 12 Aug 2008 16:31:21 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/server/generator/mapgen.c
+
+	Fixed separatepoles option
+
+	See #40417
+
+
+Sun, 10 Aug 2008 17:52:23 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/ai/aidata.c
+
+	Fixed a couple of AI crashes related to ocean cities.
+
+	See #40422
+
+
+Sun, 10 Aug 2008 05:36:06 -0700  dmarks:
+
+	Changed paths:
+	   M /branches/S2_1/version.in
+
+	Bump version to 2.1.6+
+
+
+Sun, 10 Aug 2008 05:23:10 -0700  dmarks:
+
+	Changed paths:
+	   M /branches/S2_1/ChangeLog
+
+	Update changelog for 2.1.6
+
+
+Sun, 10 Aug 2008 03:14:37 -0700  dmarks:
+
+	Changed paths:
+	   M /branches/S2_1/po/ar.po
+	   M /branches/S2_1/po/ca.po
+	   M /branches/S2_1/po/cs.po
+	   M /branches/S2_1/po/da.po
+	   M /branches/S2_1/po/de.po
+	   M /branches/S2_1/po/el.po
+	   M /branches/S2_1/po/en_GB.po
+	   M /branches/S2_1/po/es.po
+	   M /branches/S2_1/po/et.po
+	   M /branches/S2_1/po/fa.po
+	   M /branches/S2_1/po/fi.po
+	   M /branches/S2_1/po/fr.po
+	   M /branches/S2_1/po/he.po
+	   M /branches/S2_1/po/hu.po
+	   M /branches/S2_1/po/it.po
+	   M /branches/S2_1/po/ja.po
+	   M /branches/S2_1/po/ko.po
+	   M /branches/S2_1/po/lt.po
+	   M /branches/S2_1/po/nl.po
+	   M /branches/S2_1/po/no.po
+	   M /branches/S2_1/po/pl.po
+	   M /branches/S2_1/po/pt.po
+	   M /branches/S2_1/po/pt_BR.po
+	   M /branches/S2_1/po/ro.po
+	   M /branches/S2_1/po/ru.po
+	   M /branches/S2_1/po/sv.po
+	   M /branches/S2_1/po/tr.po
+	   M /branches/S2_1/po/uk.po
+	   M /branches/S2_1/po/zh_CN.po
+
+	Changes after running 'update-po'
+
+
+Sat, 09 Aug 2008 09:34:11 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/m4/freetype2.m4
+
+	Replaced AS_HELP_STRING with AC_HELP_STRING for supporting older autoconf
+	versions.
+
+	Problem reported by Christian Prochaska.
+	Patch by Daniel Markstedt
+	Ticket #40416
+
+
+Thu, 07 Aug 2008 00:09:08 -0700  chrisk:
+
+	Changed paths:
+	   M /branches/S2_1/po/de.po
+
+	4286 translated messages.
+
+
+Tue, 05 Aug 2008 16:47:39 -0700  dmarks:
+
+	Changed paths:
+	   M /branches/S2_1/configure.ac
+	   A /branches/S2_1/po/eo.po
+
+	Add Esperanto translation; sent to me by Antonio C. Codazzi <f_sophia at libero.it>
+
+
+Fri, 01 Aug 2008 21:52:51 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/common/city.c
+
+	Built great wonders show "never" for turns-to-build.
+
+	See #40382, patch by me.
+
+
+Mon, 28 Jul 2008 11:03:38 -0700  jcreus:
+
+	Changed paths:
+	   M /branches/S2_1/po/ca.po
+
+	updated ca.po
+
+
+Sun, 27 Jul 2008 10:40:27 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/m4/freetype2.m4
+
+	Updated freetype2.m4 from freetype 2.3.7
+
+
+Thu, 24 Jul 2008 10:09:20 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/ai/aihand.c
+	   M /branches/S2_1/common/player.c
+	   M /branches/S2_1/common/player.h
+	   M /branches/S2_1/server/plrhand.c
+	   M /branches/S2_1/server/plrhand.h
+	   M /branches/S2_1/server/srv_main.c
+	   M /branches/S2_1/server/stdinhand.c
+
+	Avoid false "max rates exceeded" -message.
+
+	See #40389
+
+
+Tue, 22 Jul 2008 13:06:55 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/po/POTFILES.in
+
+	Added missing files to POTFILES.in
+
+	See #40391
+
+
+Mon, 21 Jul 2008 17:25:00 -0700  cproc:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-sdl/citydlg.c
+
+	Fix changing of specialists at resolutions higher than 640x480. See PR#40387.
+
+
+Mon, 21 Jul 2008 02:18:48 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/client/text.c
+
+	Fixed client crash in the end of turn in altering movement mode.
+
+	See #40384
+
+
+Mon, 21 Jul 2008 02:14:23 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/server/auth.c
+
+	Fixed error message about illegal auth port parameter.
+
+	See #40385
+
+
+Mon, 21 Jul 2008 02:12:45 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/server/stdinhand.c
+
+	Fixed /take assert when all player slots are in use.
+
+	See #40354
+
+
+Thu, 17 Jul 2008 12:03:57 -0700  cproc:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-sdl/wldlg.c
+
+	Fix crash in the worklist dialog. Reported by Eric Francis <airdrik at go.com> in PR#40378, patch by me.
+
+
+Mon, 14 Jul 2008 13:56:17 -0700  jdorje:
+
+	Changed paths:
+	   M /branches/S2_1/configure.ac
+	   M /branches/S2_1/data/civserver.dsc.in
+	   M /branches/S2_1/m4/ggz.m4
+	   M /branches/S2_1/server/ggzserver.c
+	   M /branches/S2_1/server/ggzserver.h
+	   M /branches/S2_1/server/savegame.c
+	   M /branches/S2_1/server/srv_main.c
+	   M /branches/S2_1/server/stdinhand.c
+	   M /branches/S2_1/server/stdinhand.h
+	   M /branches/S2_2/common/game.h
+	   M /branches/S2_2/configure.ac
+	   M /branches/S2_2/data/civserver.dsc.in
+	   M /branches/S2_2/m4/ggz.m4
+	   M /branches/S2_2/server/ggzserver.c
+	   M /branches/S2_2/server/ggzserver.h
+	   M /branches/S2_2/server/savegame.c
+	   M /branches/S2_2/server/srv_main.c
+	   M /branches/S2_2/server/stdinhand.c
+	   M /branches/S2_2/server/stdinhand.h
+
+	Add ggz-style savegame support.  This also bumps the required version to
+	0.99.4 for server support.
+
+	Patch by me in PR#40317.
+
+
+Mon, 14 Jul 2008 08:47:57 -0700  cproc:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-sdl/cityrep.c
+
+	Fix city report size calculations. Reported by Eric Francis <airdrik at go.com> in PR#40328, patch by me.
+
+
+Mon, 14 Jul 2008 08:34:32 -0700  cproc:
+
+	Changed paths:
+	   M /branches/S2_1/client/connectdlg_common.c
+	   M /branches/S2_1/utility/shared.c
+
+	Make the internal server store savegames in the user's home directory on Windows. See PR#40341.
+
+
+Thu, 10 Jul 2008 02:48:15 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/common/city.h
+	   M /branches/S2_1/server/cityturn.c
+
+	Introduced city_list_iterate_safe. Used it to fix potential problems when
+	city starves.
+
+	See #40367
+
+
+Mon, 07 Jul 2008 23:28:19 -0700  jdorje:
+
+	Changed paths:
+	   M /branches/S2_1/server/auth.c
+	   M /branches/S2_2/server/auth.c
+
+	Fix forward enumeration references in auth.c.
+
+	Patch by me in PR#40366.
+
+
+Mon, 07 Jul 2008 02:16:49 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/common/tech.c
+	   M /branches/S2_1/server/barbarian.c
+	   M /branches/S2_1/server/savegame.c
+	   M /branches/S2_1/server/srv_main.c
+	   M /branches/S2_1/server/techtools.c
+	   M /branches/S2_1/server/techtools.h
+
+	Fixed crash when loading saved game when tech leakage is enabled.
+
+	Reported by Chris Williams, ticket #40027
+
+
+Mon, 07 Jul 2008 02:03:49 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-gtk-2.0/wldlg.c
+	   M /branches/S2_1/client/packhand.c
+	   M /branches/S2_1/common/improvement.c
+	   M /branches/S2_1/common/improvement.h
+	   M /branches/S2_1/server/ruleset.c
+
+	Do not mark buildings redundant, when they allow building of unit.
+
+	See #40359
+
+
+Sun, 06 Jul 2008 07:33:36 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/server/gotohand.c
+	   M /branches/S2_1/server/gotohand.h
+	   M /branches/S2_1/server/srv_main.c
+
+	Free mappos arrays.
+
+	See #40352
+
+
+Thu, 03 Jul 2008 08:08:31 -0700  jdorje:
+
+	Changed paths:
+	   M /branches/S2_1/server/gamehand.c
+	   M /branches/S2_2/server/gamehand.c
+
+	Disable hack challenge when in GGZ mode.
+
+	Patch by me in PR#40311.
+
+
+Wed, 02 Jul 2008 23:24:18 -0700  jdorje:
+
+	Changed paths:
+	   M /branches/S2_1/server/ggzserver.c
+	   M /branches/S2_2/server/ggzserver.c
+
+	Fix GGZ handlers for error and spectator events.
+
+	Patch by me in PR#40357.
+
+
+Wed, 02 Jul 2008 10:13:20 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/common/requirements.c
+	   M /branches/S2_1/common/terrain.c
+	   M /branches/S2_1/common/terrain.h
+	   M /branches/S2_1/server/citytools.c
+	   M /branches/S2_1/server/generator/mapgen.c
+	   M /branches/S2_1/server/maphand.c
+
+	For terrain and special requirements in range "Adjacent" check
+	also tile itself. This allows building Hydro Plant in city placed
+	on one tile river.
+
+	Reported by HanduMan, ticket #40347
+
+
+Mon, 30 Jun 2008 02:55:07 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/Makefile.am
+
+	Distribute new m4-files.
+
+	See #40345
+
+
+Thu, 26 Jun 2008 15:33:31 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/common/city.c
+
+	Fix printing of obsolete wonders.
+
+	See #39982.
+
+	Patch by Jacob Nevins <jacobn+freecivrt at chiark.greenend.org.uk>.
+	Signed-off-by: Madeline Book <madeline.book at gmail.com>
+
+
+Thu, 26 Jun 2008 12:34:24 -0700  cazfi:
+
+	Changed paths:
+	   A /branches/S2_1/m4/codeset.m4
+	   M /branches/S2_1/m4/locale.m4
+
+	locale.m4 cleanup
+	- Added standard codeset.m4, which provides AM_LANGINFO_CODESET
+	- Serial number syntax fixed
+
+	See #40301
+
+
+Tue, 24 Jun 2008 20:44:42 -0700  jdorje:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+	   M /branches/S2_1/common/capstr.h
+	   M /branches/S2_1/configure.ac
+	   M /branches/S2_1/data/civclient.dsc.in
+	   M /branches/S2_1/data/civserver.dsc.in
+	   M /branches/S2_1/m4/version.m4
+	   M /branches/S2_1/version.in
+	   M /branches/S2_2/client/gui-gtk-2.0/gui_main.c
+	   M /branches/S2_2/common/capstr.h
+	   M /branches/S2_2/configure.ac
+	   M /branches/S2_2/data/civclient.dsc.in
+	   M /branches/S2_2/data/civserver.dsc.in
+	   M /branches/S2_2/version.in
+
+	Separate mandatory and optional capabilities in the capstring.  This is
+	needed so that GGZ can distinguish by the mandatory capabilities only.
+
+	Patch by me in PR#40308.
+
+
+Tue, 24 Jun 2008 12:29:50 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+	   M /branches/S2_1/client/packhand.c
+	   M /branches/S2_1/common/game.c
+
+	Fix to global observer crash in connectdialog.
+	Reverting previous attempt to fix this.
+
+	See #40303
+
+
+Mon, 23 Jun 2008 18:14:33 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-gtk-2.0/dialogs.c
+	   M /branches/S2_1/client/gui-gtk-2.0/plrdlg.c
+
+	Fix visual corruption in flag images.
+
+	See #40246, patch by me.
+
+
+Mon, 23 Jun 2008 18:14:22 -0700  mbook:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-gtk-2.0/cityrep.c
+
+	Show total buy cost for selected cities in the city report.
+
+	See #40291, patch by me.
+
+
+Mon, 23 Jun 2008 16:49:58 -0700  jdorje:
+
+	Changed paths:
+	   M /branches/S2_0/server/stdinhand.c
+	   M /branches/S2_1/server/stdinhand.c
+	   M /branches/S2_2/server/stdinhand.c
+
+	Don't reset the wrong player name when a player is /cut in pregame.
+
+	See PR#39503.
+
+
+Mon, 23 Jun 2008 15:47:25 -0700  jdorje:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-gtk-2.0/pages.c
+	   M /branches/S2_2/client/gui-gtk-2.0/pages.c
+
+	Go straight to the network page when autoconnecting to a server that needs a password.
+
+	Patch from PR#38354.
+
+
+Sun, 22 Jun 2008 17:19:27 -0700  jdorje:
+
+	Changed paths:
+	   M /branches/S2_0/client/packhand.c
+	   M /branches/S2_1/client/packhand.c
+	   M /branches/S2_2/client/packhand.c
+
+	Fix incorrect setting of map.num_continents when continents are renumbered.
+
+	Reported by Stephen Jolley <s_jolley at yahoo.com> in PR#39472.  Patch by me.
+
+
+Sun, 22 Jun 2008 04:39:30 -0700  cproc:
+
+	Changed paths:
+	   M /branches/S2_1/client/servers.c
+
+	add missing check for EWOULDBLOCK. Reported by Madeline Book in PR#40297, patch by me.
+
+
+Sun, 22 Jun 2008 02:10:53 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+
+	- Fixed sensitivity of Start and Pick Nation buttons
+	- Pick Nation button text now turn in to Take Player when appropriate
+
+	See #40234
+
+
+Sun, 22 Jun 2008 00:00:27 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+
+	Fixed global oserver crash on connectdlg.
+
+	See #40303
+
+
+Sat, 21 Jun 2008 21:05:26 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/utility/netintf.c
+
+	Handle empty http_proxy environment variable correctly.
+
+	Reported by Christian Knoke as part of #16526.
+
+
+Sat, 21 Jun 2008 19:55:48 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/server/unittools.c
+
+	Make message about paratrooper dying on paradrop
+	more likely to appear to user.
+
+	Reported by Karl Goetz and Nick Schulten
+	Patch by Ulrik Sverdrup, ticket #40295
+
+
+Sat, 21 Jun 2008 06:00:12 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/server/citytools.c
+	   M /branches/S2_1/server/maphand.c
+
+	Refresh cities after shared vision gained from another player, possibly
+	revealing new tiles.
+
+	See #40262
+
+
+Sat, 21 Jun 2008 04:18:47 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/scripts/setup_auth_server.sh
+	   M /branches/S2_1/server/auth.c
+
+	Use Mysql port information from authentication config file.
+
+	See #40293
+
+
+Thu, 19 Jun 2008 13:18:38 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/client/servers.c
+	   M /branches/S2_1/server/sernet.c
+
+	Fixed winsock related compiler warnings.
+
+	See #40281
+
+
+Thu, 19 Jun 2008 13:14:11 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/Makefile.am
+	   A /branches/S2_1/m4/lib-ld.m4
+	   A /branches/S2_1/m4/lib-link.m4
+	   A /branches/S2_1/m4/lib-prefix.m4
+
+	Added lib-link.m4, lib-prefix.m4 and lib-ld.m4. Already present macros
+	depend on these.
+
+
+Thu, 19 Jun 2008 04:21:07 -0700  chrisk:
+
+	Changed paths:
+	   M /branches/S2_1/po/de.po
+
+	4280 translated messages.
+
+
+Wed, 18 Jun 2008 10:25:15 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/common/game.h
+	   M /branches/S2_1/server/stdinhand.c
+
+	Made all-AI games possible again.
+
+	See #40288
+
+
+Wed, 18 Jun 2008 08:17:23 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/server/settings.c
+	   M /branches/S2_1/server/stdinhand.c
+
+	Only human players count toward minplayers.
+
+	See #40206
+
+
+Tue, 17 Jun 2008 11:30:07 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/m4/debug.m4
+
+	Fixed setting of debug compiler flags.
+
+	See #40287
+
+
+Tue, 17 Jun 2008 06:07:46 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/Makefile.am
+	   A /branches/S2_1/bootstrap/config.rpath
+	   M /branches/S2_1/m4/iconv.m4
+
+	Updated iconv.m4
+
+	See #40275
+
+
+Mon, 16 Jun 2008 06:14:06 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/Makefile.am
+	   M /branches/S2_1/configure.ac
+	   A /branches/S2_1/m4/compiler.m4
+	   D /branches/S2_1/m4/esd.m4
+
+	Backported configure related bugfixes from S2_2
+
+	See #40268
+
+
+Mon, 16 Jun 2008 06:05:14 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/ai/advdiplomacy.c
+
+	Fixed bug that AI tried to get unreachable techs from treaty.
+
+	Patch by Per. See #38372
+
+
+Mon, 16 Jun 2008 05:57:54 -0700  cazfi:
+
+	Changed paths:
+	   M /branches/S2_1/client/goto.c
+
+	Fixed compiler warning in goto code.
+
+	See #40265
+
+
+Mon, 16 Jun 2008 00:55:43 -0700  dmarks:
+
+	Changed paths:
+	   M /branches/S2_1/version.in
+
+	Bump version to 2.1.5+
+
+
+Mon, 16 Jun 2008 00:20:15 -0700  dmarks:
+
+	Changed paths:
+	   M /branches/S2_1/ChangeLog
+
+	Update changelog for 2.1.5
+
+
 Mon, 16 Jun 2008 00:02:24 -0700  dmarks:
 
 	Changed paths:
diff --git a/Makefile.am b/Makefile.am
index 8b3254f..1ac6e16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,10 @@ endif
 
 SUBDIRS=	$(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS)
 
+## Automake should distribute config.rpath automatically - and new
+## versions probably do. We still support versions that do not, so
+## it's in the list below.
+## It should also install it automatically when running autogen.sh.
 EXTRA_DIST=	autogen.sh 			\
 		config.mac.h			\
 		configure.ac			\
@@ -58,11 +62,13 @@ EXTRA_DIST=	autogen.sh 			\
 		bootstrap/freeciv-server.desktop.in	\
 		bootstrap/freeciv.spec.in	\
 		bootstrap/undep.sh.in		\
+		bootstrap/config.rpath		\
 		m4/ac_path_lib.m4		\
 		m4/auth.m4			\
 		m4/c99.m4			\
+		m4/codeset.m4			\
+		m4/compiler.m4			\
 		m4/debug.m4			\
-		m4/esd.m4			\
 		m4/alsa.m4			\
 		m4/freetype2.m4			\
 		m4/gettext.m4			\
@@ -78,6 +84,9 @@ EXTRA_DIST=	autogen.sh 			\
 		m4/imlib.m4			\
 		m4/isc-posix.m4			\
 		m4/lcmessage.m4			\
+		m4/lib-ld.m4			\
+		m4/lib-link.m4			\
+		m4/lib-prefix.m4		\
 		m4/locale.m4			\
 		m4/ngettext.m4			\
 		m4/no-client.m4			\
diff --git a/Makefile.in b/Makefile.in
index 10e429e..8f612f9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
@@ -216,11 +221,13 @@ EXTRA_DIST = autogen.sh 			\
 		bootstrap/freeciv-server.desktop.in	\
 		bootstrap/freeciv.spec.in	\
 		bootstrap/undep.sh.in		\
+		bootstrap/config.rpath		\
 		m4/ac_path_lib.m4		\
 		m4/auth.m4			\
 		m4/c99.m4			\
+		m4/codeset.m4			\
+		m4/compiler.m4			\
 		m4/debug.m4			\
-		m4/esd.m4			\
 		m4/alsa.m4			\
 		m4/freetype2.m4			\
 		m4/gettext.m4			\
@@ -236,6 +243,9 @@ EXTRA_DIST = autogen.sh 			\
 		m4/imlib.m4			\
 		m4/isc-posix.m4			\
 		m4/lcmessage.m4			\
+		m4/lib-ld.m4			\
+		m4/lib-link.m4			\
+		m4/lib-prefix.m4		\
 		m4/locale.m4			\
 		m4/ngettext.m4			\
 		m4/no-client.m4			\
@@ -275,9 +285,10 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README $(noinst_HEADERS) ABOUT-NLS AUTHORS COPYING \
 	ChangeLog INSTALL Makefile.am Makefile.in NEWS aclocal.m4 \
-	bootstrap/config.guess bootstrap/config.sub bootstrap/depcomp \
-	bootstrap/install-sh bootstrap/missing bootstrap/mkinstalldirs \
-	config.h.in configure configure.ac
+	bootstrap/config.guess bootstrap/config.rpath \
+	bootstrap/config.sub bootstrap/depcomp bootstrap/install-sh \
+	bootstrap/missing bootstrap/mkinstalldirs config.h.in configure \
+	configure.ac
 DIST_SUBDIRS = data intl utility common tests win32 ai dependencies \
 	server client po doc manual
 all: config.h
@@ -298,7 +309,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac m4/ac_path_lib.m4 m4/alsa.m4 m4/auth.m4 m4/c99.m4 m4/debug.m4 m4/esd.m4 m4/freetype2.m4 m4/gettext.m4 m4/gettimeofday.m4 m4/ggz.m4 m4/glib-2.0.m4 m4/glib-gettext.m4 m4/glib.m4 m4/glibc21.m4 m4/gtk-2.0.m4 m4/gtk2-client.m4 m4/iconv.m4 m4/imlib.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/locale.m4 m4/ngettext.m4 m4/no-client.m4 m4/pkg.m4 m4/progtest.m4 m4/readline.m4 m4/sdl-client.m4 m4/sdl.m4 m4/sound.m4 m4/version.m4 m4/vsnprintf.m4 m4/win32-client.m4 m4/x.m4 m4/xaw-client.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac m4/ac_path_lib.m4 m4/alsa.m4 m4/auth.m4 m4/c99.m4 m4/codeset.m4 m4/compiler.m4 m4/debug.m4 m4/freetype2.m4 m4/gettext.m4 m4/gettimeofday.m4 m4/ggz.m4 m4/glib-2.0.m4 m4/glib-gettext.m4 m4/glib.m4 m4/glibc21.m4 m4/gtk-2.0.m4 m4/gtk2-client.m4 m4/iconv.m4 m4/imlib.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/locale.m4 m4/ngettext.m4 m4/no-client.m4 m4/pkg.m4 m4/progtest.m4 m4/readline.m4 m4/sdl-client.m4 m4/sdl.m4 m4/sound.m4 m4/version.m4 m4/vsnprintf.m4 m4/win32-client.m4 m4/x.m4 m4/xaw-client.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 config.h: stamp-h1
diff --git a/aclocal.m4 b/aclocal.m4
index 8832ee5..de0dcb9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -970,23 +970,43 @@ AC_DEFUN([FC_CHECK_AUTH],
 
 ])
 
-#serial AM2
+# iconv.m4 serial AM6 (gettext-0.17)
+dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
 dnl From Bruno Haible.
 
-AC_DEFUN([AM_ICONV],
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
 [
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
   dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 
-  AC_ARG_WITH([libiconv-prefix],
-[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
-    for dir in `echo "$withval" | tr : ' '`; do
-      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
-    done
-   ])
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libiconv and not disabled its use
+  dnl via --without-libiconv-prefix, he wants to use it. The first
+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  am_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+  AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     AC_TRY_LINK([#include <stdlib.h>
@@ -997,7 +1017,7 @@ AC_DEFUN([AM_ICONV],
       am_cv_func_iconv=yes)
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
-      LIBS="$LIBS -liconv"
+      LIBS="$LIBS $LIBICONV"
       AC_TRY_LINK([#include <stdlib.h>
 #include <iconv.h>],
         [iconv_t cd = iconv_open("","");
@@ -1009,7 +1029,104 @@ AC_DEFUN([AM_ICONV],
     fi
   ])
   if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
+      dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+        [case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac])
+      LIBS="$am_save_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1,
+      [Define if you have the iconv() function and it works.])
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    AC_MSG_CHECKING([how to link with libiconv])
+    AC_MSG_RESULT([$LIBICONV])
+  else
+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+    dnl either.
+    CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  AC_SUBST(LIBICONV)
+  AC_SUBST(LTLIBICONV)
+])
+
+AC_DEFUN([AM_ICONV],
+[
+  AM_ICONV_LINK
+  if test "$am_cv_func_iconv" = yes; then
     AC_MSG_CHECKING([for iconv declaration])
     AC_CACHE_VAL(am_cv_proto_iconv, [
       AC_TRY_COMPILE([
@@ -1032,30 +1149,1017 @@ size_t iconv();
     AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
       [Define as const if the declaration of iconv() needs const.])
   fi
-  LIBICONV=
-  if test "$am_cv_lib_iconv" = yes; then
-    LIBICONV="-liconv"
+])
+
+# lib-prefix.m4 serial 5 (gettext-0.15)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
   fi
-  AC_SUBST(LIBICONV)
 ])
 
-#serial AM1
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+dnl the basename of the libdir, either "lib" or "lib64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64. The current
+  dnl practice is that on a system supporting 32-bit and 64-bit instruction
+  dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+  dnl libraries go under $prefix/lib. We determine the compiler's default
+  dnl mode by looking at the compiler's library search path. If at least
+  dnl of its elements ends in /lib64 or points to a directory whose absolute
+  dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+  dnl default, namely "lib".
+  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
+        esac
+      fi
+    done
+    IFS="$acl_save_IFS"
+  fi
+])
+
+# lib-link.m4 serial 13 (gettext-0.17)
+dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
 dnl From Bruno Haible.
 
-AC_DEFUN([AM_LANGINFO_CODESET],
+AC_PREREQ(2.54)
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
 [
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    LIBS="$LIBS $LIB[]NAME"
+    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
+[  --with-lib]N_A_M_E[-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
+  --without-lib]N_A_M_E[-prefix     don't search for lib$1 in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$acl_hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                LIB[]NAME[]_PREFIX="$basedir"
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$acl_hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
   fi
+  AC_SUBST([$1])
+])
+
+# lib-ld.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH(gnu-ld,
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(acl_cv_path_LD,
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break ;;
+      *)
+	test "$with_gnu_ld" != yes && break ;;
+      esac
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
+
+#serial 0
+
 AC_DEFUN([AM_LIBCHARSET],
 [
   AC_CACHE_CHECK([for libcharset], am_cv_libcharset,
@@ -1073,6 +2177,28 @@ AC_DEFUN([AM_LIBCHARSET],
   fi
 ])
 
+# codeset.m4 serial 2 (gettext-0.16)
+dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET); return !cs;],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
+
 # Macro to add for using GNU gettext.
 # Ulrich Drepper <drepper at cygnus.com>, 1995.
 #
@@ -1612,6 +2738,75 @@ LIBS="$templibs"
 LANG="$templang"
 ])
 
+# Macros to check compiler options
+#
+
+# Helper function that adds flags (words) to variable listing them.
+# Makes sure there is no extra spaces even in any situation
+#
+# $1 - Name of the target variable
+# $2 - Flags to add
+#
+AC_DEFUN([FC_ADD_WORDS_TO_VAR],
+[
+old_value="`eval echo '$'$1`"
+if test "x$old_value" = "x" ; then
+  $1="$2"
+elif test "x$2" != "x" ; then
+  $1="$old_value $2"
+fi
+])
+
+# Check if compiler supports given commandline parameter in language specific
+# variable. If it does, it will be concatenated to variable. If several
+# parameters are given, they are tested, and added to target variable,
+# one at a time.
+#
+# $1 - Language
+# $2 - Language specific variable
+# $3 - Parameters to test
+# $4 - Additional parameters
+# $5 - Variable where to add
+#
+
+AC_DEFUN([FC_COMPILER_FLAGS],
+[
+AC_LANG_PUSH([$1])
+
+flags_save="`eval echo '$'$2`"
+accepted_flags=""
+
+for flag in $3
+do
+  $2="$flags_save $accepted_flags $flag $4"
+  AC_COMPILE_IFELSE([int a;],
+                    [FC_ADD_WORDS_TO_VAR([accepted_flags], [$flag])])
+done
+FC_ADD_WORDS_TO_VAR([$5], [$accepted_flags])
+
+$2="$flags_save"
+
+AC_LANG_POP([$1])
+])
+
+# Commandling flag tests for C and C++
+#
+#
+# $1 - Parameters to test
+# $2 - Additional parameters
+# $3 - Variable where to add
+
+AC_DEFUN([FC_C_FLAGS],
+[
+FC_COMPILER_FLAGS([C], [CFLAGS], [$1], [$2], [$3])
+])
+
+
+AC_DEFUN([FC_CXX_FLAGS],
+[
+FC_COMPILER_FLAGS([C++], [CXXFLAGS], [$1], [$2], [$3])
+])
+
 AC_DEFUN([FC_DEBUG], [
 AC_ARG_ENABLE(debug,
 [  --enable-debug[[=no/some/yes]]  turn on debugging [[default=some]]],
@@ -1624,12 +2819,14 @@ esac], [enable_debug=some])
 
 dnl -g is added by AC_PROG_CC if the compiler understands it
 if test "x$enable_debug" = "xyes"; then
-  AC_DEFINE(DEBUG, 1, [Define if you want extra debugging.])
-  EXTRA_GCC_DEBUG_CFLAGS="$EXTRA_GCC_DEBUG_CFLAGS -Werror"
+  AC_DEFINE([DEBUG], [1], [Extra debugging support])
+  FC_C_FLAGS([-Werror], [], [EXTRA_DEBUG_CFLAGS])
+  FC_CXX_FLAGS([-Werror], [], [EXTRA_DEBUG_CXXFLAGS])
 else
   if test "x$enable_debug" = "xno"; then
-    AC_DEFINE(NDEBUG, 1, [Define if you want no debug support.])
-    EXTRA_GCC_DEBUG_CFLAGS="-O3 -fomit-frame-pointer"
+    AC_DEFINE([NDEBUG], [1], [No debugging support at all])
+    FC_C_FLAGS([-O3 -fomit-frame-pointer], [], [EXTRA_DEBUG_CFLAGS])
+    FC_CXX_FLAGS([-O3 -fomit-frame-pointer], [], [EXTRA_DEBUG_CXXFLAGS])
   fi
 fi
 ])
@@ -2216,89 +3413,122 @@ int main(int argc, char *argv[])
 
 # Configure paths for FreeType2
 # Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
-
-dnl AC_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS
-dnl
+#
+# Copyright 2001, 2003, 2007 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+#
+# As a special exception to the FreeType project license, this file may be
+# distributed as part of a program that contains a configuration script
+# generated by Autoconf, under the same distribution terms as the rest of
+# that program.
+#
+# First part is upstream (freetype2) version,
+# second is zero just in case upstream will use it,
+# third one is Freeciv modifications.
+# serial 2.0.1
+
+# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
+# MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is
+# FreeType 2.0.4).
+#
 AC_DEFUN([AC_CHECK_FT2],
-[dnl
-dnl Get the cflags and libraries from the freetype-config script
-dnl
-AC_ARG_WITH(ft-prefix,
-[  --with-ft-prefix=PREFIX
-                          Prefix where FreeType is installed (optional)],
-            ft_config_prefix="$withval", ft_config_prefix="")
-AC_ARG_WITH(ft-exec-prefix,
-[  --with-ft-exec-prefix=PREFIX
-                          Exec prefix where FreeType is installed (optional)],
-            ft_config_exec_prefix="$withval", ft_config_exec_prefix="")
-AC_ARG_ENABLE(freetypetest,
-[  --disable-freetypetest  Do not try to compile and run
-                          a test FreeType program],
-              [], enable_fttest=yes)
-
-if test x$ft_config_exec_prefix != x ; then
-  ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
-  if test x${FT2_CONFIG+set} != xset ; then
-    FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
-  fi
-fi
-if test x$ft_config_prefix != x ; then
-  ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
-  if test x${FT2_CONFIG+set} != xset ; then
-    FT2_CONFIG=$ft_config_prefix/bin/freetype-config
-  fi
-fi
-AC_PATH_PROG(FT2_CONFIG, freetype-config, no)
+  [# Get the cflags and libraries from the freetype-config script
+   #
+   AC_ARG_WITH([ft-prefix],
+     dnl don't quote AC_HELP_STRING!
+     AC_HELP_STRING([--with-ft-prefix=PREFIX],
+                    [Prefix where FreeType is installed (optional)]),
+     [ft_config_prefix="$withval"],
+     [ft_config_prefix=""])
+
+   AC_ARG_WITH([ft-exec-prefix],
+     dnl don't quote AC_HELP_STRING!
+     AC_HELP_STRING([--with-ft-exec-prefix=PREFIX],
+                    [Exec prefix where FreeType is installed (optional)]),
+     [ft_config_exec_prefix="$withval"],
+     [ft_config_exec_prefix=""])
+
+   AC_ARG_ENABLE([freetypetest],
+     dnl don't quote AC_HELP_STRING!
+     AC_HELP_STRING([--disable-freetypetest],
+                    [Do not try to compile and run a test FreeType program]),
+     [],
+     [enable_fttest=yes])
+
+   if test x$ft_config_exec_prefix != x ; then
+     ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
+     if test x${FT2_CONFIG+set} != xset ; then
+       FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
+     fi
+   fi
+
+   if test x$ft_config_prefix != x ; then
+     ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
+     if test x${FT2_CONFIG+set} != xset ; then
+       FT2_CONFIG=$ft_config_prefix/bin/freetype-config
+     fi
+   fi
+
+   AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no])
+
+   min_ft_version=m4_if([$1], [], [7.0.1], [$1])
+   AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version])
+   no_ft=""
+   if test "$FT2_CONFIG" = "no" ; then
+     no_ft=yes
+   else
+     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
+     FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+     ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+     ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+     ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+     ft_min_major_version=`echo $min_ft_version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+     ft_min_minor_version=`echo $min_ft_version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+     ft_min_micro_version=`echo $min_ft_version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+     if test x$enable_fttest = xyes ; then
+       ft_config_is_lt=""
+       if test $ft_config_major_version -lt $ft_min_major_version ; then
+         ft_config_is_lt=yes
+       else
+         if test $ft_config_major_version -eq $ft_min_major_version ; then
+           if test $ft_config_minor_version -lt $ft_min_minor_version ; then
+             ft_config_is_lt=yes
+           else
+             if test $ft_config_minor_version -eq $ft_min_minor_version ; then
+               if test $ft_config_micro_version -lt $ft_min_micro_version ; then
+                 ft_config_is_lt=yes
+               fi
+             fi
+           fi
+         fi
+       fi
+       if test x$ft_config_is_lt = xyes ; then
+         no_ft=yes
+       else
+         ac_save_CFLAGS="$CFLAGS"
+         ac_save_LIBS="$LIBS"
+         CFLAGS="$CFLAGS $FT2_CFLAGS"
+         LIBS="$FT2_LIBS $LIBS"
+
+         #
+         # Sanity checks for the results of freetype-config to some extent.
+         #
+         AC_RUN_IFELSE([
+             AC_LANG_SOURCE([[
 
-min_ft_version=ifelse([$1], ,6.1.0,$1)
-AC_MSG_CHECKING(for FreeType - version >= $min_ft_version)
-no_ft=""
-if test "$FT2_CONFIG" = "no" ; then
-  no_ft=yes
-else
-  FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-  FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
-  ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-  ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-  ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-  ft_min_major_version=`echo $min_ft_version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-  ft_min_minor_version=`echo $min_ft_version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-  ft_min_micro_version=`echo $min_ft_version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-  if test x$enable_fttest = xyes ; then
-    ft_config_is_lt=""
-    if test $ft_config_major_version -lt $ft_min_major_version ; then
-      ft_config_is_lt=yes
-    else
-      if test $ft_config_major_version -eq $ft_min_major_version ; then
-        if test $ft_config_minor_version -lt $ft_min_minor_version ; then
-          ft_config_is_lt=yes
-        else
-          if test $ft_config_minor_version -eq $ft_min_minor_version ; then
-            if test $ft_config_micro_version -lt $ft_min_micro_version ; then
-              ft_config_is_lt=yes
-            fi
-          fi
-        fi
-      fi
-    fi
-    if test x$ft_config_is_lt = xyes ; then
-      no_ft=yes
-    else
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $FT2_CFLAGS"
-      LIBS="$FT2_LIBS $LIBS"
-dnl
-dnl Sanity checks for the results of freetype-config to some extent
-dnl
-      AC_TRY_RUN([
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include <stdio.h>
@@ -2308,7 +3538,7 @@ int
 main()
 {
   FT_Library library;
-  FT_Error error;
+  FT_Error  error;
 
   error = FT_Init_FreeType(&library);
 
@@ -2320,43 +3550,62 @@ main()
     return 0;
   }
 }
-],, no_ft=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-      CFLAGS="$ac_save_CFLAGS"
-      LIBS="$ac_save_LIBS"
-    fi             # test $ft_config_version -lt $ft_min_version
-  fi               # test x$enable_fttest = xyes
-fi                 # test "$FT2_CONFIG" = "no"
-if test x$no_ft = x ; then
-   AC_MSG_RESULT(yes)
-   ifelse([$2], , :, [$2])
-else
-   AC_MSG_RESULT(no)
-   if test "$FT2_CONFIG" = "no" ; then
-     echo "*** The freetype-config script installed by FreeType 2 could not be found."
-     echo "*** If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in"
-     echo "*** your path, or set the FT2_CONFIG environment variable to the"
-     echo "*** full path to freetype-config."
+
+             ]])
+           ],
+           [],
+           [no_ft=yes],
+           [echo $ECHO_N "cross compiling; assuming OK... $ECHO_C"])
+
+         CFLAGS="$ac_save_CFLAGS"
+         LIBS="$ac_save_LIBS"
+       fi             # test $ft_config_version -lt $ft_min_version
+     fi               # test x$enable_fttest = xyes
+   fi                 # test "$FT2_CONFIG" = "no"
+
+   if test x$no_ft = x ; then
+     AC_MSG_RESULT([yes])
+     m4_if([$2], [], [:], [$2])
    else
-     if test x$ft_config_is_lt = xyes ; then
-       echo "*** Your installed version of the FreeType 2 library is too old."
-       echo "*** If you have different versions of FreeType 2, make sure that"
-       echo "*** correct values for --with-ft-prefix or --with-ft-exec-prefix"
-       echo "*** are used, or set the FT2_CONFIG environment variable to the"
-       echo "*** full path to freetype-config."
+     AC_MSG_RESULT([no])
+     if test "$FT2_CONFIG" = "no" ; then
+       AC_MSG_WARN([
+
+  The freetype-config script installed by FreeType 2 could not be found.
+  If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in
+  your path, or set the FT2_CONFIG environment variable to the
+  full path to freetype-config.
+       ])
      else
-       echo "*** The FreeType test program failed to run.  If your system uses"
-       echo "*** shared libraries and they are installed outside the normal"
-       echo "*** system library path, make sure the variable LD_LIBRARY_PATH"
-       echo "*** (or whatever is appropiate for your system) is correctly set."
+       if test x$ft_config_is_lt = xyes ; then
+         AC_MSG_WARN([
+
+  Your installed version of the FreeType 2 library is too old.
+  If you have different versions of FreeType 2, make sure that
+  correct values for --with-ft-prefix or --with-ft-exec-prefix
+  are used, or set the FT2_CONFIG environment variable to the
+  full path to freetype-config.
+         ])
+       else
+         AC_MSG_WARN([
+
+  The FreeType test program failed to run.  If your system uses
+  shared libraries and they are installed outside the normal
+  system library path, make sure the variable LD_LIBRARY_PATH
+  (or whatever is appropriate for your system) is correctly set.
+         ])
+       fi
      fi
+
+     FT2_CFLAGS=""
+     FT2_LIBS=""
+     m4_if([$3], [], [:], [$3])
    fi
-   FT2_CFLAGS=""
-   FT2_LIBS=""
-   ifelse([$3], , :, [$3])
-fi
-AC_SUBST(FT2_CFLAGS)
-AC_SUBST(FT2_LIBS)
-])
+
+   AC_SUBST([FT2_CFLAGS])
+   AC_SUBST([FT2_LIBS])])
+
+# end of freetype2.m4
 
 # Try to configure the XAW client (gui-xaw)
 
@@ -2381,6 +3630,8 @@ AC_DEFUN([FC_XAW_CLIENT],
       AC_DEFINE_UNQUOTED(NARROWPROTO, $fc_x_proto_value, [Narrowproto])
     fi
 
+    PKG_PROG_PKG_CONFIG
+
     dnl Check for libpng
     PKG_CHECK_MODULES([PNG], [libpng],
     [
@@ -3076,6 +4327,10 @@ AC_DEFUN([FC_WIN32_CLIENT],
 [
   if test "$client" = "win32" || test "$client" = "yes" ; then
     if test "$MINGW32" = "yes"; then
+    
+      PKG_PROG_PKG_CONFIG
+      
+      dnl Check for libpng
       PKG_CHECK_MODULES([PNG], [libpng],
       [
         CLIENT_LIBS="-lwsock32 -lcomctl32 -mwindows $PNG_LIBS"
@@ -4155,7 +5410,7 @@ AC_DEFUN([AC_GGZ_CHECK_SERVER],
   if test "$try_ggz" = "yes"; then
     # For now, version 0.0.14 is required.  This could be an additional
     # parameter.
-    AC_GGZ_VERSION([0], [0], [14], [], [try_ggz=no])
+    AC_GGZ_VERSION([0], [99], [4], [], [try_ggz=no])
   fi
 
   ggz_server="no"
diff --git a/ai/Makefile.in b/ai/Makefile.in
index 4185e8a..7ee6147 100644
--- a/ai/Makefile.in
+++ b/ai/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/ai/advdiplomacy.c b/ai/advdiplomacy.c
index ef1ba7b..7ee698b 100644
--- a/ai/advdiplomacy.c
+++ b/ai/advdiplomacy.c
@@ -126,7 +126,8 @@ static int ai_goldequiv_tech(struct player *pplayer, Tech_type_id tech)
 {
   int bulbs, tech_want, worth;
 
-  if (get_invention(pplayer, tech) == TECH_KNOWN) {
+  if (get_invention(pplayer, tech) == TECH_KNOWN
+      || !tech_is_available(pplayer, tech)) {
     return 0;
   }
   bulbs = total_bulbs_required_for_goal(pplayer, tech) * 3;
@@ -971,7 +972,9 @@ static void suggest_tech_exchange(struct player* player1,
   bool is_dangerous;
     
   tech_type_iterate(tech) {
-    if (tech == A_NONE) {
+    if (tech == A_NONE 
+        || !tech_is_available(player2, tech)
+        || !tech_is_available(player1, tech)) {
       worth[tech] = 0;
       continue;
     }
@@ -1040,10 +1043,12 @@ static void ai_share(struct player *pplayer, struct player *aplayer)
   if (players_on_same_team(pplayer, aplayer)) {
     for (index = A_FIRST; index < game.control.num_tech_types; index++) {
       if ((get_invention(pplayer, index) != TECH_KNOWN)
-          && (get_invention(aplayer, index) == TECH_KNOWN)) {
+          && (get_invention(aplayer, index) == TECH_KNOWN)
+          && tech_is_available(pplayer, index)) {
        ai_diplomacy_suggest(aplayer, pplayer, CLAUSE_ADVANCE, index);
       } else if ((get_invention(pplayer, index) == TECH_KNOWN)
-          && (get_invention(aplayer, index) != TECH_KNOWN)) {
+          && (get_invention(aplayer, index) != TECH_KNOWN)
+          && tech_is_available(aplayer, index)) {
         ai_diplomacy_suggest(pplayer, aplayer, CLAUSE_ADVANCE, index);
       }
     }
diff --git a/ai/aidata.c b/ai/aidata.c
index dede8d6..62803dc 100644
--- a/ai/aidata.c
+++ b/ai/aidata.c
@@ -256,7 +256,9 @@ void ai_data_phase_init(struct player *pplayer, bool is_new_phase)
      * coastal fortresses and hunting down enemy transports. */
     city_list_iterate(aplayer->cities, acity) {
       Continent_id continent = tile_get_continent(acity->tile);
-      ai->threats.continent[continent] = TRUE;
+      if (continent >= 0) {
+        ai->threats.continent[continent] = TRUE;
+      }
     } city_list_iterate_end;
 
     unit_list_iterate(aplayer->units, punit) {
@@ -364,7 +366,10 @@ void ai_data_phase_init(struct player *pplayer, bool is_new_phase)
   ai->stats.cities = fc_calloc(ai->num_continents + 1, sizeof(int));
   ai->stats.average_production = 0;
   city_list_iterate(pplayer->cities, pcity) {
-    ai->stats.cities[(int)tile_get_continent(pcity->tile)]++;
+    Continent_id continent = tile_get_continent(pcity->tile);
+    if (continent >= 0) {
+      ai->stats.cities[continent]++;
+    }
     ai->stats.average_production += pcity->surplus[O_SHIELD];
   } city_list_iterate_end;
   ai->stats.average_production /= MAX(1, city_list_size(pplayer->cities));
diff --git a/ai/aihand.c b/ai/aihand.c
index d522f69..b20db71 100644
--- a/ai/aihand.c
+++ b/ai/aihand.c
@@ -302,7 +302,7 @@ void ai_best_government(struct player *pplayer)
       pplayer->government = gov;
       /* Ideally we should change tax rates here, but since
        * this is a rather big CPU operation, we'd rather not. */
-      check_player_government_rates(pplayer);
+      check_player_max_rates(pplayer);
       city_list_iterate(pplayer->cities, acity) {
         auto_arrange_workers(acity);
       } city_list_iterate_end;
diff --git a/ai/ailog.c b/ai/ailog.c
index 2245705..e251319 100644
--- a/ai/ailog.c
+++ b/ai/ailog.c
@@ -68,11 +68,11 @@ void TECH_LOG(int level, const struct player *pplayer, Tech_type_id id,
   my_vsnprintf(buffer2, sizeof(buffer2), msg, ap);
   va_end(ap);
 
-  cat_snprintf(buffer, sizeof(buffer), buffer2);
+  cat_snprintf(buffer, sizeof(buffer), "%s", buffer2);
   if (BV_ISSET(pplayer->debug, PLAYER_DEBUG_TECH)) {
     notify_conn(NULL, NULL, E_AI_DEBUG, "%s", buffer);
   }
-  freelog(minlevel, buffer);
+  freelog(minlevel, "%s", buffer);
 }
 
 /**************************************************************************
@@ -111,11 +111,11 @@ void DIPLO_LOG(int level, const struct player *pplayer,
   my_vsnprintf(buffer2, sizeof(buffer2), msg, ap);
   va_end(ap);
 
-  cat_snprintf(buffer, sizeof(buffer), buffer2);
+  cat_snprintf(buffer, sizeof(buffer), "%s", buffer2);
   if (BV_ISSET(pplayer->debug, PLAYER_DEBUG_DIPLOMACY)) {
     notify_conn(NULL, NULL, E_AI_DEBUG, "%s", buffer);
   }
-  freelog(minlevel, buffer);
+  freelog(minlevel, "%s", buffer);
 }
 
 /**************************************************************************
@@ -146,11 +146,11 @@ void CITY_LOG(int level, const struct city *pcity, const char *msg, ...)
   my_vsnprintf(buffer2, sizeof(buffer2), msg, ap);
   va_end(ap);
 
-  cat_snprintf(buffer, sizeof(buffer), buffer2);
+  cat_snprintf(buffer, sizeof(buffer), "%s", buffer2);
   if (pcity->debug) {
     notify_conn(NULL, NULL, E_AI_DEBUG, "%s", buffer);
   }
-  freelog(minlevel, buffer);
+  freelog(minlevel, "%s", buffer);
 }
 
 /**************************************************************************
@@ -206,11 +206,11 @@ void UNIT_LOG(int level, const struct unit *punit, const char *msg, ...)
   my_vsnprintf(buffer2, sizeof(buffer2), msg, ap);
   va_end(ap);
 
-  cat_snprintf(buffer, sizeof(buffer), buffer2);
+  cat_snprintf(buffer, sizeof(buffer), "%s", buffer2);
   if (punit->debug || messwin) {
     notify_conn(NULL, NULL, E_AI_DEBUG, "%s", buffer);
   }
-  freelog(minlevel, buffer);
+  freelog(minlevel, "%s", buffer);
 }
 
 /**************************************************************************
@@ -261,11 +261,11 @@ void BODYGUARD_LOG(int level, const struct unit *punit, const char *msg)
               type,
               TILE_XY(punit->tile),
 	      s, id, charge_x, charge_y);
-  cat_snprintf(buffer, sizeof(buffer), msg);
+  cat_snprintf(buffer, sizeof(buffer), "%s", msg);
   if (punit->debug) {
     notify_conn(NULL, NULL, E_AI_DEBUG, "%s", buffer);
   }
-  freelog(minlevel, buffer);
+  freelog(minlevel, "%s", buffer);
 }
 
 /**************************************************************************
@@ -311,42 +311,42 @@ void TIMING_RESULTS(void)
 {
   char buf[200];
 
-#define OUT(text, which)                                                 \
+#define AILOG_OUT(text, which)                                                 \
   my_snprintf(buf, sizeof(buf), "  %s: %g sec turn, %g sec game", text,  \
            read_timer_seconds(aitimer[which][0]),                        \
            read_timer_seconds(aitimer[which][1]));                       \
-  freelog(LOG_NORMAL, buf);                                              \
+  freelog(LOG_NORMAL, "%s", buf);                                        \
   notify_conn(NULL, NULL, E_AI_DEBUG, "%s", buf);
 
   freelog(LOG_NORMAL, "  --- AI timing results ---");
   notify_conn(NULL, NULL, E_AI_DEBUG, "  --- AI timing results ---");
-  OUT("Total AI time", AIT_ALL);
-  OUT("Movemap", AIT_MOVEMAP);
-  OUT("Units", AIT_UNITS);
-  OUT(" - Military", AIT_MILITARY);
-  OUT(" - Attack", AIT_ATTACK);
-  OUT(" - Defense", AIT_DEFENDERS);
-  OUT(" - Ferry", AIT_FERRY);
-  OUT(" - Rampage", AIT_RAMPAGE);
-  OUT(" - Bodyguard", AIT_BODYGUARD);
-  OUT(" - Recover", AIT_RECOVER);
-  OUT(" - Caravan", AIT_CARAVAN);
-  OUT(" - Hunter", AIT_HUNTER);
-  OUT(" - Airlift", AIT_AIRLIFT);
-  OUT(" - Diplomat", AIT_DIPLOMAT);
-  OUT(" - Air", AIT_AIRUNIT);
-  OUT(" - Explore", AIT_EXPLORER);
-  OUT("fstk", AIT_FSTK);
-  OUT("Settlers", AIT_SETTLERS);
-  OUT("Workers", AIT_WORKERS);
-  OUT("Government", AIT_GOVERNMENT);
-  OUT("Taxes", AIT_TAXES);
-  OUT("Cities", AIT_CITIES);
-  OUT(" - Buildings", AIT_BUILDINGS);
-  OUT(" - Danger", AIT_DANGER);
-  OUT(" - Worker want", AIT_CITY_TERRAIN);
-  OUT(" - Military want", AIT_CITY_MILITARY);
-  OUT(" - Settler want", AIT_CITY_SETTLERS);
-  OUT("Citizen arrange", AIT_CITIZEN_ARRANGE);
-  OUT("Tech", AIT_TECH);
+  AILOG_OUT("Total AI time", AIT_ALL);
+  AILOG_OUT("Movemap", AIT_MOVEMAP);
+  AILOG_OUT("Units", AIT_UNITS);
+  AILOG_OUT(" - Military", AIT_MILITARY);
+  AILOG_OUT(" - Attack", AIT_ATTACK);
+  AILOG_OUT(" - Defense", AIT_DEFENDERS);
+  AILOG_OUT(" - Ferry", AIT_FERRY);
+  AILOG_OUT(" - Rampage", AIT_RAMPAGE);
+  AILOG_OUT(" - Bodyguard", AIT_BODYGUARD);
+  AILOG_OUT(" - Recover", AIT_RECOVER);
+  AILOG_OUT(" - Caravan", AIT_CARAVAN);
+  AILOG_OUT(" - Hunter", AIT_HUNTER);
+  AILOG_OUT(" - Airlift", AIT_AIRLIFT);
+  AILOG_OUT(" - Diplomat", AIT_DIPLOMAT);
+  AILOG_OUT(" - Air", AIT_AIRUNIT);
+  AILOG_OUT(" - Explore", AIT_EXPLORER);
+  AILOG_OUT("fstk", AIT_FSTK);
+  AILOG_OUT("Settlers", AIT_SETTLERS);
+  AILOG_OUT("Workers", AIT_WORKERS);
+  AILOG_OUT("Government", AIT_GOVERNMENT);
+  AILOG_OUT("Taxes", AIT_TAXES);
+  AILOG_OUT("Cities", AIT_CITIES);
+  AILOG_OUT(" - Buildings", AIT_BUILDINGS);
+  AILOG_OUT(" - Danger", AIT_DANGER);
+  AILOG_OUT(" - Worker want", AIT_CITY_TERRAIN);
+  AILOG_OUT(" - Military want", AIT_CITY_MILITARY);
+  AILOG_OUT(" - Settler want", AIT_CITY_SETTLERS);
+  AILOG_OUT("Citizen arrange", AIT_CITIZEN_ARRANGE);
+  AILOG_OUT("Tech", AIT_TECH);
 }
diff --git a/bootstrap/config.rpath b/bootstrap/config.rpath
new file mode 100644
index 0000000..35f959b
--- /dev/null
+++ b/bootstrap/config.rpath
@@ -0,0 +1,666 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2008 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | cygwin* | pw32* | os2*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    rdos*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  case "$host_os" in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | k*bsd*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            :
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case $cc_basename in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct=no
+            ;;
+          *)
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    library_names_spec='$libname.a'
+    ;;
+  aix[4-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  amigaos*)
+    library_names_spec='$libname.a'
+    ;;
+  beos*)
+    library_names_spec='$libname$shrext'
+    ;;
+  bsdi[45]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  cygwin* | mingw* | pw32*)
+    shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    library_names_spec='$libname$shrext'
+    ;;
+  dgux*)
+    library_names_spec='$libname$shrext'
+    ;;
+  freebsd1*)
+    ;;
+  freebsd* | dragonfly*)
+    case "$host_os" in
+      freebsd[123]*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
+    ;;
+  gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    library_names_spec='$libname$shrext'
+    ;;
+  interix[3-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux* | k*bsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  netbsd*)
+    library_names_spec='$libname$shrext'
+    ;;
+  newsos6)
+    library_names_spec='$libname$shrext'
+    ;;
+  nto-qnx*)
+    library_names_spec='$libname$shrext'
+    ;;
+  openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    library_names_spec='$libname.a'
+    ;;
+  osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  rdos*)
+    ;;
+  solaris*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv4*MP*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  uts4*)
+    library_names_spec='$libname$shrext'
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
diff --git a/client/Makefile.in b/client/Makefile.in
index 77d57f2..606f2d9 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
@@ -345,7 +350,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	install-exec-recursive installdirs-recursive install-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = gui-stub gui-ftwl gui-xaw gui-sdl gui-win32 gui-gtk-2.0 \
+DIST_SUBDIRS = gui-sdl gui-stub gui-win32 gui-xaw gui-ftwl gui-gtk-2.0 \
 	include agents
 SOURCES = $(civclient_SOURCES)
 
diff --git a/client/agents/Makefile.in b/client/agents/Makefile.in
index a148aa9..aa7ac83 100644
--- a/client/agents/Makefile.in
+++ b/client/agents/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/client/agents/cma_fec.c b/client/agents/cma_fec.c
index dc6dcc5..2c69193 100644
--- a/client/agents/cma_fec.c
+++ b/client/agents/cma_fec.c
@@ -290,7 +290,7 @@ static const char *get_prod_complete_string(struct city *pcity, int surplus)
   } else {
     if (!pcity->production.is_unit
 	&& improvement_has_flag(pcity->production.value, IF_GOLD)) {
-      my_snprintf(buffer, sizeof(buffer),
+      my_snprintf(buffer, sizeof(buffer), "%s",
 		  improvement_name_translation(pcity->production.value));
       return buffer;
     }
diff --git a/client/citydlg_common.c b/client/citydlg_common.c
index 4a96afe..f94851d 100644
--- a/client/citydlg_common.c
+++ b/client/citydlg_common.c
@@ -211,7 +211,9 @@ void get_city_dialog_production(struct city *pcity,
      * be extended to return the longer of the two; in the meantime
      * translators can fudge it by changing this "filler" string. 
      */
-    my_snprintf(buffer, buffer_len, Q_("?filler:XXX/XXX XXX turns"));
+    /* TRANS: Use longer of "XXX turns" and "never" */
+    mystrlcpy(buffer, Q_("?filler:XXX/XXX XXX turns"), buffer_len);
+
     return;
   }
 
@@ -305,19 +307,21 @@ void get_city_dialog_production_row(char *buf[], size_t column_size,
   if (target.is_unit) {
     struct unit_type *ptype = utype_by_number(target.value);
 
-    my_snprintf(buf[0], column_size, utype_name_translation(ptype));
-    my_snprintf(buf[1], column_size, utype_values_string(ptype));
+    mystrlcpy(buf[0], utype_name_translation(ptype), column_size);
+    mystrlcpy(buf[1], utype_values_string(ptype), column_size);
     my_snprintf(buf[2], column_size, "(%d)", unit_build_shield_cost(ptype));
   } else {
     struct player *pplayer = pcity ? city_owner(pcity) : game.player_ptr;
 
     /* Total & turns left meaningless on capitalization */
     if (improvement_has_flag(target.value, IF_GOLD)) {
-      my_snprintf(buf[0], column_size, improvement_name_translation(target.value));
+      mystrlcpy(buf[0], improvement_name_translation(target.value),
+		column_size);
       buf[1][0] = '\0';
       my_snprintf(buf[2], column_size, "---");
     } else {
-      my_snprintf(buf[0], column_size, improvement_name_translation(target.value));
+      mystrlcpy(buf[0], improvement_name_translation(target.value),
+		column_size);
 
       /* from city.c get_impr_name_ex() */
       if (pcity && is_building_replaced(pcity, target.value, RPT_CERTAIN)) {
diff --git a/client/connectdlg_common.c b/client/connectdlg_common.c
index 6b92a6b..3cf8ead 100644
--- a/client/connectdlg_common.c
+++ b/client/connectdlg_common.c
@@ -196,7 +196,8 @@ bool client_start_server(void)
 # ifdef WIN32_NATIVE
   STARTUPINFO si;
   PROCESS_INFORMATION pi;
-  
+
+  char savesdir[MAX_LEN_PATH];
   char options[512];
   char cmdline1[512];
   char cmdline2[512];
@@ -311,8 +312,10 @@ bool client_start_server(void)
 		scriptfile);
   }
 
-  my_snprintf(options, sizeof(options), "-p %d -q 1 -e%s%s",
-	      internal_server_port, logcmdline, scriptcmdline);
+  interpret_tilde(savesdir, sizeof(savesdir), "~/.freeciv/saves");
+
+  my_snprintf(options, sizeof(options), "-p %d -q 1 -e%s%s --saves \"%s\"",
+	      internal_server_port, logcmdline, scriptcmdline, savesdir);
   my_snprintf(cmdline1, sizeof(cmdline1), "./ser %s", options);
   my_snprintf(cmdline2, sizeof(cmdline2), "./server/civserver %s", options);
   my_snprintf(cmdline3, sizeof(cmdline3), "civserver %s", options);
@@ -483,7 +486,6 @@ void send_start_saved_game(void)
   char buf[MAX_LEN_MSG];
 
   send_chat("/set timeout 0");
-  send_chat("/set autotoggle 1");
   my_snprintf(buf, sizeof(buf), "/take \"%s\" \"%s\"",
       	      user_name, leader_name);
   send_chat(buf);
diff --git a/client/goto.c b/client/goto.c
index 059985d..240e76a 100644
--- a/client/goto.c
+++ b/client/goto.c
@@ -1213,6 +1213,9 @@ void send_goto_route(void)
       struct unit_order order;
 
       order.order = goto_last_order;
+      order.dir = -1;
+      order.activity = ACTIVITY_LAST;
+
       send_goto_path(punit, path, &order);
     }
     pf_destroy_path(path);
diff --git a/client/gui-ftwl/Makefile.in b/client/gui-ftwl/Makefile.in
index de0d3f9..38be274 100644
--- a/client/gui-ftwl/Makefile.in
+++ b/client/gui-ftwl/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/client/gui-gtk-2.0/Makefile.in b/client/gui-gtk-2.0/Makefile.in
index 9e7964f..bf31b82 100644
--- a/client/gui-gtk-2.0/Makefile.in
+++ b/client/gui-gtk-2.0/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/client/gui-gtk-2.0/cityrep.c b/client/gui-gtk-2.0/cityrep.c
index 0f8a051..fef2336 100644
--- a/client/gui-gtk-2.0/cityrep.c
+++ b/client/gui-gtk-2.0/cityrep.c
@@ -97,6 +97,7 @@ static void popup_next_menu(GtkMenuShell *menu, gpointer data);
 
 static GtkWidget *city_center_command, *city_popup_command, *city_buy_command;
 static GtkWidget *city_production_command;
+static GtkWidget *city_total_buy_cost_label;
 
 
 static GtkWidget *change_improvements_item;
@@ -820,6 +821,10 @@ static void create_city_report_dialog(bool make_modal)
       _("_Buy"), CITY_BUY);
   city_buy_command = w;
 
+  city_total_buy_cost_label = gtk_label_new(NULL);
+  gtk_box_pack_end(GTK_BOX(city_dialog_shell->action_area),
+                   city_total_buy_cost_label, FALSE, FALSE, 0);
+
   gui_dialog_add_button(city_dialog_shell,
 			GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
 
@@ -1577,6 +1582,7 @@ static void popup_select_menu(GtkMenuShell *menu, gpointer data)
 static void city_selection_changed_callback(GtkTreeSelection *selection)
 {
   int n;
+  int total = 0;
 
   n = gtk_tree_selection_count_selected_rows(selection);
 
@@ -1586,11 +1592,40 @@ static void city_selection_changed_callback(GtkTreeSelection *selection)
     gtk_widget_set_sensitive(city_popup_command, FALSE);
     gtk_widget_set_sensitive(city_buy_command, FALSE);
   } else {
+    GList *rows, *p;
+    GtkTreeModel *model;
+    GtkTreePath *path;
+    GtkTreeIter iter;
+    gpointer res;
+    struct city *pcity;
+
     gtk_widget_set_sensitive(city_production_command,
 			     can_client_issue_orders());
     gtk_widget_set_sensitive(city_center_command, TRUE);
     gtk_widget_set_sensitive(city_popup_command, TRUE);
     gtk_widget_set_sensitive(city_buy_command, can_client_issue_orders());
+
+    rows = gtk_tree_selection_get_selected_rows(selection, &model);
+    for (p = rows; p != NULL; p = p->next) {
+      path = p->data;
+      if (gtk_tree_model_get_iter(model, &iter, path)) {
+        gtk_tree_model_get(model, &iter, 0, &res, -1);
+        pcity = res;
+        if (pcity != NULL) {
+          total += city_buy_cost(pcity);
+        }
+      }
+      gtk_tree_path_free(path);
+    }
+    g_list_free(rows);
+  }
+
+  if (total > 0) {
+    char buf[64];
+    my_snprintf(buf, sizeof(buf), _("Total Buy Cost: %d"), total);
+    gtk_label_set_text(GTK_LABEL(city_total_buy_cost_label), buf);
+  } else {
+    gtk_label_set_text(GTK_LABEL(city_total_buy_cost_label), NULL);
   }
 }
 
diff --git a/client/gui-gtk-2.0/dialogs.c b/client/gui-gtk-2.0/dialogs.c
index cf8b3c8..a4efb61 100644
--- a/client/gui-gtk-2.0/dialogs.c
+++ b/client/gui-gtk-2.0/dialogs.c
@@ -51,6 +51,7 @@
 #include "mapview.h"
 #include "options.h"
 #include "packhand.h"
+#include "plrdlg.h"
 #include "text.h"
 #include "tilespec.h"
 
@@ -660,7 +661,6 @@ static GtkWidget* create_list_of_nations_in_group(struct nation_group* group,
 
   /* Populate nation list store. */
   nations_iterate(pnation) {
-    struct sprite *s;
     bool used;
     GdkPixbuf *img;
     GtkTreeIter it;
@@ -676,11 +676,13 @@ static GtkWidget* create_list_of_nations_in_group(struct nation_group* group,
 
     gtk_list_store_append(store, &it);
 
-    s = crop_blankspace(get_nation_flag_sprite(tileset, pnation));
-    img = sprite_get_pixbuf(s);
     used = (pnation->player != NULL && pnation->player != races_player);
-    gtk_list_store_set(store, &it, 0, pnation->index, 1, used, 2, img, -1);
-    free_sprite(s);
+    gtk_list_store_set(store, &it, 0, nation_number(pnation), 1, used, -1);
+    img = get_flag(pnation);
+    if (img != NULL) {
+      gtk_list_store_set(store, &it, 2, img, -1);
+      g_object_unref(img);
+    }
 
     if (pnation->player == races_player) {
       /* FIXME: should select this one by default. */
@@ -950,6 +952,10 @@ static void create_races_dialog(struct player *pplayer)
  *****************************************************************/
 void popup_races_dialog(struct player *pplayer)
 {
+  if (!pplayer) {
+    return;
+  }
+
   if (!races_shell) {
     create_races_dialog(pplayer);
     gtk_window_present(GTK_WINDOW(races_shell));
@@ -1295,7 +1301,8 @@ void popup_upgrade_dialog(struct unit_list *punits)
 
   if (!get_units_upgrade_info(buf, sizeof(buf), punits)) {
     shell = gtk_message_dialog_new(NULL, 0,
-				   GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, buf);
+				   GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
+				   "%s", buf);
     gtk_window_set_title(GTK_WINDOW(shell), _("Upgrade Unit!"));
     setup_dialog(shell, toplevel);
     g_signal_connect(shell, "response", G_CALLBACK(gtk_widget_destroy),
@@ -1304,7 +1311,7 @@ void popup_upgrade_dialog(struct unit_list *punits)
   } else {
     shell = gtk_message_dialog_new(NULL, 0,
 				   GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
-				   buf);
+				   "%s", buf);
     gtk_window_set_title(GTK_WINDOW(shell), _("Upgrade Obsolete Units"));
     setup_dialog(shell, toplevel);
     gtk_dialog_set_default_response(GTK_DIALOG(shell), GTK_RESPONSE_YES);
diff --git a/client/gui-gtk-2.0/gotodlg.c b/client/gui-gtk-2.0/gotodlg.c
index d6d13a1..ef2eb2c 100644
--- a/client/gui-gtk-2.0/gotodlg.c
+++ b/client/gui-gtk-2.0/gotodlg.c
@@ -176,12 +176,12 @@ static void create_goto_dialog(void)
     "xalign", 0.0,
     "yalign", 0.5,
     NULL);
-  gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 
   all_toggle = gtk_check_button_new_with_mnemonic(_("Show _All Cities"));
-  gtk_box_pack_start(GTK_BOX(vbox), all_toggle, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(vbox), all_toggle, FALSE, FALSE, 0);
 
   g_signal_connect(all_toggle, "toggled", G_CALLBACK(update_goto_dialog), NULL);
 
diff --git a/client/gui-gtk-2.0/gui_main.c b/client/gui-gtk-2.0/gui_main.c
index b5b2954..93ce820 100644
--- a/client/gui-gtk-2.0/gui_main.c
+++ b/client/gui-gtk-2.0/gui_main.c
@@ -1293,7 +1293,7 @@ void ui_init(void)
    * civserver.dsc.in. */
   ggz_gtk_initialize(FALSE,
 		     ggz_connected, ggz_game_launched, ggz_closed,
-		     "Freeciv", NETWORK_CAPSTRING, "Pubserver");
+		     "Freeciv", NETWORK_CAPSTRING_MANDATORY, "Pubserver");
 #endif
 
   log_set_callback(log_callback_utf8);
@@ -1511,11 +1511,19 @@ void update_conn_list_dialog(void)
   } else {
     gtk_stockbutton_set_label(ready_button, _("_Start"));
   }
-  gtk_widget_set_sensitive(ready_button, (game.player_ptr != NULL));
 
-  gtk_stockbutton_set_label(nation_button, _("Pick _Nation"));
-  if (!aconnection.player) {
-    gtk_widget_set_sensitive(nation_button, game.info.is_new_game);
+  /* Observers and detached connections cannot start game. */
+  gtk_widget_set_sensitive(ready_button,
+                           (!aconnection.observer && game.player_ptr));
+
+  if (!game.player_ptr) {
+    gtk_stockbutton_set_label(nation_button, _("_Take Player"));
+    gtk_widget_set_sensitive(nation_button, TRUE);
+  } else {
+    gtk_stockbutton_set_label(nation_button, _("Pick _Nation"));
+    /* Sensitive iff client can select nation. */
+    gtk_widget_set_sensitive(nation_button,
+                             game.info.is_new_game && !aconnection.observer);
   }
 
   if (aconnection.player || !aconnection.observer) {
diff --git a/client/gui-gtk-2.0/pages.c b/client/gui-gtk-2.0/pages.c
index 8524f71..a0f138b 100644
--- a/client/gui-gtk-2.0/pages.c
+++ b/client/gui-gtk-2.0/pages.c
@@ -512,6 +512,8 @@ static void set_connection_state(enum connection_state state)
     gtk_widget_grab_focus(network_password);
     break;
   case ENTER_PASSWORD_TYPE:
+
+    set_client_page(PAGE_NETWORK);
     gtk_entry_set_text(GTK_ENTRY(network_password), "");
     gtk_entry_set_text(GTK_ENTRY(network_confirm_password), "");
 
@@ -1151,7 +1153,8 @@ static void show_conn_popup(struct player *pplayer, struct connection *pconn)
 
   /* Show popup. */
   popup = gtk_message_dialog_new(NULL, 0,
-				 GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, buf);
+				 GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
+				 "%s", buf);
   gtk_window_set_title(GTK_WINDOW(popup), _("Player/conn info"));
   setup_dialog(popup, toplevel);
   g_signal_connect(popup, "response", G_CALLBACK(gtk_widget_destroy), NULL);
diff --git a/client/gui-gtk-2.0/plrdlg.c b/client/gui-gtk-2.0/plrdlg.c
index cea6a88..cd88021 100644
--- a/client/gui-gtk-2.0/plrdlg.c
+++ b/client/gui-gtk-2.0/plrdlg.c
@@ -532,12 +532,14 @@ void create_players_dialog(void)
 #define MIN_DIMENSION 5
 
 /**************************************************************************
- Builds the flag pixmap.
+ Builds the flag pixmap. May return NULL if there is not enough memory.
+ You must call g_object_unref on the returned pixbuf when it is no
+ longer needed.
 **************************************************************************/
 GdkPixbuf *get_flag(const struct nation_type *nation)
 {
   int x0, y0, x1, y1, w, h;
-  GdkPixbuf *im, *im2;
+  GdkPixbuf *im;
   struct sprite *flag;
 
   flag = get_nation_flag_sprite(tileset, nation);
@@ -557,12 +559,14 @@ GdkPixbuf *get_flag(const struct nation_type *nation)
   assert(w >= MIN_DIMENSION && h >= MIN_DIMENSION);
 
   /* croping */
-  im = gdk_pixbuf_new_subpixbuf(sprite_get_pixbuf(flag), x0, y0, w, h);
-  im2 = gdk_pixbuf_copy(im);
-  g_object_unref(im);
+  im = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
+  if (im != NULL) {
+    gdk_pixbuf_copy_area(sprite_get_pixbuf(flag), x0, y0, w, h,
+                         im, 0, 0);
+  }
 
   /* and finaly store the scaled flag pixbuf in the static flags array */
-  return im2;
+  return im;
 }
 
 
diff --git a/client/gui-gtk-2.0/repodlgs.c b/client/gui-gtk-2.0/repodlgs.c
index 2ba87d9..7f40ea1 100644
--- a/client/gui-gtk-2.0/repodlgs.c
+++ b/client/gui-gtk-2.0/repodlgs.c
@@ -819,7 +819,7 @@ static void economy_command_callback(struct gui_dialog *dlg, int response,
       NULL,
       GTK_DIALOG_DESTROY_WITH_PARENT,
       GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
-      buf);
+      "%s", buf);
   setup_dialog(shell, gui_dialog_get_toplevel(dlg));
 
   g_signal_connect(shell, "response", G_CALLBACK(gtk_widget_destroy), NULL);
diff --git a/client/gui-gtk-2.0/wldlg.c b/client/gui-gtk-2.0/wldlg.c
index 0b1bab6..8398f7b 100644
--- a/client/gui-gtk-2.0/wldlg.c
+++ b/client/gui-gtk-2.0/wldlg.c
@@ -1014,7 +1014,8 @@ static void cell_render_func(GtkTreeViewColumn *col, GtkCellRenderer *rend,
     if (!target.is_unit && *pcity) {
       plr = city_owner(*pcity);
       useless = improvement_obsolete(plr, target.value)
-	|| is_building_replaced(*pcity, target.value, RPT_CERTAIN);
+        || (! impr_provides_buildable_units(plr, target.value)
+            && is_building_replaced(*pcity, target.value, RPT_CERTAIN));
       /* Mark building redundant if we are really certain that there is
        * no use for it. */
       g_object_set(rend, "strikethrough", useless, NULL);
diff --git a/client/gui-sdl/Makefile.in b/client/gui-sdl/Makefile.in
index 1e05d76..cde0e90 100644
--- a/client/gui-sdl/Makefile.in
+++ b/client/gui-sdl/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/client/gui-sdl/citydlg.c b/client/gui-sdl/citydlg.c
index 830ec82..46d0f90 100644
--- a/client/gui-sdl/citydlg.c
+++ b/client/gui-sdl/citydlg.c
@@ -3410,8 +3410,8 @@ static void redraw_city_dialog(struct city *pCity)
   if (pCity->specialists[SP_ELVIS]) {
     pBuf = get_tax_surface(O_LUXURY);
     
-    pCityDlg->specs_area[0].x = dest.x;
-    pCityDlg->specs_area[0].y = dest.y;
+    pCityDlg->specs_area[0].x = pWindow->dst->dest_rect.x + dest.x;
+    pCityDlg->specs_area[0].y = pWindow->dst->dest_rect.y + dest.y;
     pCityDlg->specs_area[0].w = pBuf->w;
     pCityDlg->specs_area[0].h = pBuf->h;
     for (i = 0; i < pCity->specialists[SP_ELVIS]; i++) {
@@ -3427,8 +3427,8 @@ static void redraw_city_dialog(struct city *pCity)
   if (pCity->specialists[SP_TAXMAN]) {
     pBuf = get_tax_surface(O_GOLD);
     
-    pCityDlg->specs_area[1].x = dest.x;
-    pCityDlg->specs_area[1].y = dest.y;
+    pCityDlg->specs_area[1].x = pWindow->dst->dest_rect.x + dest.x;
+    pCityDlg->specs_area[1].y = pWindow->dst->dest_rect.y + dest.y;
     pCityDlg->specs_area[1].w = pBuf->w;
     pCityDlg->specs_area[1].h = pBuf->h;
     for (i = 0; i < pCity->specialists[SP_TAXMAN]; i++) {
@@ -3444,8 +3444,8 @@ static void redraw_city_dialog(struct city *pCity)
   if (pCity->specialists[SP_SCIENTIST]) {
     pBuf = get_tax_surface(O_SCIENCE);
     
-    pCityDlg->specs_area[2].x = dest.x;
-    pCityDlg->specs_area[2].y = dest.y;
+    pCityDlg->specs_area[2].x = pWindow->dst->dest_rect.x + dest.x;
+    pCityDlg->specs_area[2].y = pWindow->dst->dest_rect.y + dest.y;
     pCityDlg->specs_area[2].w = pBuf->w;
     pCityDlg->specs_area[2].h = pBuf->h;
     for (i = 0; i < pCity->specialists[SP_SCIENTIST]; i++) {
diff --git a/client/gui-sdl/cityrep.c b/client/gui-sdl/cityrep.c
index 60c14dc..683aa93 100644
--- a/client/gui-sdl/cityrep.c
+++ b/client/gui-sdl/cityrep.c
@@ -278,7 +278,7 @@ static void real_info_city_report_dialog_update(void)
     pBuf->action = popup_citydlg_from_city_report_callback;
     set_wstate(pBuf, FC_WS_NORMAL);
     pBuf->data.city = pCity;
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf , WF_HIDDEN);
     }
     hh = pBuf->size.h;
@@ -291,7 +291,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->style |= SF_CENTER;
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -301,7 +301,7 @@ static void real_info_city_report_dialog_update(void)
     /* ----------- */
     pBuf = create_checkbox(pWindow->dst,
 	    cma_is_city_under_agent(pCity, NULL), WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -317,7 +317,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->fgcol = *get_game_colorRGB(COLOR_OVERVIEW_LAND);	
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -331,7 +331,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->fgcol = *get_game_colorRGB(COLOR_THEME_CITYDLG_FOOD_SURPLUS);
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -359,7 +359,7 @@ static void real_info_city_report_dialog_update(void)
     }
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -373,7 +373,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->fgcol = *get_game_colorRGB(COLOR_THEME_CITYDLG_TRADE);
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -386,7 +386,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->style |= SF_CENTER;
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -400,7 +400,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->fgcol = *get_game_colorRGB(COLOR_THEME_CITYDLG_GOLD);
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -414,7 +414,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->fgcol = *get_game_colorRGB(COLOR_THEME_CITYDLG_SCIENCE);
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -428,7 +428,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->fgcol = *get_game_colorRGB(COLOR_THEME_CITYDLG_LUX);
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -443,7 +443,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->fgcol = *get_game_colorRGB(COLOR_THEME_CITYDLG_PROD);
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -456,7 +456,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->style |= SF_CENTER;
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -471,7 +471,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->fgcol = *get_game_colorRGB(COLOR_THEME_CITYDLG_SUPPORT);
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -485,7 +485,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->fgcol = *get_game_colorRGB(COLOR_THEME_CITYDLG_TRADE);
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 					WF_RESTORE_BACKGROUND);
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -495,11 +495,15 @@ static void real_info_city_report_dialog_update(void)
     /* ----------- */
     if(pCity->production.is_unit) {
       struct unit_type *pUnitType = utype_by_number(pCity->production.value);
-      pLogo = ResizeSurface(get_unittype_surface(pUnitType), adj_size(36), adj_size(24), 1);      
+      pLogo = ResizeSurfaceBox(get_unittype_surface(pUnitType),
+                               adj_size(36), adj_size(24), 1,
+                               TRUE, TRUE);      
       togrow = unit_build_shield_cost(pUnitType);
       pName = utype_name_translation(pUnitType);
     } else {
-      pLogo = ResizeSurface(get_building_surface(pCity->production.value), adj_size(36), adj_size(24), 1);
+      pLogo = ResizeSurfaceBox(get_building_surface(pCity->production.value),
+                               adj_size(36), adj_size(24), 1,
+                               TRUE, TRUE);
       togrow = impr_build_shield_cost(pCity->production.value);
       pName = improvement_name_translation(pCity->production.value);
     }
@@ -535,7 +539,7 @@ static void real_info_city_report_dialog_update(void)
     pBuf = create_icon2(pLogo, pWindow->dst,
     	(WF_WIDGET_HAS_INFO_LABEL|WF_RESTORE_BACKGROUND|WF_FREE_THEME));
     pBuf->string16 = pStr;
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -549,7 +553,7 @@ static void real_info_city_report_dialog_update(void)
     pStr->fgcol = *get_game_colorRGB(COLOR_THEME_CITYREP_TEXT);
     pBuf = create_iconlabel(NULL, pWindow->dst, pStr,
 			(WF_SELLECT_WITHOUT_BAR|WF_RESTORE_BACKGROUND));
-    if(count > 9 * COL) {
+    if(count > 13 * COL) {
       set_wflag(pBuf, WF_HIDDEN);
     }
     hh = MAX(hh, pBuf->size.h);
@@ -562,7 +566,6 @@ static void real_info_city_report_dialog_update(void)
     }
     
     count += COL;
-    area.h += (hh + adj_size(2));
   } city_list_iterate_end;
   
   H = hh;
@@ -575,18 +578,20 @@ static void real_info_city_report_dialog_update(void)
   if(count) {
     pCityRep->pEndActiveWidgetList = pLast->prev;
     pCityRep->pBeginActiveWidgetList = pCityRep->pBeginWidgetList;
-    if(count > 10 * COL) {
+    if(count > 14 * COL) {
       pCityRep->pActiveWidgetList = pCityRep->pEndActiveWidgetList;
       if(pCityRep->pScroll) {
 	pCityRep->pScroll->count = count;
       }
-      ww = create_vertical_scrollbar(pCityRep, COL, 10, TRUE, TRUE);
+      ww = create_vertical_scrollbar(pCityRep, COL, 14, TRUE, TRUE);
       area.w += ww;
-      area.h = MAX(area.h, (10 * (hh + adj_size(2))));
+      area.h = 14 * (hh + adj_size(2));
+    } else {
+      area.h = (count / COL) * (hh + adj_size(2));
     }
   }
   
-  area.h += pText2->h + adj_size(40);
+  area.h += pText2->h + adj_size(6);
   area.w += adj_size(2);
   
   pLogo = theme_get_background(theme, BACKGROUND_CITYREP);
@@ -638,7 +643,7 @@ static void real_info_city_report_dialog_update(void)
   dst.x = area.x + adj_size(2);
   dst.y = area.y + 1;
   dst.w = (name_w + adj_size(6)) + (pText1->w + adj_size(8)) + adj_size(5);
-  dst.h = area.h - adj_size(33);
+  dst.h = area.h - adj_size(2);
   SDL_FillRectAlpha(pWindow->theme, &dst, &bg_color);
   
   putframe(pWindow->theme, dst.x , dst.y, dst.x + dst.w, dst.y + dst.h - 1,
@@ -670,7 +675,7 @@ static void real_info_city_report_dialog_update(void)
   dst.w = (pIcons->pBIG_Food->w + adj_size(6)) + adj_size(10) +
 	  (pIcons->pBIG_Food_Surplus->w + adj_size(6)) + adj_size(10) +
 	  			pText2->w + adj_size(6 + 2);
-  dst.h = area.h - adj_size(33);
+  dst.h = area.h - adj_size(2);
   SDL_FillRectAlpha(pWindow->theme, &dst, get_game_colorRGB(COLOR_THEME_CITYREP_FOODSTOCK));
   
   putframe(pWindow->theme, dst.x , dst.y, dst.x + dst.w, dst.y + dst.h - 1,
@@ -704,7 +709,7 @@ static void real_info_city_report_dialog_update(void)
 	  (pIcons->pBIG_Coin->w + adj_size(6)) + adj_size(10) +
 	  (pIcons->pBIG_Colb->w + adj_size(6)) + adj_size(10) +
 	  (pIcons->pBIG_Luxury->w + adj_size(6)) + adj_size(4);
-  dst.h = area.h - adj_size(33);
+  dst.h = area.h - adj_size(2);
   
   SDL_FillRectAlpha(pWindow->theme, &dst, get_game_colorRGB(COLOR_THEME_CITYREP_TRADE));
   
@@ -741,7 +746,7 @@ static void real_info_city_report_dialog_update(void)
 	  (pIcons->pBIG_Shield_Corr->w + adj_size(6)) + adj_size(10) +
 	  (pUnits_Icon->w + adj_size(6)) + adj_size(10) +
 	  (pIcons->pBIG_Shield_Surplus->w + adj_size(6)) + adj_size(4);
-  dst.h = area.h - adj_size(33);
+  dst.h = area.h - adj_size(2);
   
   SDL_FillRectAlpha(pWindow->theme, &dst, get_game_colorRGB(COLOR_THEME_CITYREP_PROD));
   
diff --git a/client/gui-sdl/gui_main.c b/client/gui-sdl/gui_main.c
index bcda6af..404983e 100644
--- a/client/gui-sdl/gui_main.c
+++ b/client/gui-sdl/gui_main.c
@@ -241,7 +241,7 @@ static void parse_options(int argc, char **argv)
 static Uint16 main_key_down_handler(SDL_keysym Key, void *pData)
 {
   static struct widget *pWidget;
-  if ((pWidget = MainWidgetListKeyScaner(Key)) != NULL) {
+  if ((pWidget = find_next_widget_for_key(NULL, Key)) != NULL) {
     return widget_pressed_action(pWidget);
   } else {
     if (Key.sym == SDLK_TAB) {
@@ -326,12 +326,16 @@ static Uint16 main_key_up_handler(SDL_keysym Key, void *pData)
 **************************************************************************/
 static Uint16 main_mouse_button_down_handler(SDL_MouseButtonEvent *pButtonEvent, void *pData)
 {
-  static struct widget *pWidget;
-  if ((pWidget = MainWidgetListScaner(pButtonEvent->x, pButtonEvent->y)) != NULL) {
+  struct widget *pWidget;
+  
+  if ((pWidget = find_next_widget_at_pos(NULL,
+                                         pButtonEvent->x,
+                                         pButtonEvent->y)) != NULL) {
     if (!(get_wstate(pWidget) == FC_WS_DISABLED)) {
       return widget_pressed_action(pWidget);
     }
   } else {
+    /* no visible widget at this position -> map click */ 
 #ifdef UNDER_CE
     if (!check_scroll_area(pButtonEvent->x, pButtonEvent->y)) {
 #endif        
@@ -353,7 +357,7 @@ static Uint16 main_mouse_button_down_handler(SDL_MouseButtonEvent *pButtonEvent,
 static Uint16 main_mouse_button_up_handler(SDL_MouseButtonEvent *pButtonEvent, void *pData)
 {
   if (button_behavior.button_down_ticks /* button wasn't pressed over a widget */
-     && !MainWidgetListScaner(pButtonEvent->x, pButtonEvent->y)) {
+     && !find_next_widget_at_pos(NULL, pButtonEvent->x, pButtonEvent->y)) {
     *button_behavior.event = *pButtonEvent;
     button_up_on_map(&button_behavior);
   }
@@ -400,7 +404,9 @@ static Uint16 main_mouse_motion_handler(SDL_MouseMotionEvent *pMotionEvent, void
   }
 #endif          
 
-  if ((pWidget = MainWidgetListScaner(pMotionEvent->x, pMotionEvent->y)) != NULL) {
+  if ((pWidget = find_next_widget_at_pos(NULL,
+                                         pMotionEvent->x,
+                                         pMotionEvent->y)) != NULL) {
     update_mouse_cursor(CURSOR_DEFAULT);
     if (!(get_wstate(pWidget) == FC_WS_DISABLED)) {
       widget_sellected_action(pWidget);
diff --git a/client/gui-sdl/widget.c b/client/gui-sdl/widget.c
index 4b49fa4..33c4fd7 100644
--- a/client/gui-sdl/widget.c
+++ b/client/gui-sdl/widget.c
@@ -214,73 +214,65 @@ SDL_Surface *create_bcgnd_surf(SDL_Surface * pTheme, Uint8 state,
 }
 
 /* =================================================== */
-/* ===================== GUI LIST ==================== */
+/* ===================== WIDGET LIST ==================== */
 /* =================================================== */
 
 /**************************************************************************
-  Simple "Search and De..." no search in 'pGUI_List' == "Widget's list" and
-  return ( not Disabled and not Hiden ) widget under cursor 'pPosition'.
+  Find the next visible widget in the widget list starting with
+  pStartWidget that is drawn at position (x, y). If pStartWidget is NULL,
+  the search starts with the first entry of the main widget list. 
 **************************************************************************/
-struct widget * WidgetListScaner(const struct widget *pGUI_List, int x, int y)
+struct widget *find_next_widget_at_pos(struct widget *pStartWidget, int x, int y)
 {
   SDL_Rect area = {0, 0, 0, 0};
-
-  while (pGUI_List) {
-    area.x = pGUI_List->dst->dest_rect.x + pGUI_List->size.x;
-    area.y = pGUI_List->dst->dest_rect.y + pGUI_List->size.y;
-    area.w = pGUI_List->size.w;
-    area.h = pGUI_List->size.h;
+  struct widget *pWidget;
+  
+  pWidget = pStartWidget ? pStartWidget : pBeginMainWidgetList;
+  
+  while (pWidget) {
+    area.x = pWidget->dst->dest_rect.x + pWidget->size.x;
+    area.y = pWidget->dst->dest_rect.y + pWidget->size.y;
+    area.w = pWidget->size.w;
+    area.h = pWidget->size.h;
     if (is_in_rect_area(x, y, area)
-       && !((get_wflags(pGUI_List) & WF_HIDDEN) == WF_HIDDEN)) {
-      return (struct widget *) pGUI_List;
+       && !((get_wflags(pWidget) & WF_HIDDEN) == WF_HIDDEN)) {
+      return (struct widget *) pWidget;
     }
-    pGUI_List = pGUI_List->next;
+    pWidget = pWidget->next;
   }
   return NULL;
 }
 
 /**************************************************************************
-  Search in 'pGUI_List' == "Widget's list" and
-  return ( not Disabled and not Hiden ) widget with 'Key' allias.
+  Find the next enabled and visible widget in the widget list starting
+  with pStartWidget that handles the given key. If pStartWidget is NULL,
+  the search starts with the first entry of the main widget list.
   NOTE: This function ignores CapsLock and NumLock Keys.
 **************************************************************************/
-struct widget *WidgetListKeyScaner(const struct widget *pGUI_List, SDL_keysym Key)
+struct widget *find_next_widget_for_key(struct widget *pStartWidget,
+                                        SDL_keysym key)
 {
-  Key.mod &= ~(KMOD_NUM | KMOD_CAPS);
-  while (pGUI_List) {
-    if ((pGUI_List->key == Key.sym ||
-      (pGUI_List->key == SDLK_RETURN && Key.sym == SDLK_KP_ENTER) ||
-      (pGUI_List->key == SDLK_KP_ENTER && Key.sym == SDLK_RETURN)) &&
-	((pGUI_List->mod & Key.mod) || (pGUI_List->mod == Key.mod))) {
-      if (!((get_wstate(pGUI_List) == FC_WS_DISABLED) ||
-	    ((get_wflags(pGUI_List) & WF_HIDDEN) == WF_HIDDEN))) {
-	return (struct widget *) pGUI_List;
+  struct widget *pWidget;
+  
+  pWidget = pStartWidget ? pStartWidget : pBeginMainWidgetList;
+  
+  key.mod &= ~(KMOD_NUM | KMOD_CAPS);
+  while (pWidget) {
+    if ((pWidget->key == key.sym ||
+      (pWidget->key == SDLK_RETURN && key.sym == SDLK_KP_ENTER) ||
+      (pWidget->key == SDLK_KP_ENTER && key.sym == SDLK_RETURN)) &&
+	((pWidget->mod & key.mod) || (pWidget->mod == key.mod))) {
+      if (!((get_wstate(pWidget) == FC_WS_DISABLED) ||
+	    ((get_wflags(pWidget) & WF_HIDDEN) == WF_HIDDEN))) {
+	return (struct widget *) pWidget;
       }
     }
-    pGUI_List = pGUI_List->next;
+    pWidget = pWidget->next;
   }
   return NULL;
 }
 
 /**************************************************************************
-  Pointer to Main Widget list is declared staric in 'gui_stuff.c'
-  This function only calls 'WidgetListScaner' in Main list
-  'pBeginMainWidgetList'
-**************************************************************************/
-struct widget *MainWidgetListScaner(int x, int y)
-{
-  return WidgetListScaner(pBeginMainWidgetList, x, y);
-}
-
-/**************************************************************************
-  ...
-**************************************************************************/
-struct widget *MainWidgetListKeyScaner(SDL_keysym Key)
-{
-  return WidgetListKeyScaner(pBeginMainWidgetList, Key);
-}
-
-/**************************************************************************
   Do default Widget action when pressed, and then call widget callback
   function.
 
@@ -398,7 +390,7 @@ Uint16 widget_pressed_action(struct widget * pWidget)
     default:
       ID = pWidget->ID;
       if (pWidget->action) {
-        if (pWidget->action(pWidget)) {
+        if (pWidget->action(pWidget) != 0) {
           ID = 0;
         }
       }
diff --git a/client/gui-sdl/widget.h b/client/gui-sdl/widget.h
index 6780910..36aba41 100644
--- a/client/gui-sdl/widget.h
+++ b/client/gui-sdl/widget.h
@@ -193,11 +193,8 @@ void move_widget_to_front_of_gui_list(struct widget *pGUI);
 void del_gui_list(struct widget *pGUI_List);
 void del_main_list(void);
 
-struct widget *WidgetListScaner(const struct widget *pGUI_List, int x, int y);
-struct widget *MainWidgetListScaner(int x, int y);
-struct widget *WidgetListKeyScaner(const struct widget *pGUI_List,
-				SDL_keysym Key);
-struct widget *MainWidgetListKeyScaner(SDL_keysym Key);
+struct widget *find_next_widget_at_pos(struct widget *pStartWidget, int x, int y);
+struct widget *find_next_widget_for_key(struct widget *pStartWidget, SDL_keysym key);
 
 struct widget *get_widget_pointer_form_ID(const struct widget *pGUI_List, Uint16 ID,
                                        enum scan_direction direction);
diff --git a/client/gui-sdl/wldlg.c b/client/gui-sdl/wldlg.c
index 44ed145..b3c22e7 100644
--- a/client/gui-sdl/wldlg.c
+++ b/client/gui-sdl/wldlg.c
@@ -761,12 +761,12 @@ static void set_global_worklist(struct widget *pWidget)
 	  pBuf = create_iconlabel(NULL, pWidget->dst,
 		create_str16_from_char(utype_name_translation(utype_by_number(target.value)), adj_font(10)),
 				(WF_RESTORE_BACKGROUND|WF_FREE_DATA));
-	  pBuf->ID = MAX_ID - B_LAST - target.value;
+	  pBuf->ID = MAX_ID - cid_encode(target);
         } else {
 	  pBuf = create_iconlabel(NULL, pWidget->dst,
 	  create_str16_from_char(get_impr_name_ex(pEditor->pCity, target.value), adj_font(10)),
 				(WF_RESTORE_BACKGROUND|WF_FREE_DATA));
-	  pBuf->ID = MAX_ID - target.value;
+	  pBuf->ID = MAX_ID - cid_encode(target);
         }
         pBuf->string16->style |= SF_CENTER;
         set_wstate(pBuf, FC_WS_NORMAL);
@@ -1468,7 +1468,7 @@ void popup_worklist_editor(struct city *pCity, struct worklist *pWorkList)
       pText_Name = create_text_surf_smaller_that_w(pStr, pIcon->w - 4);
   
       if (pCity) {
-        turns = city_turns_to_build(pCity, cid_production(un->index), TRUE);
+        turns = city_turns_to_build(pCity, cid_production(cid_encode_unit(un)), TRUE);
         if (turns == FC_INFINITY) {
           my_snprintf(cBuf, sizeof(cBuf),
 		    _("(%d/%d/%d)\n%d/%d %s\nnever"),
diff --git a/client/gui-stub/Makefile.in b/client/gui-stub/Makefile.in
index e3186ee..0726d1c 100644
--- a/client/gui-stub/Makefile.in
+++ b/client/gui-stub/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/client/gui-win32/Makefile.in b/client/gui-win32/Makefile.in
index e661956..004c093 100644
--- a/client/gui-win32/Makefile.in
+++ b/client/gui-win32/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/client/gui-xaw/Freeciv.h b/client/gui-xaw/Freeciv.h
index a0d6274..b4dba5f 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.1.5",
+"Freeciv*version:                             2.1.8",
 "Freeciv.title:                               Freeciv",
 "Freeciv.iconName:                            Freeciv",
 "Freeciv*borderColor:                         black",
diff --git a/client/gui-xaw/Makefile.in b/client/gui-xaw/Makefile.in
index 8f63bdc..56ceb30 100644
--- a/client/gui-xaw/Makefile.in
+++ b/client/gui-xaw/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/client/gui-xaw/cma_fe.c b/client/gui-xaw/cma_fe.c
index 71a0500..c3fea4a 100644
--- a/client/gui-xaw/cma_fe.c
+++ b/client/gui-xaw/cma_fe.c
@@ -379,8 +379,8 @@ static void update_cma_preset_list(void)
   if (cmafec_preset_num()) {
     /* Add all CMA presets to the list. */
     for (i = 0; i < cmafec_preset_num(); i++) {
-      my_snprintf(preset_text[i], sizeof(preset_text[i]),
-                  cmafec_preset_get_descr(i));
+      mystrlcpy(preset_text[i], cmafec_preset_get_descr(i),
+		sizeof(preset_text[i]));
       preset_lines[i] = preset_text[i];
     }
     XawListChange(preset_list, preset_lines, cmafec_preset_num(), 0, True);
diff --git a/client/helpdata.c b/client/helpdata.c
index 1b089a8..45850e2 100644
--- a/client/helpdata.c
+++ b/client/helpdata.c
@@ -218,7 +218,7 @@ static void insert_requirement(struct requirement *req,
 }
 
 /****************************************************************************
-  Append text for what this requirement source allows.  Something like
+  Generate text for what this requirement source allows.  Something like
 
     "Allows Communism government (with University technology).\n\n"
     "Allows Mfg. Plant building (with Factory building).\n\n"
@@ -226,6 +226,10 @@ static void insert_requirement(struct requirement *req,
   This should be called to generate helptext for every possible source
   type.  Note this doesn't handle effects but rather production
   requirements (currently only building reqs).
+
+  NB: This function overwrites any existing buffer contents by writing the
+  generated text to the start of the given 'buf' pointer (i.e. it does
+  NOT append like cat_snprintf).
 ****************************************************************************/
 static void insert_allows(struct req_source *psource,
 			  char *buf, size_t bufsz)
@@ -1301,7 +1305,7 @@ void helptext_government(char *buf, size_t bufsz, struct government *gov,
 
   /* Effects */
   CATLSTR(buf, bufsz, _("Features:\n"));
-  insert_allows(&source, buf, bufsz);
+  insert_allows(&source, buf + strlen(buf), bufsz - strlen(buf));
   effect_list_iterate(get_req_source_effects(&source), peffect) {
     Output_type_id output_type = O_LAST;
     struct unit_class *unitclass = NULL;
@@ -1327,8 +1331,8 @@ void helptext_government(char *buf, size_t bufsz, struct government *gov,
 
            output_type = preq->source.value.outputtype;
            oname = get_output_name(output_type);
-           astr_add(&outputs_or, oname);
-           astr_add(&outputs_and, oname);
+           astr_add(&outputs_or, "%s", oname);
+           astr_add(&outputs_and, "%s", oname);
          }
          break;
        case REQ_UNITCLASS:
@@ -1382,32 +1386,32 @@ void helptext_government(char *buf, size_t bufsz, struct government *gov,
 
           if (!harvested_only || pot->harvested) {
             if (prev2 != NULL) {
-              astr_add(&outputs_or,  prev2);
-              astr_add(&outputs_or,  Q_("?or:, "));
-              astr_add(&outputs_and, prev2);
-              astr_add(&outputs_and, Q_("?and:, "));
+              astr_add(&outputs_or,  "%s", prev2);
+              astr_add(&outputs_or,  "%s", Q_("?or:, "));
+              astr_add(&outputs_and, "%s", prev2);
+              astr_add(&outputs_and, "%s", Q_("?and:, "));
             }
             prev2 = prev;
             prev = _(pot->name);
           }
         } output_type_iterate_end;
         if (prev2 != NULL) {
-          astr_add(&outputs_or, prev2);
+          astr_add(&outputs_or, "%s", prev2);
           /* TRANS: List of possible output types has this between
            *        last two elements */
-          astr_add(&outputs_or,  Q_(" or "));
-          astr_add(&outputs_and, prev2);
+          astr_add(&outputs_or,  "%s", Q_(" or "));
+          astr_add(&outputs_and, "%s", prev2);
           /* TRANS: List of possible output types has this between
            *        last two elements */
-          astr_add(&outputs_and, Q_(" and "));
+          astr_add(&outputs_and, "%s", Q_(" and "));
         }
         if (prev != NULL) {
-          astr_add(&outputs_or, prev);
-          astr_add(&outputs_and, prev);
+          astr_add(&outputs_or,  "%s", prev);
+          astr_add(&outputs_and, "%s", prev);
         } else {
           /* TRANS: Empty output type list, should never happen. */
-          astr_add(&outputs_or,  Q_("?outputlist: Nothing "));
-          astr_add(&outputs_and, Q_("?outputlist: Nothing "));
+          astr_add(&outputs_or,  "%s", Q_("?outputlist: Nothing "));
+          astr_add(&outputs_and, "%s", Q_("?outputlist: Nothing "));
         }
       }
 
diff --git a/client/include/Makefile.in b/client/include/Makefile.in
index 79688e9..11565e3 100644
--- a/client/include/Makefile.in
+++ b/client/include/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/client/mapview_common.c b/client/mapview_common.c
index 89e56e5..0fcff9d 100644
--- a/client/mapview_common.c
+++ b/client/mapview_common.c
@@ -2196,7 +2196,7 @@ void get_city_mapview_name_and_growth(struct city *pcity,
 				      size_t growth_buffer_len,
 				      enum color_std *growth_color)
 {
-  my_snprintf(name_buffer, name_buffer_len, city_name(pcity));
+  mystrlcpy(name_buffer, city_name(pcity), name_buffer_len);
 
   if (!game.player_ptr || city_owner(pcity) == game.player_ptr) {
     int turns = city_turns_to_grow(pcity);
diff --git a/client/packhand.c b/client/packhand.c
index 05f1531..c5422a0 100644
--- a/client/packhand.c
+++ b/client/packhand.c
@@ -215,7 +215,7 @@ void handle_server_join_reply(bool you_can_join, char *message,
     aconnection.id = 0;
     if (auto_connect) {
       freelog(LOG_NORMAL, _("You were rejected from the game...."));
-      freelog(LOG_NORMAL, msg);
+      freelog(LOG_NORMAL, "%s", msg);
     }
     gui_server_connect();
     if (!with_ggz) {
@@ -889,10 +889,6 @@ void handle_start_phase(int phase)
   game.info.phase = phase;
 
   if (game.player_ptr && is_player_phase(game.player_ptr, phase)) {
-    /* HACK: this is updated by the player packet too; we update it here
-     * so the turn done button state will be set properly. */
-    game.player_ptr->phase_done = FALSE;
-
     agents_start_turn();
     non_ai_unit_focus = FALSE;
 
@@ -1443,10 +1439,6 @@ void handle_game_info(struct packet_game_info *pinfo)
     = government_by_number(game.info.government_when_anarchy_id);
   game.player_ptr = player_by_number(game.info.player_idx);
 
-  if (C_S_PREPARING == client_state()) {
-    /* FIXME: only for change in nations */
-    popdown_races_dialog();
-  }
   boot_help = (can_client_change_view()
 	       && game.info.spacerace != pinfo->spacerace);
   if (game.info.timeout != 0 && pinfo->seconds_to_phasedone >= 0) {
@@ -1518,7 +1510,7 @@ void start_revolution(void)
 void handle_player_info(struct packet_player_info *pinfo)
 {
   int i;
-  bool poptechup, new_tech = FALSE;
+  bool poptechup, new_tech = FALSE, phase_done_changed;
   char msg[MAX_LEN_MSG];
   struct player *pplayer = &game.players[pinfo->playerno];
   struct player_research* research;
@@ -1656,10 +1648,7 @@ void handle_player_info(struct packet_player_info *pinfo)
 
   pplayer->is_ready = pinfo->is_ready;
 
-  if (pplayer == game.player_ptr
-      && pplayer->phase_done != pinfo->phase_done) {
-    update_turn_done_button_state();
-  }
+  phase_done_changed = (pplayer->phase_done != pinfo->phase_done);
   pplayer->phase_done = pinfo->phase_done;
 
   pplayer->nturns_idle=pinfo->nturns_idle;
@@ -1669,6 +1658,9 @@ void handle_player_info(struct packet_player_info *pinfo)
   pplayer->revolution_finishes = pinfo->revolution_finishes;
   pplayer->ai.skill_level = pinfo->ai_skill_level;
 
+  if (pplayer == game.player_ptr && phase_done_changed) {
+    update_turn_done_button_state();
+  }
   update_players_dialog();
   update_worklist_report_dialog();
   upgrade_canvas_clipboard();
@@ -2128,20 +2120,8 @@ void handle_tile_info(struct packet_tile_info *packet)
     unit_list_unlink_all(ptile->units);
   }
 
-  /* update continents */
-  if (ptile->continent != packet->continent && ptile->continent != 0
-      && packet->continent > 0) {
-    /* We're renumbering continents, somebody did a transform.
-     * But we don't care about renumbering oceans since 
-     * num_oceans is not kept at the client. */
-    map.num_continents = 0;
-  }
-
   ptile->continent = packet->continent;
-
-  if (ptile->continent > map.num_continents) {
-    map.num_continents = ptile->continent;
-  }
+  map.num_continents = MAX(ptile->continent, map.num_continents);
 
   if (known_changed || tile_changed) {
     /* 
@@ -2178,6 +2158,12 @@ void handle_tile_info(struct packet_tile_info *packet)
 **************************************************************************/
 void handle_player_remove(int player_id)
 {
+  if (player_id < 0 || player_id >= MAX_NUM_PLAYERS) {
+    freelog(LOG_ERROR, "Illegal player_remove packet from server (%d)",
+            player_id);
+    return;
+  }
+
   client_remove_player(player_id);
   update_conn_list_dialog();
 }
@@ -2191,6 +2177,10 @@ void handle_ruleset_control(struct packet_ruleset_control *packet)
 {
   int i;
 
+  /* The ruleset is going to load new nations. So close
+   * the nation selection dialog if it is open. */
+  popdown_races_dialog();
+
   ruleset_data_free();
 
   ruleset_cache_init();
@@ -2364,7 +2354,15 @@ void handle_ruleset_building(struct packet_ruleset_building *p)
     } impr_type_iterate_end;
   }
 #endif
-  
+
+  b->allows_units = FALSE;
+  unit_type_iterate(ut) {
+    if (ut->impr_requirement == p->id) {
+      b->allows_units = TRUE;
+      break;
+    }
+  } unit_type_iterate_end;
+
   tileset_setup_impr_type(tileset, p->id);
 }
 
diff --git a/client/repodlgs_common.c b/client/repodlgs_common.c
index 05d5a79..c453170 100644
--- a/client/repodlgs_common.c
+++ b/client/repodlgs_common.c
@@ -29,6 +29,7 @@
 #include "repodlgs_g.h"
 
 #include "civclient.h"		/* can_client_issue_orders */
+#include "connectdlg_common.h"	/* is_server_running */
 #include "control.h"
 #include "options.h"
 #include "repodlgs_common.h"
@@ -350,7 +351,10 @@ void handle_options_settable(struct packet_options_settable *packet)
 
   /* have no proper final packet, test for the last instead */
   if (i == (num_settable_options - 1) && !settable_options_loaded) {
-    load_settable_options(TRUE);
+    /* Only send our private settings if we are running
+     * on a forked local server, i.e. started by the
+     * client with the "Start New Game" button. */
+    load_settable_options(is_server_running());
     settable_options_loaded = TRUE;
   }
 }
diff --git a/client/servers.c b/client/servers.c
index 9fe779c..d41a996 100644
--- a/client/servers.c
+++ b/client/servers.c
@@ -350,7 +350,7 @@ static void meta_read_response(struct server_scan *scan)
     result = my_readsocket(scan->sock, buf, sizeof(buf));
 
     if (result < 0) {
-      if (errno == EAGAIN || errno == EINTR) {
+      if (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK) {
 	/* Keep waiting. */
 	return;
       }
@@ -533,7 +533,11 @@ static bool begin_lanserver_scan(struct server_scan *scan)
   union my_sockaddr addr;
   struct data_out dout;
   int sock, opt = 1;
+#ifndef HAVE_WINSOCK
   unsigned char buffer[MAX_LEN_PACKET];
+#else  /* HAVE_WINSOCK */
+  char buffer[MAX_LEN_PACKET];
+#endif /* HAVE_WINSOCK */
   struct ip_mreq mreq;
   const char *group;
   size_t size;
diff --git a/client/text.c b/client/text.c
index 2cf7cbd..9295f14 100644
--- a/client/text.c
+++ b/client/text.c
@@ -603,8 +603,12 @@ const char *get_info_label_text(void)
 		  game.player_ptr->economic.science);
   }
   if (!game.info.simultaneous_phases) {
-    astr_add_line(&str, _("Moving: %s"),
-		  player_name(player_by_number(game.info.phase)));
+    if (game.info.phase < 0 || game.info.phase >= game.info.nplayers) {
+      astr_add_line(&str, _("Moving: Nobody"));
+    } else {
+      astr_add_line(&str, _("Moving: %s"),
+                    player_name(player_by_number(game.info.phase)));
+    }
   }
   astr_add_line(&str, _("(Click for more info)"));
   return str.str;
@@ -708,7 +712,7 @@ const char *get_unit_info_label_text2(struct unit_list *punits)
 
     if (!goto_get_turns(&min, &max)) {
       /* TRANS: Impossible to reach goto target tile */
-      astr_add_line(&str, Q_("?goto:Unreachable"));
+      astr_add_line(&str, "%s", Q_("?goto:Unreachable"));
     } else if (min == max) {
       astr_add_line(&str, _("Turns to target: %d"), max);
     } else {
@@ -952,7 +956,7 @@ const char *get_government_tooltip(void)
 
   astr_add_line(&str, _("Shows your current government:"));
   if (game.player_ptr) {
-    astr_add_line(&str, government_name_for_player(game.player_ptr));
+    astr_add_line(&str, "%s", government_name_for_player(game.player_ptr));
   }
   return str.str;
 }
@@ -1167,7 +1171,7 @@ const char *text_happiness_buildings(const struct city *pcity)
   if (faces == 0) {
     astr_add(&str, _("None. "));
   } else {
-    astr_add(&str, Q_("?clistend:."));
+    astr_add(&str, "%s", Q_("?clistend:."));
   }
 
   return str.str;
@@ -1206,7 +1210,7 @@ const char *text_happiness_wonders(const struct city *pcity)
   if (faces == 0) {
     astr_add(&str, _("None. "));
   } else {
-    astr_add(&str, Q_("?clistend:."));
+    astr_add(&str, "%s",  Q_("?clistend:."));
   }
 
   return str.str;
diff --git a/client/tilespec.c b/client/tilespec.c
index bab30c1..606f640 100644
--- a/client/tilespec.c
+++ b/client/tilespec.c
@@ -4210,22 +4210,6 @@ int fill_sprite_array(struct tileset *t,
     }
     break;
 
-  case LAYER_FOG:
-    sprs += fill_fog_sprite_array(t, sprs, ptile, pedge, pcorner);
-    break;
-
-  case LAYER_CITY2:
-    /* City size.  Drawing this under fog makes it hard to read. */
-    if (pcity && draw_cities && !draw_full_citybar) {
-      if (pcity->size >= 10) {
-	ADD_SPRITE(t->sprites.city.size_tens[pcity->size / 10],
-		   FALSE, FULL_TILE_X_OFFSET, FULL_TILE_Y_OFFSET);
-      }
-      ADD_SPRITE(t->sprites.city.size[pcity->size % 10],
-		 FALSE, FULL_TILE_X_OFFSET, FULL_TILE_Y_OFFSET);
-    }
-    break;
-
   case LAYER_UNIT:
   case LAYER_FOCUS_UNIT:
     if (do_draw_unit && XOR(layer == LAYER_UNIT, unit_is_in_focus(punit))) {
@@ -4254,6 +4238,22 @@ int fill_sprite_array(struct tileset *t,
     }
     break;
 
+  case LAYER_FOG:
+    sprs += fill_fog_sprite_array(t, sprs, ptile, pedge, pcorner);
+    break;
+
+  case LAYER_CITY2:
+    /* City size.  Drawing this under fog makes it hard to read. */
+    if (pcity && draw_cities && !draw_full_citybar) {
+      if (pcity->size >= 10) {
+	ADD_SPRITE(t->sprites.city.size_tens[pcity->size / 10],
+		   FALSE, FULL_TILE_X_OFFSET, FULL_TILE_Y_OFFSET);
+      }
+      ADD_SPRITE(t->sprites.city.size[pcity->size % 10],
+		 FALSE, FULL_TILE_X_OFFSET, FULL_TILE_Y_OFFSET);
+    }
+    break;
+
   case LAYER_GRID2:
     if (!t->is_isometric) {
       sprs += fill_grid_sprite_array(t, sprs, ptile, pedge, pcorner,
diff --git a/client/tilespec.h b/client/tilespec.h
index a5cdb8d..10438a6 100644
--- a/client/tilespec.h
+++ b/client/tilespec.h
@@ -75,10 +75,10 @@ enum mapview_layer {
   LAYER_GRID1,
   LAYER_CITY1,
   LAYER_SPECIAL2,
-  LAYER_FOG,
-  LAYER_CITY2,
   LAYER_UNIT,
   LAYER_SPECIAL3,
+  LAYER_FOG,
+  LAYER_CITY2,
   LAYER_GRID2,
   LAYER_OVERLAYS,
   LAYER_CITYBAR,
diff --git a/common/Makefile.in b/common/Makefile.in
index d234e62..bec870a 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/common/aicore/Makefile.in b/common/aicore/Makefile.in
index 7f4f1f8..ff6292f 100644
--- a/common/aicore/Makefile.in
+++ b/common/aicore/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/common/capstr.h b/common/capstr.h
index a687ed3..0911cf2 100644
--- a/common/capstr.h
+++ b/common/capstr.h
@@ -13,6 +13,9 @@
 #ifndef FC__CAPSTR_H
 #define FC__CAPSTR_H
 
+#define NETWORK_CAPSTRING (NETWORK_CAPSTRING_MANDATORY " "	\
+			   NETWORK_CAPSTRING_OPTIONAL)
+
 extern const char * const our_capability;
 
 void init_our_capability(void);
diff --git a/common/city.c b/common/city.c
index 3ad55ea..9ced19c 100644
--- a/common/city.c
+++ b/common/city.c
@@ -345,6 +345,13 @@ const char *get_impr_name_ex(const struct city *pcity, Impr_type_id id)
   static char buffer[256];
   const char *state = NULL;
 
+  if (is_great_wonder(id)) {
+    if (great_wonder_was_built(id)) {
+      state = Q_("?built:B");
+    } else {
+      state = Q_("?wonder:w");
+    }
+  }
   if (pcity) {
     struct player *pplayer = city_owner(pcity);
 
@@ -355,13 +362,6 @@ const char *get_impr_name_ex(const struct city *pcity, Impr_type_id id)
       state = Q_("?redundant:*");
     }
   }
-  if (is_great_wonder(id)) {
-    if (great_wonder_was_built(id)) {
-      state = Q_("?built:B");
-    } else {
-      state = Q_("?wonder:w");
-    }
-  }
 
   if (state) {
     my_snprintf(buffer, sizeof(buffer), "%s(%s)",
@@ -1296,6 +1296,11 @@ int city_turns_to_build(const struct city *pcity,
 	      ? unit_build_shield_cost(utype_by_number(target.value))
 	      : impr_build_shield_cost(target.value));
 
+  if (!target.is_unit && is_great_wonder(target.value)
+      && great_wonder_was_built(target.value)) {
+    return FC_INFINITY;
+  }
+
   if (include_shield_stock && (city_shield_stock >= cost)) {
     return 1;
   } else if (city_shield_surplus > 0) {
diff --git a/common/city.h b/common/city.h
index 45f213e..2ab7e0c 100644
--- a/common/city.h
+++ b/common/city.h
@@ -356,6 +356,33 @@ extern struct output_type output_types[];
   } players_iterate_end;                                                    \
 }
 
+#define city_list_iterate_safe(citylist, _city)                        \
+{                                                                      \
+  int _city##_size = city_list_size(citylist);                         \
+                                                                       \
+  if (_city##_size > 0) {                                              \
+    int _city##_numbers[_city##_size];                                 \
+    int _city##_index = 0;                                             \
+                                                                       \
+    city_list_iterate(citylist, _city) {                               \
+      _city##_numbers[_city##_index++] = _city->id;                    \
+    } city_list_iterate_end;                                           \
+                                                                       \
+    for (_city##_index = 0;                                            \
+        _city##_index < _city##_size;                                  \
+        _city##_index++) {                                             \
+      struct city *_city =                                             \
+       game_find_city_by_number(_city##_numbers[_city##_index]);       \
+                                                                       \
+      if (NULL != _city) {
+
+#define city_list_iterate_safe_end                                     \
+      }                                                                \
+    }                                                                  \
+  }                                                                    \
+}
+
+
 
 static inline bool is_city_center(int city_x, int city_y);
 static inline bool is_free_worked_tile(int city_x, int city_y);
diff --git a/common/connection.c b/common/connection.c
index ded24e4..48fc429 100644
--- a/common/connection.c
+++ b/common/connection.c
@@ -630,6 +630,7 @@ void connection_common_init(struct connection *pconn)
 
 #ifdef USE_COMPRESSION
   byte_vector_init(&pconn->compression.queue);
+  pconn->compression.frozen_level = 0;
 #endif
 }
 
diff --git a/common/game.c b/common/game.c
index d5f506e..fd6f2d5 100644
--- a/common/game.c
+++ b/common/game.c
@@ -534,7 +534,7 @@ void game_renumber_players(int plrno)
     assert(city_list_size(game.players[i].cities) == 0);
   }
 
-  if(game.info.player_idx > plrno) {
+  if(game.player_ptr && game.info.player_idx > plrno) {
     game.info.player_idx--;
     game.player_ptr = &game.players[game.info.player_idx];
   }
diff --git a/common/game.h b/common/game.h
index 5f7d306..8e3f860 100644
--- a/common/game.h
+++ b/common/game.h
@@ -188,7 +188,7 @@ bool setting_class_is_changeable(enum sset_class class);
 #define GAME_MAX_END_YEAR        5000
 
 #define GAME_DEFAULT_MIN_PLAYERS     1
-#define GAME_MIN_MIN_PLAYERS         1
+#define GAME_MIN_MIN_PLAYERS         0
 #define GAME_MAX_MIN_PLAYERS         MAX_NUM_PLAYERS
 
 #define GAME_DEFAULT_MAX_PLAYERS     MAX_NUM_PLAYERS
diff --git a/common/improvement.c b/common/improvement.c
index 6a154e6..62f9159 100644
--- a/common/improvement.c
+++ b/common/improvement.c
@@ -306,6 +306,30 @@ bool improvement_obsolete(const struct player *pplayer, Impr_type_id id)
 }
 
 /**************************************************************************
+  Returns TRUE iff improvement provides units buildable by player
+**************************************************************************/
+bool impr_provides_buildable_units(const struct player *pplayer,
+                                   Impr_type_id id)
+{
+  struct impr_type *impr = improvement_by_number(id);
+
+  /* Fast check */
+  if (! impr->allows_units) {
+    return FALSE;
+  }
+
+  unit_type_iterate(ut) {
+    if (ut->impr_requirement == id) {
+      if (can_player_build_unit(pplayer, ut)) {
+        return TRUE;
+      }
+    }
+  } unit_type_iterate_end;
+
+  return FALSE;
+}
+
+/**************************************************************************
    Whether player can build given building somewhere, ignoring whether it
    is obsolete.
 **************************************************************************/
diff --git a/common/improvement.h b/common/improvement.h
index 104f5c4..d0cf292 100644
--- a/common/improvement.h
+++ b/common/improvement.h
@@ -70,6 +70,8 @@ struct impr_type {
   char *helptext;
   char soundtag[MAX_LEN_NAME];
   char soundtag_alt[MAX_LEN_NAME];
+
+  bool allows_units;   /* Cache */
 };
 
 
@@ -96,6 +98,7 @@ bool is_improvement_visible(Impr_type_id id);
 
 /* player related improvement functions */
 bool improvement_obsolete(const struct player *pplayer, Impr_type_id id);
+bool impr_provides_buildable_units(const struct player *pplayer, Impr_type_id id);
 
 bool can_player_build_improvement_direct(const struct player *p,
 					 Impr_type_id id);
@@ -136,4 +139,3 @@ bool can_sell_building(Impr_type_id id);
 bool can_city_sell_building(struct city *pcity, Impr_type_id id);
 
 #endif  /* FC__IMPROVEMENT_H */
-
diff --git a/common/player.c b/common/player.c
index 2151e6b..dc6d6a7 100644
--- a/common/player.c
+++ b/common/player.c
@@ -210,7 +210,7 @@ void player_init(struct player *plr)
   plr->economic.science=PLAYER_DEFAULT_SCIENCE_RATE;
   plr->economic.luxury=PLAYER_DEFAULT_LUXURY_RATE;
 
-  player_limit_to_government_rates(plr);
+  plr->economic = player_limit_to_max_rates(plr);
   spaceship_init(&plr->spaceship);
 
   plr->gives_shared_vision = 0;
@@ -610,49 +610,54 @@ present form of government.  If a rate exceeds maxrate for this government,
 it adjusts rates automatically adding the extra to the 2nd highest rate,
 preferring science to taxes and taxes to luxuries.
 (It assumes that for any government maxrate>=50)
+Returns actual max rate used.
 **************************************************************************/
-void player_limit_to_government_rates(struct player *pplayer)
+struct player_economic player_limit_to_max_rates(struct player *pplayer)
 {
   int maxrate, surplus;
+  struct player_economic economic;
 
   /* ai players allowed to cheat */
   if (pplayer->ai.control) {
-    return;
+    return pplayer->economic;
   }
 
+  economic = pplayer->economic;
+
   maxrate = get_player_bonus(pplayer, EFT_MAX_RATES);
   if (maxrate == 0) {
     maxrate = 100; /* effects not initialized yet */
   }
+
   surplus = 0;
-  if (pplayer->economic.luxury > maxrate) {
-    surplus += pplayer->economic.luxury - maxrate;
-    pplayer->economic.luxury = maxrate;
+  if (economic.luxury > maxrate) {
+    surplus += economic.luxury - maxrate;
+    economic.luxury = maxrate;
   }
-  if (pplayer->economic.tax > maxrate) {
-    surplus += pplayer->economic.tax - maxrate;
-    pplayer->economic.tax = maxrate;
+  if (economic.tax > maxrate) {
+    surplus += economic.tax - maxrate;
+    economic.tax = maxrate;
   }
-  if (pplayer->economic.science > maxrate) {
-    surplus += pplayer->economic.science - maxrate;
-    pplayer->economic.science = maxrate;
+  if (economic.science > maxrate) {
+    surplus += economic.science - maxrate;
+    economic.science = maxrate;
   }
 
   assert(surplus % 10 == 0);
   while (surplus > 0) {
-    if (pplayer->economic.science < maxrate) {
-      pplayer->economic.science += 10;
-    } else if (pplayer->economic.tax < maxrate) {
-      pplayer->economic.tax += 10;
-    } else if (pplayer->economic.luxury < maxrate) {
-      pplayer->economic.luxury += 10;
+    if (economic.science < maxrate) {
+      economic.science += 10;
+    } else if (economic.tax < maxrate) {
+      economic.tax += 10;
+    } else if (economic.luxury < maxrate) {
+      economic.luxury += 10;
     } else {
       die("byebye");
     }
     surplus -= 10;
   }
 
-  return;
+  return economic;
 }
 
 /**************************************************************************
diff --git a/common/player.h b/common/player.h
index cda8657..3b11987 100644
--- a/common/player.h
+++ b/common/player.h
@@ -259,7 +259,7 @@ int num_known_tech_with_flag(const struct player *pplayer,
 			     enum tech_flag_id flag);
 int player_get_expected_income(const struct player *pplayer);
 
-void player_limit_to_government_rates(struct player *pplayer);
+struct player_economic player_limit_to_max_rates(struct player *pplayer);
 
 struct city *find_palace(const struct player *pplayer);
 
diff --git a/common/requirements.c b/common/requirements.c
index 4bfd2a1..6cffc5e 100644
--- a/common/requirements.c
+++ b/common/requirements.c
@@ -654,7 +654,7 @@ static bool is_special_in_range(const struct tile *target_tile,
   case REQ_RANGE_LOCAL:
     return target_tile && tile_has_special(target_tile, special);
   case REQ_RANGE_ADJACENT:
-    return target_tile && is_special_near_tile(target_tile, special);
+    return target_tile && is_special_near_tile(target_tile, special, TRUE);
   case REQ_RANGE_CITY:
   case REQ_RANGE_CONTINENT:
   case REQ_RANGE_PLAYER:
@@ -683,7 +683,7 @@ static bool is_terrain_in_range(const struct tile *target_tile,
     /* The requirement is filled if the tile has the terrain. */
     return pterrain && target_tile->terrain == pterrain;
   case REQ_RANGE_ADJACENT:
-    return pterrain && is_terrain_near_tile(target_tile, pterrain);
+    return pterrain && is_terrain_near_tile(target_tile, pterrain, TRUE);
   case REQ_RANGE_CITY:
   case REQ_RANGE_CONTINENT:
   case REQ_RANGE_PLAYER:
diff --git a/common/tech.c b/common/tech.c
index 17a8b23..dc4ac7d 100644
--- a/common/tech.c
+++ b/common/tech.c
@@ -81,7 +81,15 @@ enum tech_state get_invention(const struct player *pplayer,
       return TECH_UNKNOWN;
     }
   } else {
-    return get_player_research(pplayer)->inventions[tech].state;
+    struct player_research *research = get_player_research(pplayer);
+
+    /* Research can be null in client when looking for tech_leakage
+     * from player not yet received. */
+    if (research) {
+      return research->inventions[tech].state;
+    } else {
+      return TECH_UNKNOWN;
+    }
   }
 }
 
diff --git a/common/terrain.c b/common/terrain.c
index 0d1e9b8..ca6f0db 100644
--- a/common/terrain.c
+++ b/common/terrain.c
@@ -324,15 +324,20 @@ const char *resource_rule_name(const struct resource *presource)
   Returns TRUE iff any adjacent tile contains the given terrain.
 ****************************************************************************/
 bool is_terrain_near_tile(const struct tile *ptile,
-			  const struct terrain *pterrain)
+			  const struct terrain *pterrain,
+                          bool check_self)
 {
+  if (!pterrain) {
+    return FALSE;
+  }
+
   adjc_iterate(ptile, adjc_tile) {
-    if (pterrain && adjc_tile->terrain == pterrain) {
+    if (adjc_tile->terrain == pterrain) {
       return TRUE;
     }
   } adjc_iterate_end;
 
-  return FALSE;
+  return check_self && ptile->terrain == pterrain;
 }
 
 /****************************************************************************
@@ -472,7 +477,8 @@ bool contains_special(bv_special set,
 /****************************************************************************
   Returns TRUE iff any tile adjacent to (map_x,map_y) has the given special.
 ****************************************************************************/
-bool is_special_near_tile(const struct tile *ptile, enum tile_special_type spe)
+bool is_special_near_tile(const struct tile *ptile, enum tile_special_type spe,
+                          bool check_self)
 {
   adjc_iterate(ptile, adjc_tile) {
     if (tile_has_special(adjc_tile, spe)) {
@@ -480,7 +486,7 @@ bool is_special_near_tile(const struct tile *ptile, enum tile_special_type spe)
     }
   } adjc_iterate_end;
 
-  return FALSE;
+  return check_self && tile_has_special(ptile, spe);
 }
 
 /****************************************************************************
diff --git a/common/terrain.h b/common/terrain.h
index d1a1361..06022f5 100644
--- a/common/terrain.h
+++ b/common/terrain.h
@@ -212,7 +212,8 @@ const char *resource_name_translation(struct resource *presource);
 
 /* Functions to operate on a general terrain type. */
 bool is_terrain_near_tile(const struct tile *ptile,
-			  const struct terrain *pterrain);
+			  const struct terrain *pterrain,
+                          bool check_self);
 int count_terrain_near_tile(const struct tile *ptile,
 			    bool cardinal_only, bool percentage,
 			    const struct terrain *pterrain);
@@ -233,7 +234,8 @@ bool contains_special(bv_special all,
 
 /* Functions to operate on a terrain special. */
 bool is_special_near_tile(const struct tile *ptile,
-			  enum tile_special_type spe);
+			  enum tile_special_type spe,
+                          bool check_self);
 int count_special_near_tile(const struct tile *ptile,
 			    bool cardinal_only, bool percentage,
 			    enum tile_special_type spe);
diff --git a/config.h.in b/config.h.in
index 18b6f03..6f7decb 100644
--- a/config.h.in
+++ b/config.h.in
@@ -17,7 +17,7 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* Define if you want extra debugging. */
+/* Extra debugging support */
 #undef DEBUG
 
 /* Define to 1 if translation of program messages to the user's native
@@ -79,6 +79,9 @@
 /* Define to 1 if you have the `bind' function. */
 #undef HAVE_BIND
 
+/* Define to 1 if you have the `chdir' function. */
+#undef HAVE_CHDIR
+
 /* Define to 1 if you have the `connect' function. */
 #undef HAVE_CONNECT
 
@@ -151,7 +154,7 @@
 /* Define to 1 if you have the `getuid' function. */
 #undef HAVE_GETUID
 
-/* Define if you have the iconv() function. */
+/* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
 /* Define to 1 if you have the `inet_aton' function. */
@@ -229,6 +232,9 @@
 /* Define to 1 if you have the `mempcpy' function. */
 #undef HAVE_MEMPCPY
 
+/* Define to 1 if you have the `mkdtemp' function. */
+#undef HAVE_MKDTEMP
+
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
@@ -438,11 +444,14 @@
 /* Narrowproto */
 #undef NARROWPROTO
 
-/* Define if you want no debug support. */
+/* No debugging support at all */
 #undef NDEBUG
 
 /* Network capability string */
-#undef NETWORK_CAPSTRING
+#undef NETWORK_CAPSTRING_MANDATORY
+
+/* Additional optional network capabilities */
+#undef NETWORK_CAPSTRING_OPTIONAL
 
 /* Version number of next release */
 #undef NEXT_STABLE_VERSION
diff --git a/configure b/configure
index 0be0725..e400366 100755
--- a/configure
+++ b/configure
@@ -308,7 +308,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAJOR_VERSION MINOR_VERSION NETWORK_CAPSTRING INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP AUTH_CFLAGS AUTH_LIBS SERVER_TRUE SERVER_FALSE CLIENT_TRUE CLIENT_FALSE FTWL_TRUE FTWL_FALSE MAKE_DATA_TRUE MAKE_DATA_FALSE MAKE_CLIENT_INCLUDE_TRUE MAKE_CLIENT_INCLUDE_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE LN_S RANLIB ac_ct_RANLIB AR ac_ct_AR UNAME LIBICONV localedir ALLOCA GLIBC21 USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX AUTO_DEPS WINDRES ac_ct_WINDRES GZIP PKG_CONFIG GTK_CFLAGS GTK_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS ac_pt_PKG_CONFIG PNG_CFLAGS PNG_LIBS libggz_libraries libggz_includes LIBGGZ_INCLUDES LIBGGZ_LDFLAGS LIB_GGZ ggzmod_libraries ggzmod_includes GGZMOD_INCLUDES GGZMOD_LDFLAGS LIB_GGZMOD GGZ_CONFIG ggzexecmoddir ggzdatadir ggz_config ggzmoduleconfdir packagesrcdir ggz_gtk_libraries ggz_gtk_includes GGZ_GTK_INCLUDES GGZ_GTK_LDFLAGS LIB_GGZ_GTK GGZ_CLIENT_TRUE GGZ_CLIENT_FALSE GGZ_GTK_TRUE GGZ_GTK_FALSE ggzdmod_libraries ggzdmod_includes GGZDMOD_INCLUDES GGZDMOD_LDFLAGS LIB_GGZDMOD ggzdconfdir ggzddatadir ggzdexecmoddir ggzdexecmodpath GGZ_SERVER_TRUE GGZ_SERVER_FALSE gui_sources CLIENT_CFLAGS CLIENT_CXXFLAGS CLIENT_LIBS CLIENT_LDFLAGS SOUND_CFLAGS SOUND_LIBS FTWL_CFLAGS VERSION_WITHOUT_LABEL VERSION_LABEL AUDIO_SDL_TRUE AUDIO_SDL_FALSE CLIENT_GUI_SDL_TRUE CLIENT_GUI_SDL_FALSE CLIENT_GUI_GTK_2_0_TRUE CLIENT_GUI_GTK_2_0_FALSE CLIENT_GUI_XAW_TRUE CLIENT_GUI_XAW_FALSE CLIENT_GUI_BEOS_TRUE CLIENT_GUI_BEOS_FALSE CLIENT_GUI_STUB_TRUE CLIENT_GUI_STUB_FALSE CLIENT_GUI_WIN32_TRUE CLIENT_GUI_WIN32_FALSE CLIENT_GUI_FTWL_TRUE CLIENT_GUI_FTWL_FALSE FTWL_X11_TRUE FTWL_X11_FALSE FTWL_SDL_TRUE FTWL_SDL_FALSE FTWL_OPENGL_TRUE FTWL_OPENGL_FALSE MINGW32_TRUE MINGW32_FALSE SERVER_LIBS CONFIGURE_DEPENDENCIES LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAJOR_VERSION MINOR_VERSION NETWORK_CAPSTRING_MANDATORY NETWORK_CAPSTRING_OPTIONAL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP AUTH_CFLAGS AUTH_LIBS SERVER_TRUE SERVER_FALSE CLIENT_TRUE CLIENT_FALSE FTWL_TRUE FTWL_FALSE MAKE_DATA_TRUE MAKE_DATA_FALSE MAKE_CLIENT_INCLUDE_TRUE MAKE_CLIENT_INCLUDE_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE LN_S RANLIB ac_ct_RANLIB AR ac_ct_AR UNAME LIBICONV LTLIBICONV localedir ALLOCA GLIBC21 USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX AUTO_DEPS WINDRES ac_ct_WINDRES GZIP PKG_CONFIG GTK_CFLAGS GTK_LIBS SDL_CONFIG SDL_CFLAGS SDL_LIBS FT2_CONFIG FT2_CFLAGS FT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS ac_pt_PKG_CONFIG PNG_CFLAGS PNG_LIBS libggz_libraries libggz_includes LIBGGZ_INCLUDES LIBGGZ_LDFLAGS LIB_GGZ ggzmod_libraries ggzmod_includes GGZMOD_INCLUDES GGZMOD_LDFLAGS LIB_GGZMOD GGZ_CONFIG ggzexecmoddir ggzdatadir ggz_config ggzmoduleconfdir packagesrcdir ggz_gtk_libraries ggz_gtk_includes GGZ_GTK_INCLUDES GGZ_GTK_LDFLAGS LIB_GGZ_GTK GGZ_CLIENT_TRUE GGZ_CLIENT_FALSE GGZ_GTK_TRUE GGZ_GTK_FALSE ggzdmod_libraries ggzdmod_includes GGZDMOD_INCLUDES GGZDMOD_LDFLAGS LIB_GGZDMOD ggzdconfdir ggzddatadir ggzdexecmoddir ggzdexecmodpath GGZ_SERVER_TRUE GGZ_SERVER_FALSE gui_sources CLIENT_CFLAGS CLIENT_CXXFLAGS CLIENT_LIBS CLIENT_LDFLAGS SOUND_CFLAGS SOUND_LIBS FTWL_CFLAGS VERSION_WITHOUT_LABEL VERSION_LABEL AUDIO_SDL_TRUE AUDIO_SDL_FALSE CLIENT_GUI_SDL_TRUE CLIENT_GUI_SDL_FALSE CLIENT_GUI_GTK_2_0_TRUE CLIENT_GUI_GTK_2_0_FALSE CLIENT_GUI_XAW_TRUE CLIENT_GUI_XAW_FALSE CLIENT_GUI_BEOS_TRUE CLIENT_GUI_BEOS_FALSE CLIENT_GUI_STUB_TRUE CLIENT_GUI_STUB_FALSE CLIENT_GUI_WIN32_TRUE CLIENT_GUI_WIN32_FALSE CLIENT_GUI_FTWL_TRUE CLIENT_GUI_FTWL_FALSE FTWL_X11_TRUE FTWL_X11_FALSE FTWL_SDL_TRUE FTWL_SDL_FALSE FTWL_OPENGL_TRUE FTWL_OPENGL_FALSE MINGW32_TRUE MINGW32_FALSE SERVER_LIBS CONFIGURE_DEPENDENCIES LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -887,12 +887,13 @@ Optional Features:
   --enable-make-include   force make to recurse into include directory
                           (useful for 'make tags')
   --disable-auto-deps     remove automatic deps calcs, which require gmake,gcc
+  --disable-rpath         do not hardcode runtime library paths
   --disable-nls           do not use Native Language Support
   --enable-debug[=no/some/yes]  turn on debugging [default=some]
   --disable-gtktest       do not try to compile and run a test GTK+ program
   --disable-sdltest       Do not try to compile and run a test SDL program
-  --disable-freetypetest  Do not try to compile and run
-                          a test FreeType program
+       --disable-freetypetest  Do not try to compile and run a test FreeType
+                          program
   --disable-sdl-mixer     Do not try to use the SDL mixer
   --enable-noregistry     Do not register game modules.
 
@@ -904,13 +905,14 @@ Optional Packages:
   --with-xaw              use the Xaw widget set for the xaw client
   --with-xaw3d            use the Xaw3d widget set for the xaw client
   --with-efence           use Electric Fence, malloc debugger
-  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
+  --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-included-gettext use the GNU gettext library included here
   --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)
   --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
-  --with-ft-prefix=PREFIX
-                          Prefix where FreeType is installed (optional)
-  --with-ft-exec-prefix=PREFIX
+       --with-ft-prefix=PREFIX Prefix where FreeType is installed (optional)
+       --with-ft-exec-prefix=PREFIX
                           Exec prefix where FreeType is installed (optional)
   --with-x                use the X Window System
   --with-x-funcproto=DEFS Xfuncproto control definitions are DEFS
@@ -1500,15 +1502,15 @@ _ACEOF
 
  MAJOR_VERSION="2"
  MINOR_VERSION="1"
- PATCH_VERSION="5"
+ PATCH_VERSION="8"
  VERSION_LABEL=""""
 
 
 IS_DEVEL_VERSION=0
 IS_BETA_VERSION=0
 
-NEXT_STABLE_VERSION="2.1.6"
-RELEASE_MONTH=7
+NEXT_STABLE_VERSION="2.1.9"
+RELEASE_MONTH=1
 
 # Freeciv network capstring: see documentation in common/capstr.c
 #
@@ -1520,7 +1522,9 @@ RELEASE_MONTH=7
 #   - Avoid adding a new manditory capability to the development branch for
 #     as long as possible.  We want to maintain network compatibility with
 #     the stable branch for as long as possible.
-NETWORK_CAPSTRING="+2.1g CreatedName"
+NETWORK_CAPSTRING_MANDATORY="+2.1g"
+	  NETWORK_CAPSTRING_OPTIONAL="CreatedName"
+
 
 
 VERSION_WITHOUT_LABEL=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}
@@ -1577,7 +1581,13 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define NETWORK_CAPSTRING "$NETWORK_CAPSTRING"
+#define NETWORK_CAPSTRING_MANDATORY "$NETWORK_CAPSTRING_MANDATORY"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define NETWORK_CAPSTRING_OPTIONAL "$NETWORK_CAPSTRING_OPTIONAL"
 _ACEOF
 
 
@@ -5805,18 +5815,658 @@ fi
 
 
 
+      if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+
+
+# Check whether --with-gnu-ld or --without-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+  withval="$with_gnu_ld"
+  test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi;
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | [A-Za-z]:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+else
+  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+fi
+if test "${acl_cv_path_LD+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break ;;
+      *)
+	test "$with_gnu_ld" != yes && break ;;
+      esac
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac
+fi
+echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+
+                                                echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+
+fi
+echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+    # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  :
+else
+  enable_rpath=yes
+fi;
+
+
+                  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
+        esac
+      fi
+    done
+    IFS="$acl_save_IFS"
+  fi
+
+
+
+
+
+
+
+
+
+    use_additional=yes
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
 
 
 # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
 if test "${with_libiconv_prefix+set}" = set; then
   withval="$with_libiconv_prefix"
 
-    for dir in `echo "$withval" | tr : ' '`; do
-      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
-    done
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
 
 fi;
+      LIBICONV=
+  LTLIBICONV=
+  INCICONV=
+  LIBICONV_PREFIX=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='iconv '
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+          else
+                                    :
+          fi
+        else
+                              found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+                                    if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+                        if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                                    if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+              else
+                                                                                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                                if test "$acl_hardcode_direct" = yes; then
+                                                      LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                                                            haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                                                                                haveit=
+                    for x in $LDFLAGS $LIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                                                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+                    else
+                                                                                                                                                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                                LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+              else
+                                                LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+              fi
+            fi
+                        additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                LIBICONV_PREFIX="$basedir"
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+                                                                                                                if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INCICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                                            INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+                        if test -n "$found_la"; then
+                                                        save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+                            for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIBICONV; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                                                                  haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                                                                  haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                                        names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                                                                                names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                                        LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+                    LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+                                                            LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+            LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+                        alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+            acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+    else
+            for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+            for found_dir in $ltrpathdirs; do
+      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+    done
+  fi
+
+
+
+
+
+
+
+          am_save_CPPFLAGS="$CPPFLAGS"
+
+  for element in $INCICONV; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
+
 
   echo "$as_me:$LINENO: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
@@ -5866,7 +6516,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
-      LIBS="$LIBS -liconv"
+      LIBS="$LIBS $LIBICONV"
       cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -5913,11 +6563,142 @@ fi
 echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
   if test "$am_cv_func_iconv" = yes; then
+    echo "$as_me:$LINENO: checking for working iconv" >&5
+echo $ECHO_N "checking for working iconv... $ECHO_C" >&6
+if test "${am_cv_func_iconv_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+            am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes; then
+  case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  am_cv_func_iconv_works=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+am_cv_func_iconv_works=no
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+      LIBS="$am_save_LIBS"
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5
+echo "${ECHO_T}$am_cv_func_iconv_works" >&6
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ICONV 1
 _ACEOF
 
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
+    echo "$as_me:$LINENO: result: $LIBICONV" >&5
+echo "${ECHO_T}$LIBICONV" >&6
+  else
+            CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+
+
+
+  if test "$am_cv_func_iconv" = yes; then
     echo "$as_me:$LINENO: checking for iconv declaration" >&5
 echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
     if test "${am_cv_proto_iconv+set}" = set; then
@@ -5986,11 +6767,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
   fi
-  LIBICONV=
-  if test "$am_cv_lib_iconv" = yes; then
-    LIBICONV="-liconv"
-  fi
-
 
 
   echo "$as_me:$LINENO: checking for libcharset" >&5
@@ -6066,7 +6842,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-char* cs = nl_langinfo(CODESET);
+char* cs = nl_langinfo(CODESET); return !cs;
   ;
   return 0;
 }
@@ -6117,8 +6893,8 @@ if test -z "$localedir"; then
 
 fi
 
-ALL_LINGUAS="ar cs ca da de el en_GB es et fa fi fr he hu it ja ko lt nl nb no pl pt pt_BR ro ru sv tr uk zh_CN"
-
+ALL_LINGUAS="ar cs ca da de el en_GB eo es et fa fi fr he hu it ja ko lt nl
+nb no pl pt pt_BR ro ru sv tr uk zh_CN"
         echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
 echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
 if test "${ac_cv_lib_cposix_strerror+set}" = set; then
@@ -7477,16 +8253,32 @@ done
 
 
 
-# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
-  withval="$with_libiconv_prefix"
 
-    for dir in `echo "$withval" | tr : ' '`; do
-      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+
+          am_save_CPPFLAGS="$CPPFLAGS"
+
+  for element in $INCICONV; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
     done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
 
-fi;
 
   echo "$as_me:$LINENO: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
@@ -7536,7 +8328,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
-      LIBS="$LIBS -liconv"
+      LIBS="$LIBS $LIBICONV"
       cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -7583,11 +8375,142 @@ fi
 echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
   if test "$am_cv_func_iconv" = yes; then
+    echo "$as_me:$LINENO: checking for working iconv" >&5
+echo $ECHO_N "checking for working iconv... $ECHO_C" >&6
+if test "${am_cv_func_iconv_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+            am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes; then
+  case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  am_cv_func_iconv_works=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+am_cv_func_iconv_works=no
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+      LIBS="$am_save_LIBS"
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5
+echo "${ECHO_T}$am_cv_func_iconv_works" >&6
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ICONV 1
 _ACEOF
 
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
+    echo "$as_me:$LINENO: result: $LIBICONV" >&5
+echo "${ECHO_T}$LIBICONV" >&6
+  else
+            CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+
+
+
+  if test "$am_cv_func_iconv" = yes; then
     echo "$as_me:$LINENO: checking for iconv declaration" >&5
 echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
     if test "${am_cv_proto_iconv+set}" = set; then
@@ -7656,11 +8579,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
   fi
-  LIBICONV=
-  if test "$am_cv_lib_iconv" = yes; then
-    LIBICONV="-liconv"
-  fi
-
 
 
   echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
@@ -7679,7 +8597,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-char* cs = nl_langinfo(CODESET);
+char* cs = nl_langinfo(CODESET); return !cs;
   ;
   return 0;
 }
@@ -8832,7 +9750,7 @@ Try --with-included-gettext or --disable-nls. Read ABOUT-NLS." >&2;}
   if test "$IS_BETA_VERSION" = "1" || test "$IS_DEVEL_VERSION" = "1"; then
     echo "$as_me:$LINENO: checking for GNU xgettext version >= 0.10.36" >&5
 echo $ECHO_N "checking for GNU xgettext version >= 0.10.36... $ECHO_C" >&6
-    xgettext_version=`$XGETTEXT --version 2>&1 | grep GNU | sed 's/"/ /g'`
+    xgettext_version=`$XGETTEXT --version 2>&1 | grep GNU | head -n 1 | sed 's/"/ /g'`
     if test "$cross_compiling" = yes; then
   echo error
 
@@ -8902,7 +9820,7 @@ fi
 
     echo "$as_me:$LINENO: checking for GNU msgfmt version >= 0.10.35" >&5
 echo $ECHO_N "checking for GNU msgfmt version >= 0.10.35... $ECHO_C" >&6
-    msgfmt_version=`$MSGFMT --version 2>&1 | grep GNU | sed 's/"/ /g'`
+    msgfmt_version=`$MSGFMT --version 2>&1 | grep GNU | head -n 1 | sed 's/"/ /g'`
     if test "$cross_compiling" = yes; then
   echo error
 
@@ -8978,15 +9896,137 @@ fi
   fi
 fi
 
-EXTRA_GCC_DEBUG_CFLAGS=""
-EXTRA_GCC_DEBUG_CXXFLAGS=""
+EXTRA_DEBUG_CFLAGS=""
+EXTRA_DEBUG_CXXFLAGS=""
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+flags_save="`eval echo '$'CFLAGS`"
+accepted_flags=""
+
+for flag in -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations
+do
+  CFLAGS="$flags_save $accepted_flags $flag "
+  cat >conftest.$ac_ext <<_ACEOF
+int a;
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+old_value="`eval echo '$'accepted_flags`"
+if test "x$old_value" = "x" ; then
+  accepted_flags="$flag"
+elif test "x$flag" != "x" ; then
+  accepted_flags="$old_value $flag"
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-if test -n "$GCC"; then
-   EXTRA_GCC_DEBUG_CFLAGS="$CFLAGS"
-   EXTRA_GCC_DEBUG_CXXFLAGS="$CXXFLAGS"
-   CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations"
-   CXXFLAGS="-Wall -Wpointer-arith -Wcast-align"
 fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+
+old_value="`eval echo '$'EXTRA_DEBUG_CFLAGS`"
+if test "x$old_value" = "x" ; then
+  EXTRA_DEBUG_CFLAGS="$accepted_flags"
+elif test "x$accepted_flags" != "x" ; then
+  EXTRA_DEBUG_CFLAGS="$old_value $accepted_flags"
+fi
+
+
+CFLAGS="$flags_save"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+flags_save="`eval echo '$'CXXFLAGS`"
+accepted_flags=""
+
+for flag in -Wall -Wpointer-arith -Wcast-align
+do
+  CXXFLAGS="$flags_save $accepted_flags $flag "
+  cat >conftest.$ac_ext <<_ACEOF
+int a;
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+old_value="`eval echo '$'accepted_flags`"
+if test "x$old_value" = "x" ; then
+  accepted_flags="$flag"
+elif test "x$flag" != "x" ; then
+  accepted_flags="$old_value $flag"
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+
+old_value="`eval echo '$'EXTRA_DEBUG_CXXFLAGS`"
+if test "x$old_value" = "x" ; then
+  EXTRA_DEBUG_CXXFLAGS="$accepted_flags"
+elif test "x$accepted_flags" != "x" ; then
+  EXTRA_DEBUG_CXXFLAGS="$old_value $accepted_flags"
+fi
+
+
+CXXFLAGS="$flags_save"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
 
 
 # Check whether --enable-debug or --disable-debug was given.
@@ -9010,7 +10050,134 @@ cat >>confdefs.h <<\_ACEOF
 #define DEBUG 1
 _ACEOF
 
-  EXTRA_GCC_DEBUG_CFLAGS="$EXTRA_GCC_DEBUG_CFLAGS -Werror"
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+flags_save="`eval echo '$'CFLAGS`"
+accepted_flags=""
+
+for flag in -Werror
+do
+  CFLAGS="$flags_save $accepted_flags $flag "
+  cat >conftest.$ac_ext <<_ACEOF
+int a;
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+old_value="`eval echo '$'accepted_flags`"
+if test "x$old_value" = "x" ; then
+  accepted_flags="$flag"
+elif test "x$flag" != "x" ; then
+  accepted_flags="$old_value $flag"
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+
+old_value="`eval echo '$'EXTRA_DEBUG_CFLAGS`"
+if test "x$old_value" = "x" ; then
+  EXTRA_DEBUG_CFLAGS="$accepted_flags"
+elif test "x$accepted_flags" != "x" ; then
+  EXTRA_DEBUG_CFLAGS="$old_value $accepted_flags"
+fi
+
+
+CFLAGS="$flags_save"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+flags_save="`eval echo '$'CXXFLAGS`"
+accepted_flags=""
+
+for flag in -Werror
+do
+  CXXFLAGS="$flags_save $accepted_flags $flag "
+  cat >conftest.$ac_ext <<_ACEOF
+int a;
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+old_value="`eval echo '$'accepted_flags`"
+if test "x$old_value" = "x" ; then
+  accepted_flags="$flag"
+elif test "x$flag" != "x" ; then
+  accepted_flags="$old_value $flag"
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+
+old_value="`eval echo '$'EXTRA_DEBUG_CXXFLAGS`"
+if test "x$old_value" = "x" ; then
+  EXTRA_DEBUG_CXXFLAGS="$accepted_flags"
+elif test "x$accepted_flags" != "x" ; then
+  EXTRA_DEBUG_CXXFLAGS="$old_value $accepted_flags"
+fi
+
+
+CXXFLAGS="$flags_save"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
 else
   if test "x$enable_debug" = "xno"; then
 
@@ -9018,7 +10185,134 @@ cat >>confdefs.h <<\_ACEOF
 #define NDEBUG 1
 _ACEOF
 
-    EXTRA_GCC_DEBUG_CFLAGS="-O3 -fomit-frame-pointer"
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+flags_save="`eval echo '$'CFLAGS`"
+accepted_flags=""
+
+for flag in -O3 -fomit-frame-pointer
+do
+  CFLAGS="$flags_save $accepted_flags $flag "
+  cat >conftest.$ac_ext <<_ACEOF
+int a;
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+old_value="`eval echo '$'accepted_flags`"
+if test "x$old_value" = "x" ; then
+  accepted_flags="$flag"
+elif test "x$flag" != "x" ; then
+  accepted_flags="$old_value $flag"
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+
+old_value="`eval echo '$'EXTRA_DEBUG_CFLAGS`"
+if test "x$old_value" = "x" ; then
+  EXTRA_DEBUG_CFLAGS="$accepted_flags"
+elif test "x$accepted_flags" != "x" ; then
+  EXTRA_DEBUG_CFLAGS="$old_value $accepted_flags"
+fi
+
+
+CFLAGS="$flags_save"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
+flags_save="`eval echo '$'CXXFLAGS`"
+accepted_flags=""
+
+for flag in -O3 -fomit-frame-pointer
+do
+  CXXFLAGS="$flags_save $accepted_flags $flag "
+  cat >conftest.$ac_ext <<_ACEOF
+int a;
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+old_value="`eval echo '$'accepted_flags`"
+if test "x$old_value" = "x" ; then
+  accepted_flags="$flag"
+elif test "x$flag" != "x" ; then
+  accepted_flags="$old_value $flag"
+fi
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+
+old_value="`eval echo '$'EXTRA_DEBUG_CXXFLAGS`"
+if test "x$old_value" = "x" ; then
+  EXTRA_DEBUG_CXXFLAGS="$accepted_flags"
+elif test "x$accepted_flags" != "x" ; then
+  EXTRA_DEBUG_CXXFLAGS="$old_value $accepted_flags"
+fi
+
+
+CXXFLAGS="$flags_save"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
   fi
 fi
 
@@ -10627,6 +11921,8 @@ fi
           CPPFLAGS="$ac_save_CPPFLAGS"
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
+	  # Get the cflags and libraries from the freetype-config script
+   #
 
 # Check whether --with-ft-prefix or --without-ft-prefix was given.
 if test "${with_ft_prefix+set}" = set; then
@@ -10636,6 +11932,7 @@ else
   ft_config_prefix=""
 fi;
 
+
 # Check whether --with-ft-exec-prefix or --without-ft-exec-prefix was given.
 if test "${with_ft_exec_prefix+set}" = set; then
   withval="$with_ft_exec_prefix"
@@ -10643,7 +11940,8 @@ if test "${with_ft_exec_prefix+set}" = set; then
 else
   ft_config_exec_prefix=""
 fi;
-# Check whether --enable-freetypetest or --disable-freetypetest was given.
+
+   # Check whether --enable-freetypetest or --disable-freetypetest was given.
 if test "${enable_freetypetest+set}" = set; then
   enableval="$enable_freetypetest"
 
@@ -10651,19 +11949,21 @@ else
   enable_fttest=yes
 fi;
 
-if test x$ft_config_exec_prefix != x ; then
-  ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
-  if test x${FT2_CONFIG+set} != xset ; then
-    FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
-  fi
-fi
-if test x$ft_config_prefix != x ; then
-  ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
-  if test x${FT2_CONFIG+set} != xset ; then
-    FT2_CONFIG=$ft_config_prefix/bin/freetype-config
-  fi
-fi
-# Extract the first word of "freetype-config", so it can be a program name with args.
+   if test x$ft_config_exec_prefix != x ; then
+     ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
+     if test x${FT2_CONFIG+set} != xset ; then
+       FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
+     fi
+   fi
+
+   if test x$ft_config_prefix != x ; then
+     ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
+     if test x${FT2_CONFIG+set} != xset ; then
+       FT2_CONFIG=$ft_config_prefix/bin/freetype-config
+     fi
+   fi
+
+   # Extract the first word of "freetype-config", so it can be a program name with args.
 set dummy freetype-config; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
@@ -10704,62 +12004,68 @@ echo "${ECHO_T}no" >&6
 fi
 
 
-min_ft_version=2.1.3
-echo "$as_me:$LINENO: checking for FreeType - version >= $min_ft_version" >&5
-echo $ECHO_N "checking for FreeType - version >= $min_ft_version... $ECHO_C" >&6
-no_ft=""
-if test "$FT2_CONFIG" = "no" ; then
-  no_ft=yes
-else
-  FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-  FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
-  ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-  ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-  ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-  ft_min_major_version=`echo $min_ft_version | \
-         sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-  ft_min_minor_version=`echo $min_ft_version | \
-         sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
-  ft_min_micro_version=`echo $min_ft_version | \
-         sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
-  if test x$enable_fttest = xyes ; then
-    ft_config_is_lt=""
-    if test $ft_config_major_version -lt $ft_min_major_version ; then
-      ft_config_is_lt=yes
-    else
-      if test $ft_config_major_version -eq $ft_min_major_version ; then
-        if test $ft_config_minor_version -lt $ft_min_minor_version ; then
-          ft_config_is_lt=yes
-        else
-          if test $ft_config_minor_version -eq $ft_min_minor_version ; then
-            if test $ft_config_micro_version -lt $ft_min_micro_version ; then
-              ft_config_is_lt=yes
-            fi
-          fi
-        fi
-      fi
-    fi
-    if test x$ft_config_is_lt = xyes ; then
-      no_ft=yes
-    else
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $FT2_CFLAGS"
-      LIBS="$FT2_LIBS $LIBS"
-      if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
+   min_ft_version=2.1.3
+   echo "$as_me:$LINENO: checking for FreeType -- version >= $min_ft_version" >&5
+echo $ECHO_N "checking for FreeType -- version >= $min_ft_version... $ECHO_C" >&6
+   no_ft=""
+   if test "$FT2_CONFIG" = "no" ; then
+     no_ft=yes
+   else
+     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
+     FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+     ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+       sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+     ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
+       sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+     ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
+       sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+     ft_min_major_version=`echo $min_ft_version | \
+       sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+     ft_min_minor_version=`echo $min_ft_version | \
+       sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+     ft_min_micro_version=`echo $min_ft_version | \
+       sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+     if test x$enable_fttest = xyes ; then
+       ft_config_is_lt=""
+       if test $ft_config_major_version -lt $ft_min_major_version ; then
+         ft_config_is_lt=yes
+       else
+         if test $ft_config_major_version -eq $ft_min_major_version ; then
+           if test $ft_config_minor_version -lt $ft_min_minor_version ; then
+             ft_config_is_lt=yes
+           else
+             if test $ft_config_minor_version -eq $ft_min_minor_version ; then
+               if test $ft_config_micro_version -lt $ft_min_micro_version ; then
+                 ft_config_is_lt=yes
+               fi
+             fi
+           fi
+         fi
+       fi
+       if test x$ft_config_is_lt = xyes ; then
+         no_ft=yes
+       else
+         ac_save_CFLAGS="$CFLAGS"
+         ac_save_LIBS="$LIBS"
+         CFLAGS="$CFLAGS $FT2_CFLAGS"
+         LIBS="$FT2_LIBS $LIBS"
+
+         #
+         # Sanity checks for the results of freetype-config to some extent.
+         #
+         if test "$cross_compiling" = yes; then
+  echo $ECHO_N "cross compiling; assuming OK... $ECHO_C"
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
+
+             #line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include <stdio.h>
@@ -10769,7 +12075,7 @@ int
 main()
 {
   FT_Library library;
-  FT_Error error;
+  FT_Error  error;
 
   error = FT_Init_FreeType(&library);
 
@@ -10782,6 +12088,8 @@ main()
   }
 }
 
+
+
 _ACEOF
 rm -f conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -10805,41 +12113,75 @@ no_ft=yes
 fi
 rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-      CFLAGS="$ac_save_CFLAGS"
-      LIBS="$ac_save_LIBS"
-    fi             # test $ft_config_version -lt $ft_min_version
-  fi               # test x$enable_fttest = xyes
-fi                 # test "$FT2_CONFIG" = "no"
-if test x$no_ft = x ; then
-   echo "$as_me:$LINENO: result: yes" >&5
+
+         CFLAGS="$ac_save_CFLAGS"
+         LIBS="$ac_save_LIBS"
+       fi             # test $ft_config_version -lt $ft_min_version
+     fi               # test x$enable_fttest = xyes
+   fi                 # test "$FT2_CONFIG" = "no"
+
+   if test x$no_ft = x ; then
+     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-   freetype_found="yes"
-else
-   echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-   if test "$FT2_CONFIG" = "no" ; then
-     echo "*** The freetype-config script installed by FreeType 2 could not be found."
-     echo "*** If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in"
-     echo "*** your path, or set the FT2_CONFIG environment variable to the"
-     echo "*** full path to freetype-config."
+     freetype_found="yes"
    else
-     if test x$ft_config_is_lt = xyes ; then
-       echo "*** Your installed version of the FreeType 2 library is too old."
-       echo "*** If you have different versions of FreeType 2, make sure that"
-       echo "*** correct values for --with-ft-prefix or --with-ft-exec-prefix"
-       echo "*** are used, or set the FT2_CONFIG environment variable to the"
-       echo "*** full path to freetype-config."
+     echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+     if test "$FT2_CONFIG" = "no" ; then
+       { echo "$as_me:$LINENO: WARNING:
+
+  The freetype-config script installed by FreeType 2 could not be found.
+  If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in
+  your path, or set the FT2_CONFIG environment variable to the
+  full path to freetype-config.
+       " >&5
+echo "$as_me: WARNING:
+
+  The freetype-config script installed by FreeType 2 could not be found.
+  If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in
+  your path, or set the FT2_CONFIG environment variable to the
+  full path to freetype-config.
+       " >&2;}
      else
-       echo "*** The FreeType test program failed to run.  If your system uses"
-       echo "*** shared libraries and they are installed outside the normal"
-       echo "*** system library path, make sure the variable LD_LIBRARY_PATH"
-       echo "*** (or whatever is appropiate for your system) is correctly set."
+       if test x$ft_config_is_lt = xyes ; then
+         { echo "$as_me:$LINENO: WARNING:
+
+  Your installed version of the FreeType 2 library is too old.
+  If you have different versions of FreeType 2, make sure that
+  correct values for --with-ft-prefix or --with-ft-exec-prefix
+  are used, or set the FT2_CONFIG environment variable to the
+  full path to freetype-config.
+         " >&5
+echo "$as_me: WARNING:
+
+  Your installed version of the FreeType 2 library is too old.
+  If you have different versions of FreeType 2, make sure that
+  correct values for --with-ft-prefix or --with-ft-exec-prefix
+  are used, or set the FT2_CONFIG environment variable to the
+  full path to freetype-config.
+         " >&2;}
+       else
+         { echo "$as_me:$LINENO: WARNING:
+
+  The FreeType test program failed to run.  If your system uses
+  shared libraries and they are installed outside the normal
+  system library path, make sure the variable LD_LIBRARY_PATH
+  (or whatever is appropriate for your system) is correctly set.
+         " >&5
+echo "$as_me: WARNING:
+
+  The FreeType test program failed to run.  If your system uses
+  shared libraries and they are installed outside the normal
+  system library path, make sure the variable LD_LIBRARY_PATH
+  (or whatever is appropriate for your system) is correctly set.
+         " >&2;}
+       fi
      fi
+
+     FT2_CFLAGS=""
+     FT2_LIBS=""
+     freetype_found="no"
    fi
-   FT2_CFLAGS=""
-   FT2_LIBS=""
-   freetype_found="no"
-fi
 
 
 
@@ -10875,16 +12217,32 @@ echo "$as_me: error: specified client 'sdl' not configurable (SDL_image is neede
 
 
 
-# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
-  withval="$with_libiconv_prefix"
 
-    for dir in `echo "$withval" | tr : ' '`; do
-      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+
+          am_save_CPPFLAGS="$CPPFLAGS"
+
+  for element in $INCICONV; do
+    haveit=
+    for x in $CPPFLAGS; do
+
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  eval x=\"$x\"
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
     done
+    if test -z "$haveit"; then
+      CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+    fi
+  done
 
-fi;
 
   echo "$as_me:$LINENO: checking for iconv" >&5
 echo $ECHO_N "checking for iconv... $ECHO_C" >&6
@@ -10934,7 +12292,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
-      LIBS="$LIBS -liconv"
+      LIBS="$LIBS $LIBICONV"
       cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -10981,11 +12339,142 @@ fi
 echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
   if test "$am_cv_func_iconv" = yes; then
+    echo "$as_me:$LINENO: checking for working iconv" >&5
+echo $ECHO_N "checking for working iconv... $ECHO_C" >&6
+if test "${am_cv_func_iconv_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+            am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      if test "$cross_compiling" = yes; then
+  case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  am_cv_func_iconv_works=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+am_cv_func_iconv_works=no
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+      LIBS="$am_save_LIBS"
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5
+echo "${ECHO_T}$am_cv_func_iconv_works" >&6
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ICONV 1
 _ACEOF
 
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
+    echo "$as_me:$LINENO: result: $LIBICONV" >&5
+echo "${ECHO_T}$LIBICONV" >&6
+  else
+            CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+
+
+
+  if test "$am_cv_func_iconv" = yes; then
     echo "$as_me:$LINENO: checking for iconv declaration" >&5
 echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
     if test "${am_cv_proto_iconv+set}" = set; then
@@ -11054,11 +12543,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
   fi
-  LIBICONV=
-  if test "$am_cv_lib_iconv" = yes; then
-    LIBICONV="-liconv"
-  fi
-
 
 
   echo "$as_me:$LINENO: checking for libcharset" >&5
@@ -11134,7 +12618,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-char* cs = nl_langinfo(CODESET);
+char* cs = nl_langinfo(CODESET); return !cs;
   ;
   return 0;
 }
@@ -11782,111 +13266,6 @@ echo "${ECHO_T}yes, given: $fc_x_proto_defines" >&6
 fi
 
 
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-
-if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  PKG_CONFIG=$ac_pt_PKG_CONFIG
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	else
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-		PKG_CONFIG=""
-	fi
-
-fi
-
   if test "$client" = yes ; then
     { echo "$as_me:$LINENO: WARNING: Not checking for XAW; use --enable-client=xaw to enable" >&5
 echo "$as_me: WARNING: Not checking for XAW; use --enable-client=xaw to enable" >&2;}
@@ -12920,6 +14299,112 @@ _ACEOF
     fi
 
 
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+if test -n "$ac_pt_PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	else
+		echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+		PKG_CONFIG=""
+	fi
+
+fi
+
+
 pkg_failed=no
 echo "$as_me:$LINENO: checking for PNG" >&5
 echo $ECHO_N "checking for PNG... $ECHO_C" >&6
@@ -14567,6 +16052,113 @@ echo "$as_me: error: specified client 'beos' not configurable" >&2;}
   if test "$client" = "win32" || test "$client" = "yes" ; then
     if test "$MINGW32" = "yes"; then
 
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+if test -n "$ac_pt_PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	else
+		echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+		PKG_CONFIG=""
+	fi
+
+fi
+
+
 pkg_failed=no
 echo "$as_me:$LINENO: checking for PNG" >&5
 echo $ECHO_N "checking for PNG... $ECHO_C" >&6
@@ -15667,6 +17259,7 @@ echo "$as_me: error: specified client 'win32' not configurable (mingw32 is neede
 
     if test "x$found_client" = "xyes"; then
       client=stub
+      CLIENT_LIBS="-lm"
     elif test "$client" = "stub"; then
       { { echo "$as_me:$LINENO: error: specified client 'stub' not configurable" >&5
 echo "$as_me: error: specified client 'stub' not configurable" >&2;}
@@ -16425,7 +18018,7 @@ for i in $libggz_incdirs;
 do
   for j in $libggz_header;
   do
-    echo "configure: 16428: $i/$j" >&5
+    echo "configure: 18021: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       libggz_incdir=$i
@@ -16700,7 +18293,7 @@ for i in $ggzmod_incdirs;
 do
   for j in $ggzmod_header;
   do
-    echo "configure: 16703: $i/$j" >&5
+    echo "configure: 18296: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ggzmod_incdir=$i
@@ -16830,7 +18423,7 @@ for i in $ggz_config_dirs;
 do
   for j in ggz-config;
   do
-    echo "configure: 16833: $i/$j" >&5
+    echo "configure: 18426: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ggz_config_dir=$i
@@ -17067,7 +18660,7 @@ for i in $ggz_gtk_incdirs;
 do
   for j in $ggz_gtk_header;
   do
-    echo "configure: 17070: $i/$j" >&5
+    echo "configure: 18663: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ggz_gtk_incdir=$i
@@ -17265,7 +18858,7 @@ for i in $libggz_incdirs;
 do
   for j in $libggz_header;
   do
-    echo "configure: 17268: $i/$j" >&5
+    echo "configure: 18861: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       libggz_incdir=$i
@@ -17375,8 +18968,8 @@ fi
     # parameter.
 
 	major=0
-	minor=0
-	micro=14
+	minor=99
+	micro=4
 
 	testprologue="#include <ggz.h>"
 	testbody=""
@@ -17536,7 +19129,7 @@ for i in $ggzdmod_incdirs;
 do
   for j in $ggzdmod_header;
   do
-    echo "configure: 17539: $i/$j" >&5
+    echo "configure: 19132: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ggzdmod_incdir=$i
@@ -18013,7 +19606,7 @@ for i in $libggz_incdirs;
 do
   for j in $libggz_header;
   do
-    echo "configure: 18016: $i/$j" >&5
+    echo "configure: 19609: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       libggz_incdir=$i
@@ -18288,7 +19881,7 @@ for i in $ggzmod_incdirs;
 do
   for j in $ggzmod_header;
   do
-    echo "configure: 18291: $i/$j" >&5
+    echo "configure: 19884: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ggzmod_incdir=$i
@@ -18418,7 +20011,7 @@ for i in $ggz_config_dirs;
 do
   for j in ggz-config;
   do
-    echo "configure: 18421: $i/$j" >&5
+    echo "configure: 20014: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ggz_config_dir=$i
@@ -18655,7 +20248,7 @@ for i in $ggz_gtk_incdirs;
 do
   for j in $ggz_gtk_header;
   do
-    echo "configure: 18658: $i/$j" >&5
+    echo "configure: 20251: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ggz_gtk_incdir=$i
@@ -18853,7 +20446,7 @@ for i in $libggz_incdirs;
 do
   for j in $libggz_header;
   do
-    echo "configure: 18856: $i/$j" >&5
+    echo "configure: 20449: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       libggz_incdir=$i
@@ -18963,8 +20556,8 @@ fi
     # parameter.
 
 	major=0
-	minor=0
-	micro=14
+	minor=99
+	micro=4
 
 	testprologue="#include <ggz.h>"
 	testbody=""
@@ -19124,7 +20717,7 @@ for i in $ggzdmod_incdirs;
 do
   for j in $ggzdmod_header;
   do
-    echo "configure: 19127: $i/$j" >&5
+    echo "configure: 20720: $i/$j" >&5
     if test -r "$i/$j"; then
       echo "taking that" >&5
       ggzdmod_incdir=$i
@@ -19384,6 +20977,93 @@ fi
 
 
 fi
+if test "$ggz_server" = "yes" ; then
+
+
+for ac_func in chdir mkdtemp
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+fi
 
 
 
@@ -23624,10 +25304,8 @@ fi
           ac_config_commands="$ac_config_commands fc_default-5"
 
 
-if test -n "$GCC"; then
-  CFLAGS="$EXTRA_GCC_DEBUG_CFLAGS $CFLAGS"
-  CXXFLAGS="$EXTRA_GCC_DEBUG_CXXFLAGS $CXXFLAGS"
-fi
+CFLAGS="$EXTRA_DEBUG_CFLAGS $CFLAGS"
+CXXFLAGS="$EXTRA_DEBUG_CXXFLAGS $CXXFLAGS"
 
 CONFIGURE_DEPENDENCIES="$CONFIGURE_DEPENDENCIES \$(top_srcdir)/version.in"
 
@@ -24569,7 +26247,8 @@ s, at host_vendor@,$host_vendor,;t t
 s, at host_os@,$host_os,;t t
 s, at MAJOR_VERSION@,$MAJOR_VERSION,;t t
 s, at MINOR_VERSION@,$MINOR_VERSION,;t t
-s, at NETWORK_CAPSTRING@,$NETWORK_CAPSTRING,;t t
+s, at NETWORK_CAPSTRING_MANDATORY@,$NETWORK_CAPSTRING_MANDATORY,;t t
+s, at NETWORK_CAPSTRING_OPTIONAL@,$NETWORK_CAPSTRING_OPTIONAL,;t t
 s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s, at INSTALL_DATA@,$INSTALL_DATA,;t t
@@ -24629,6 +26308,7 @@ s, at AR@,$AR,;t t
 s, at ac_ct_AR@,$ac_ct_AR,;t t
 s, at UNAME@,$UNAME,;t t
 s, at LIBICONV@,$LIBICONV,;t t
+s, at LTLIBICONV@,$LTLIBICONV,;t t
 s, at localedir@,$localedir,;t t
 s, at ALLOCA@,$ALLOCA,;t t
 s, at GLIBC21@,$GLIBC21,;t t
diff --git a/configure.ac b/configure.ac
index e399acc..c7d0341 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,9 +41,14 @@ AC_DEFINE_UNQUOTED([RELEASE_MONTH], [$RELEASE_MONTH], [Month next version will b
 AC_SUBST([MAJOR_VERSION])
 AC_SUBST([MINOR_VERSION])
 
-AC_DEFINE_UNQUOTED([NETWORK_CAPSTRING], ["$NETWORK_CAPSTRING"],
+AC_DEFINE_UNQUOTED([NETWORK_CAPSTRING_MANDATORY],
+		   ["$NETWORK_CAPSTRING_MANDATORY"],
 		   [Network capability string])
-AC_SUBST([NETWORK_CAPSTRING])
+AC_SUBST([NETWORK_CAPSTRING_MANDATORY])
+AC_DEFINE_UNQUOTED([NETWORK_CAPSTRING_OPTIONAL],
+		   ["$NETWORK_CAPSTRING_OPTIONAL"],
+		   [Additional optional network capabilities])
+AC_SUBST([NETWORK_CAPSTRING_OPTIONAL])
 
 dnl Initialize automake stuff
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
@@ -187,8 +192,8 @@ if test -z "$localedir"; then
 fi
 
 dnl I18n support
-ALL_LINGUAS="ar cs ca da de el en_GB es et fa fi fr he hu it ja ko lt nl nb no pl pt pt_BR ro ru sv tr uk zh_CN"
-AM_GNU_GETTEXT(,need-ngettext)
+ALL_LINGUAS="ar cs ca da de el en_GB eo es et fa fi fr he hu it ja ko lt nl 
+nb no pl pt pt_BR ro ru sv tr uk zh_CN" AM_GNU_GETTEXT(,need-ngettext)
 
 dnl AM_GNU_GETTEXT doesn't have all features we want
 dnl or they don't behave correctly.
@@ -219,7 +224,7 @@ Try --with-included-gettext or --disable-nls. Read ABOUT-NLS.)
 
   if test "$IS_BETA_VERSION" = "1" || test "$IS_DEVEL_VERSION" = "1"; then
     AC_MSG_CHECKING(for GNU xgettext version >= 0.10.36)
-    xgettext_version=`$XGETTEXT --version 2>&1 | grep GNU | sed 's/"/ /g'`
+    xgettext_version=`$XGETTEXT --version 2>&1 | grep GNU | head -n 1 | sed 's/"/ /g'`
     AC_TRY_RUN([
 #include <stdio.h>
 
@@ -254,7 +259,7 @@ Please update your gettext package.)
     )
 
     AC_MSG_CHECKING(for GNU msgfmt version >= 0.10.35)
-    msgfmt_version=`$MSGFMT --version 2>&1 | grep GNU | sed 's/"/ /g'`
+    msgfmt_version=`$MSGFMT --version 2>&1 | grep GNU | head -n 1 | sed 's/"/ /g'`
     AC_TRY_RUN([
 #include <stdio.h>
 
@@ -293,15 +298,13 @@ gettext package. We recommend you versions >= 0.10.38. Or use
   fi
 fi
 
-EXTRA_GCC_DEBUG_CFLAGS=""
-EXTRA_GCC_DEBUG_CXXFLAGS=""
-
-if test -n "$GCC"; then
-   EXTRA_GCC_DEBUG_CFLAGS="$CFLAGS"
-   EXTRA_GCC_DEBUG_CXXFLAGS="$CXXFLAGS"
-   CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations"
-   CXXFLAGS="-Wall -Wpointer-arith -Wcast-align"
-fi
+dnl Set debug flags supported by compiler
+EXTRA_DEBUG_CFLAGS=""
+EXTRA_DEBUG_CXXFLAGS=""
+FC_C_FLAGS([-Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations],
+ [], [EXTRA_DEBUG_CFLAGS])
+FC_CXX_FLAGS([-Wall -Wpointer-arith -Wcast-align],
+ [], [EXTRA_DEBUG_CXXFLAGS])
 
 FC_DEBUG
 AC_C99_VARIADIC_MACROS
@@ -458,6 +461,7 @@ if test x$client != xno; then
 
     if test "x$found_client" = "xyes"; then
       client=stub
+      CLIENT_LIBS="-lm"
     elif test "$client" = "stub"; then
       AC_MSG_ERROR(specified client 'stub' not configurable)
     fi
@@ -481,6 +485,9 @@ if test "$client" = "gtk-2.0" ; then
 else
   AC_GGZ_CHECK
 fi
+if test "$ggz_server" = "yes" ; then
+  AC_CHECK_FUNCS([chdir mkdtemp])
+fi
 
 AC_SUBST(gui_sources)
 AC_SUBST(CLIENT_CFLAGS)
@@ -648,7 +655,7 @@ dnl and builds 'po/Makefile.in' then 'po/Makefile'.  In order for the
 dnl commonly used _() and N_() macros to work, there should be somewhere
 dnl in that 'po/Makefile' a call to xgettext with "--keyword=_" and
 dnl "--keyword=N_" as arguments.  To support Q_() and PL_(),
-dnl the following simply dnl replaces instances of 
+dnl the following simply replaces instances of 
 dnl "--keyword=N_" with "--keyword=N_ --keyword=Q_ --keyword=PL_:1,2"
 dnl in the 'po/Makefile' file.
 AC_CONFIG_COMMANDS([fc_default-1],[[if test -f po/Makefile ; then
@@ -704,10 +711,8 @@ AC_CONFIG_COMMANDS([fc_default-5],[[if test x`uname -s` = xBeOS ; then
      fi
    fi]],[[]])
 
-if test -n "$GCC"; then
-  CFLAGS="$EXTRA_GCC_DEBUG_CFLAGS $CFLAGS"
-  CXXFLAGS="$EXTRA_GCC_DEBUG_CXXFLAGS $CXXFLAGS"
-fi
+CFLAGS="$EXTRA_DEBUG_CFLAGS $CFLAGS"
+CXXFLAGS="$EXTRA_DEBUG_CXXFLAGS $CXXFLAGS"
 
 dnl Rebuild 'configure' whenever version.in changes, if maintainer mode enabled.
 AC_SUBST([CONFIGURE_DEPENDENCIES], ["$CONFIGURE_DEPENDENCIES \$(top_srcdir)/version.in"])
diff --git a/data/Freeciv b/data/Freeciv
index dc3f437..2915772 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.1.5
+Freeciv*version:                             2.1.8
 Freeciv.title:                               Freeciv
 Freeciv.iconName:                            Freeciv
 Freeciv*borderColor:                         black
diff --git a/data/Makefile.in b/data/Makefile.in
index a1207be..dc3d348 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/amplio/Makefile.in b/data/amplio/Makefile.in
index d735935..c4958af 100644
--- a/data/amplio/Makefile.in
+++ b/data/amplio/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/buildings/Makefile.in b/data/buildings/Makefile.in
index 9e019d8..5b13ee6 100644
--- a/data/buildings/Makefile.in
+++ b/data/buildings/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/civ1/Makefile.in b/data/civ1/Makefile.in
index f8733db..bac792c 100644
--- a/data/civ1/Makefile.in
+++ b/data/civ1/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/civ2/Makefile.in b/data/civ2/Makefile.in
index 06929ef..c3fe351 100644
--- a/data/civ2/Makefile.in
+++ b/data/civ2/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/civclient.dsc.in b/data/civclient.dsc.in
index 34433d6..338cf53 100644
--- a/data/civclient.dsc.in
+++ b/data/civclient.dsc.in
@@ -7,5 +7,5 @@ Frontend = any
 Homepage = http://www.freeciv.org/
 Name = Freeciv
 ProtocolEngine = Freeciv
-ProtocolVersion = @NETWORK_CAPSTRING@
+ProtocolVersion = @NETWORK_CAPSTRING_MANDATORY@
 Version = @VERSION@
diff --git a/data/civserver.dsc.in b/data/civserver.dsc.in
index f4d4327..367c11f 100644
--- a/data/civserver.dsc.in
+++ b/data/civserver.dsc.in
@@ -12,7 +12,7 @@ ExecutablePath = @prefix@/bin/civserver -q 180 -e
 
 [Protocol]
 Engine = Freeciv
-Version = @NETWORK_CAPSTRING@
+Version = @NETWORK_CAPSTRING_MANDATORY@
 
 [TableOptions]
 AllowLeave = 1
@@ -22,6 +22,7 @@ PlayersAllowed = 1..30
 # Because of -q 180 -e options, above
 KillWhenEmpty = 0
 AllowSpectators = 0
+AllowRestore = 1
 
 [Statistics]
 Records = 1
diff --git a/data/default/Makefile.in b/data/default/Makefile.in
index 45c6c75..032d943 100644
--- a/data/default/Makefile.in
+++ b/data/default/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/flags/Makefile.in b/data/flags/Makefile.in
index 7df2153..480604f 100644
--- a/data/flags/Makefile.in
+++ b/data/flags/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/hex2t/Makefile.in b/data/hex2t/Makefile.in
index e72e1a4..f525f85 100644
--- a/data/hex2t/Makefile.in
+++ b/data/hex2t/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 817070f..42b4bdf 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/isophex/Makefile.in b/data/isophex/Makefile.in
index 7c3a43f..2eae861 100644
--- a/data/isophex/Makefile.in
+++ b/data/isophex/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/isotrident/Makefile.in b/data/isotrident/Makefile.in
index e04f8ad..7b7c322 100644
--- a/data/isotrident/Makefile.in
+++ b/data/isotrident/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/misc/Makefile.in b/data/misc/Makefile.in
index 44c78eb..e4cf1d4 100644
--- a/data/misc/Makefile.in
+++ b/data/misc/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/nation/Makefile.in b/data/nation/Makefile.in
index fa764bb..ea0aebf 100644
--- a/data/nation/Makefile.in
+++ b/data/nation/Makefile.in
@@ -107,6 +107,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -114,6 +115,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -123,12 +125,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/scenario/Makefile.in b/data/scenario/Makefile.in
index 825845a..9adc9e5 100644
--- a/data/scenario/Makefile.in
+++ b/data/scenario/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/stdsounds.soundspec b/data/stdsounds.soundspec
index fa1ffd6..9c3429f 100644
--- a/data/stdsounds.soundspec
+++ b/data/stdsounds.soundspec
@@ -94,7 +94,7 @@ f_mech_inf = "stdsounds/MgHeavy.ogg" ; [warzone]
 ;f_musketeers = ""
 f_nuclear = "stdsounds/LrgExpl.ogg" ; [warzone]
 f_paratroopers = "stdsounds/MgBar2.ogg" ; [warzone]
-f_partisan = "stdounds/MgBar1.ogg" ; [warzone]
+f_partisan = "stdsounds/MgBar1.ogg" ; [warzone]
 ;f_phalanx = ""
 ;f_pikemen = ""
 f_riflemen = "stdsounds/MgBar1.ogg" ; [warzone]
diff --git a/data/stdsounds/Makefile.in b/data/stdsounds/Makefile.in
index 9c60a8e..cd8b711 100644
--- a/data/stdsounds/Makefile.in
+++ b/data/stdsounds/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/Makefile.in b/data/themes/Makefile.in
index 0c245dd..7fbb5c6 100644
--- a/data/themes/Makefile.in
+++ b/data/themes/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/Makefile.in
index 16c6a8e..e4af2ca 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.in
index 9ce5647..7283d7d 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.in
index 1683c67..18fbdd7 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.in
index 234bd04..b2462a7 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.in
index 275478e..502c03e 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.in
index b336ce6..3c87ff3 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.in
index 29b4d52..d5dee9b 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.in
index 5b9619f..013d38a 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.in
index e95c6f5..c3c8a0c 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.in
index c2750c8..b8d05d9 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.in
index 909aebf..7e3f564 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.in
index 42514db..e46a324 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.in
index 99598cb..3099f45 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.in
index 1d195d0..7790025 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.in
index e67f7f5..57f73ab 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.in
index 6767dcb..8b27d37 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.in
index 91d0147..9c4a7ee 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.in
index 67d321b..8194bf6 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.in
index e9311e1..795ce77 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.in
index 916e87a..d50fcf0 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-gtk-2.0/Makefile.in b/data/themes/gui-gtk-2.0/Makefile.in
index 5eb8693..5b9b431 100644
--- a/data/themes/gui-gtk-2.0/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-sdl/Makefile.in b/data/themes/gui-sdl/Makefile.in
index a065746..f33da7a 100644
--- a/data/themes/gui-sdl/Makefile.in
+++ b/data/themes/gui-sdl/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/themes/gui-sdl/human/Makefile.in b/data/themes/gui-sdl/human/Makefile.in
index 654a89c..508047c 100644
--- a/data/themes/gui-sdl/human/Makefile.in
+++ b/data/themes/gui-sdl/human/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/trident/Makefile.in b/data/trident/Makefile.in
index caff622..afb727d 100644
--- a/data/trident/Makefile.in
+++ b/data/trident/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/data/wonders/Makefile.in b/data/wonders/Makefile.in
index 90e24e3..c61ba56 100644
--- a/data/wonders/Makefile.in
+++ b/data/wonders/Makefile.in
@@ -105,6 +105,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -112,6 +113,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -121,12 +123,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/dependencies/Makefile.in b/dependencies/Makefile.in
index 0f793dc..b0c7792 100644
--- a/dependencies/Makefile.in
+++ b/dependencies/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/dependencies/lua/Makefile.in b/dependencies/lua/Makefile.in
index fb405ed..76c36dc 100644
--- a/dependencies/lua/Makefile.in
+++ b/dependencies/lua/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/dependencies/lua/src/Makefile.in b/dependencies/lua/src/Makefile.in
index d4ace5e..fea8384 100644
--- a/dependencies/lua/src/Makefile.in
+++ b/dependencies/lua/src/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/dependencies/lua/src/lib/Makefile.in b/dependencies/lua/src/lib/Makefile.in
index 711b422..601c741 100644
--- a/dependencies/lua/src/lib/Makefile.in
+++ b/dependencies/lua/src/lib/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/dependencies/tolua/Makefile.in b/dependencies/tolua/Makefile.in
index 9e9c1c2..b7df1b7 100644
--- a/dependencies/tolua/Makefile.in
+++ b/dependencies/tolua/Makefile.in
@@ -106,6 +106,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -113,6 +114,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -122,12 +124,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 565e2e5..f359d32 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/doc/ca/Makefile.in b/doc/ca/Makefile.in
index a81b592..1f20776 100644
--- a/doc/ca/Makefile.in
+++ b/doc/ca/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/doc/de/Makefile.in b/doc/de/Makefile.in
index 09f8440..2d978fe 100644
--- a/doc/de/Makefile.in
+++ b/doc/de/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/doc/fr/Makefile.in b/doc/fr/Makefile.in
index d77b51c..9b43136 100644
--- a/doc/fr/Makefile.in
+++ b/doc/fr/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/doc/it/Makefile.in b/doc/it/Makefile.in
index 6e6acb9..363b559 100644
--- a/doc/it/Makefile.in
+++ b/doc/it/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/doc/ja/Makefile.in b/doc/ja/Makefile.in
index 800e3e9..d415eba 100644
--- a/doc/ja/Makefile.in
+++ b/doc/ja/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index 43214b1..a41b345 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/doc/nl/Makefile.in b/doc/nl/Makefile.in
index a4bad4d..a739e3d 100644
--- a/doc/nl/Makefile.in
+++ b/doc/nl/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/doc/sv/Makefile.in b/doc/sv/Makefile.in
index 816f7eb..3b336e9 100644
--- a/doc/sv/Makefile.in
+++ b/doc/sv/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/intl/plural.c b/intl/plural.c
index 54e7f35..8191335 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -302,7 +302,7 @@ static const short yycheck[] = {     1,
 #define YYPURE 1
 
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison.simple"
+#line 3 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
 /* This file comes from bison-1.28.  */
 
 /* Skeleton output parser for bison,
@@ -516,7 +516,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
 #endif
 #endif
 
-#line 217 "/usr/share/bison.simple"
+#line 217 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -921,7 +921,7 @@ case 12:
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/share/bison.simple"
+#line 543 "/home/haible/gnu/arch/linuxlibc6/share/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
diff --git a/m4/codeset.m4 b/m4/codeset.m4
new file mode 100644
index 0000000..223955b
--- /dev/null
+++ b/m4/codeset.m4
@@ -0,0 +1,21 @@
+# codeset.m4 serial 2 (gettext-0.16)
+dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET); return !cs;],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])
diff --git a/m4/compiler.m4 b/m4/compiler.m4
new file mode 100644
index 0000000..64264d6
--- /dev/null
+++ b/m4/compiler.m4
@@ -0,0 +1,68 @@
+# Macros to check compiler options
+#
+
+# Helper function that adds flags (words) to variable listing them.
+# Makes sure there is no extra spaces even in any situation
+#
+# $1 - Name of the target variable
+# $2 - Flags to add
+#
+AC_DEFUN([FC_ADD_WORDS_TO_VAR],
+[
+old_value="`eval echo '$'$1`"
+if test "x$old_value" = "x" ; then
+  $1="$2"
+elif test "x$2" != "x" ; then
+  $1="$old_value $2"
+fi
+])
+
+# Check if compiler supports given commandline parameter in language specific
+# variable. If it does, it will be concatenated to variable. If several
+# parameters are given, they are tested, and added to target variable,
+# one at a time.
+#
+# $1 - Language
+# $2 - Language specific variable
+# $3 - Parameters to test
+# $4 - Additional parameters
+# $5 - Variable where to add
+#
+
+AC_DEFUN([FC_COMPILER_FLAGS],
+[
+AC_LANG_PUSH([$1])
+
+flags_save="`eval echo '$'$2`"
+accepted_flags=""
+
+for flag in $3
+do
+  $2="$flags_save $accepted_flags $flag $4"
+  AC_COMPILE_IFELSE([int a;],
+                    [FC_ADD_WORDS_TO_VAR([accepted_flags], [$flag])])
+done
+FC_ADD_WORDS_TO_VAR([$5], [$accepted_flags])
+
+$2="$flags_save"
+
+AC_LANG_POP([$1])
+])
+
+# Commandling flag tests for C and C++
+#
+#
+# $1 - Parameters to test
+# $2 - Additional parameters
+# $3 - Variable where to add
+
+AC_DEFUN([FC_C_FLAGS],
+[
+FC_COMPILER_FLAGS([C], [CFLAGS], [$1], [$2], [$3])
+])
+
+
+AC_DEFUN([FC_CXX_FLAGS],
+[
+FC_COMPILER_FLAGS([C++], [CXXFLAGS], [$1], [$2], [$3])
+])
diff --git a/m4/debug.m4 b/m4/debug.m4
index 9beab1a..ad00536 100644
--- a/m4/debug.m4
+++ b/m4/debug.m4
@@ -10,12 +10,14 @@ esac], [enable_debug=some])
 
 dnl -g is added by AC_PROG_CC if the compiler understands it
 if test "x$enable_debug" = "xyes"; then
-  AC_DEFINE(DEBUG, 1, [Define if you want extra debugging.])
-  EXTRA_GCC_DEBUG_CFLAGS="$EXTRA_GCC_DEBUG_CFLAGS -Werror"
+  AC_DEFINE([DEBUG], [1], [Extra debugging support])
+  FC_C_FLAGS([-Werror], [], [EXTRA_DEBUG_CFLAGS])
+  FC_CXX_FLAGS([-Werror], [], [EXTRA_DEBUG_CXXFLAGS])
 else
   if test "x$enable_debug" = "xno"; then
-    AC_DEFINE(NDEBUG, 1, [Define if you want no debug support.])
-    EXTRA_GCC_DEBUG_CFLAGS="-O3 -fomit-frame-pointer"
+    AC_DEFINE([NDEBUG], [1], [No debugging support at all])
+    FC_C_FLAGS([-O3 -fomit-frame-pointer], [], [EXTRA_DEBUG_CFLAGS])
+    FC_CXX_FLAGS([-O3 -fomit-frame-pointer], [], [EXTRA_DEBUG_CXXFLAGS])
   fi
 fi
 ])
diff --git a/m4/esd.m4 b/m4/esd.m4
deleted file mode 100644
index 24666c9..0000000
--- a/m4/esd.m4
+++ /dev/null
@@ -1,194 +0,0 @@
-# Configure paths for ESD
-# Manish Singh    98-9-30
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
-dnl
-AC_DEFUN([AM_PATH_ESD],
-[dnl 
-dnl Get the cflags and libraries from the esd-config script
-dnl
-AC_ARG_WITH(esd-prefix,[  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)],
-            esd_prefix="$withval", esd_prefix="")
-AC_ARG_WITH(esd-exec-prefix,[  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
-            esd_exec_prefix="$withval", esd_exec_prefix="")
-AC_ARG_ENABLE(esdtest, [  --disable-esdtest       Do not try to compile and run a test ESD program],
-		    , enable_esdtest=yes)
-
-  if test x$esd_exec_prefix != x ; then
-     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
-     if test x${ESD_CONFIG+set} != xset ; then
-        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
-     fi
-  fi
-  if test x$esd_prefix != x ; then
-     esd_args="$esd_args --prefix=$esd_prefix"
-     if test x${ESD_CONFIG+set} != xset ; then
-        ESD_CONFIG=$esd_prefix/bin/esd-config
-     fi
-  fi
-
-  AC_PATH_PROG(ESD_CONFIG, esd-config, no)
-  min_esd_version=ifelse([$1], ,0.2.7,$1)
-  AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
-  no_esd=""
-  if test "$ESD_CONFIG" = "no" ; then
-    no_esd=yes
-  else
-    AC_LANG_SAVE
-    AC_LANG_C
-    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
-    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-
-    esd_major_version=`$ESD_CONFIG $esd_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_esdtest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $ESD_CFLAGS"
-      LIBS="$LIBS $ESD_LIBS"
-dnl
-dnl Now check if the installed ESD is sufficiently new. (Also sanity
-dnl checks the results of esd-config to some extent
-dnl
-      rm -f conf.esdtest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <esd.h>
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.esdtest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_esd_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_esd_version");
-     exit(1);
-   }
-
-   if (($esd_major_version > major) ||
-      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
-      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
-      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
-      printf("*** to point to the correct copy of esd-config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-       AC_LANG_RESTORE
-     fi
-  fi
-  if test "x$no_esd" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$ESD_CONFIG" = "no" ; then
-       echo "*** The esd-config script installed by ESD could not be found"
-       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the ESD_CONFIG environment variable to the"
-       echo "*** full path to esd-config."
-     else
-       if test -f conf.esdtest ; then
-        :
-       else
-          echo "*** Could not run ESD test program, checking why..."
-          CFLAGS="$CFLAGS $ESD_CFLAGS"
-          LIBS="$LIBS $ESD_LIBS"
-          AC_LANG_SAVE
-          AC_LANG_C
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <esd.h>
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding ESD or finding the wrong"
-          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
-          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
-          echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-          AC_LANG_RESTORE
-       fi
-     fi
-     ESD_CFLAGS=""
-     ESD_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(ESD_CFLAGS)
-  AC_SUBST(ESD_LIBS)
-  rm -f conf.esdtest
-])
-
-dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]])
-dnl Test, whether esd supports multiple recording clients (version >=0.2.21)
-dnl
-AC_DEFUN([AM_ESD_SUPPORTS_MULTIPLE_RECORD],
-[dnl
-  AC_MSG_NOTICE([whether installed esd version supports multiple recording clients])
-  ac_save_ESD_CFLAGS="$ESD_CFLAGS"
-  ac_save_ESD_LIBS="$ESD_LIBS"
-  AM_PATH_ESD(0.2.21,
-    ifelse([$1], , [
-      AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, true)
-      AC_DEFINE(ESD_SUPPORTS_MULTIPLE_RECORD, 1,
-	[Define if you have esound with support of multiple recording clients.])],
-    [$1]),
-    ifelse([$2], , [AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, false)], [$2])
-    if test "x$ac_save_ESD_CFLAGS" != x ; then
-       ESD_CFLAGS="$ac_save_ESD_CFLAGS"
-    fi
-    if test "x$ac_save_ESD_LIBS" != x ; then
-       ESD_LIBS="$ac_save_ESD_LIBS"
-    fi
-  )
-])
diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
index 7199071..20fea04 100644
--- a/m4/freetype2.m4
+++ b/m4/freetype2.m4
@@ -1,88 +1,121 @@
 # Configure paths for FreeType2
 # Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
+#
+# Copyright 2001, 2003, 2007 by
+# David Turner, Robert Wilhelm, and Werner Lemberg.
+#
+# This file is part of the FreeType project, and may only be used, modified,
+# and distributed under the terms of the FreeType project license,
+# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
+# indicate that you have read the license and understand and accept it
+# fully.
+#
+# As a special exception to the FreeType project license, this file may be
+# distributed as part of a program that contains a configuration script
+# generated by Autoconf, under the same distribution terms as the rest of
+# that program.
+#
+# First part is upstream (freetype2) version,
+# second is zero just in case upstream will use it,
+# third one is Freeciv modifications.
+# serial 2.0.1
 
-dnl AC_CHECK_FT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for FreeType2, and define FT2_CFLAGS and FT2_LIBS
-dnl
+# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
+# MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is
+# FreeType 2.0.4).
+#
 AC_DEFUN([AC_CHECK_FT2],
-[dnl
-dnl Get the cflags and libraries from the freetype-config script
-dnl
-AC_ARG_WITH(ft-prefix,
-[  --with-ft-prefix=PREFIX
-                          Prefix where FreeType is installed (optional)],
-            ft_config_prefix="$withval", ft_config_prefix="")
-AC_ARG_WITH(ft-exec-prefix,
-[  --with-ft-exec-prefix=PREFIX
-                          Exec prefix where FreeType is installed (optional)],
-            ft_config_exec_prefix="$withval", ft_config_exec_prefix="")
-AC_ARG_ENABLE(freetypetest,
-[  --disable-freetypetest  Do not try to compile and run
-                          a test FreeType program],
-              [], enable_fttest=yes)
-
-if test x$ft_config_exec_prefix != x ; then
-  ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
-  if test x${FT2_CONFIG+set} != xset ; then
-    FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
-  fi
-fi
-if test x$ft_config_prefix != x ; then
-  ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
-  if test x${FT2_CONFIG+set} != xset ; then
-    FT2_CONFIG=$ft_config_prefix/bin/freetype-config
-  fi
-fi
-AC_PATH_PROG(FT2_CONFIG, freetype-config, no)
-
-min_ft_version=ifelse([$1], ,6.1.0,$1)
-AC_MSG_CHECKING(for FreeType - version >= $min_ft_version)
-no_ft=""
-if test "$FT2_CONFIG" = "no" ; then
-  no_ft=yes
-else
-  FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-  FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
-  ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-  ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-  ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-  ft_min_major_version=`echo $min_ft_version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-  ft_min_minor_version=`echo $min_ft_version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-  ft_min_micro_version=`echo $min_ft_version | \
-         sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-  if test x$enable_fttest = xyes ; then
-    ft_config_is_lt=""
-    if test $ft_config_major_version -lt $ft_min_major_version ; then
-      ft_config_is_lt=yes
-    else
-      if test $ft_config_major_version -eq $ft_min_major_version ; then
-        if test $ft_config_minor_version -lt $ft_min_minor_version ; then
-          ft_config_is_lt=yes
-        else
-          if test $ft_config_minor_version -eq $ft_min_minor_version ; then
-            if test $ft_config_micro_version -lt $ft_min_micro_version ; then
-              ft_config_is_lt=yes
-            fi
-          fi
-        fi
-      fi
-    fi
-    if test x$ft_config_is_lt = xyes ; then
-      no_ft=yes
-    else
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $FT2_CFLAGS"
-      LIBS="$FT2_LIBS $LIBS"
-dnl
-dnl Sanity checks for the results of freetype-config to some extent
-dnl
-      AC_TRY_RUN([
+  [# Get the cflags and libraries from the freetype-config script
+   #
+   AC_ARG_WITH([ft-prefix],
+     dnl don't quote AC_HELP_STRING!
+     AC_HELP_STRING([--with-ft-prefix=PREFIX],
+                    [Prefix where FreeType is installed (optional)]),
+     [ft_config_prefix="$withval"],
+     [ft_config_prefix=""])
+
+   AC_ARG_WITH([ft-exec-prefix],
+     dnl don't quote AC_HELP_STRING!
+     AC_HELP_STRING([--with-ft-exec-prefix=PREFIX],
+                    [Exec prefix where FreeType is installed (optional)]),
+     [ft_config_exec_prefix="$withval"],
+     [ft_config_exec_prefix=""])
+
+   AC_ARG_ENABLE([freetypetest],
+     dnl don't quote AC_HELP_STRING!
+     AC_HELP_STRING([--disable-freetypetest],
+                    [Do not try to compile and run a test FreeType program]),
+     [],
+     [enable_fttest=yes])
+
+   if test x$ft_config_exec_prefix != x ; then
+     ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
+     if test x${FT2_CONFIG+set} != xset ; then
+       FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
+     fi
+   fi
+
+   if test x$ft_config_prefix != x ; then
+     ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
+     if test x${FT2_CONFIG+set} != xset ; then
+       FT2_CONFIG=$ft_config_prefix/bin/freetype-config
+     fi
+   fi
+
+   AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no])
+
+   min_ft_version=m4_if([$1], [], [7.0.1], [$1])
+   AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version])
+   no_ft=""
+   if test "$FT2_CONFIG" = "no" ; then
+     no_ft=yes
+   else
+     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
+     FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
+     ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+     ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+     ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+     ft_min_major_version=`echo $min_ft_version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+     ft_min_minor_version=`echo $min_ft_version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+     ft_min_micro_version=`echo $min_ft_version | \
+       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+     if test x$enable_fttest = xyes ; then
+       ft_config_is_lt=""
+       if test $ft_config_major_version -lt $ft_min_major_version ; then
+         ft_config_is_lt=yes
+       else
+         if test $ft_config_major_version -eq $ft_min_major_version ; then
+           if test $ft_config_minor_version -lt $ft_min_minor_version ; then
+             ft_config_is_lt=yes
+           else
+             if test $ft_config_minor_version -eq $ft_min_minor_version ; then
+               if test $ft_config_micro_version -lt $ft_min_micro_version ; then
+                 ft_config_is_lt=yes
+               fi
+             fi
+           fi
+         fi
+       fi
+       if test x$ft_config_is_lt = xyes ; then
+         no_ft=yes
+       else
+         ac_save_CFLAGS="$CFLAGS"
+         ac_save_LIBS="$LIBS"
+         CFLAGS="$CFLAGS $FT2_CFLAGS"
+         LIBS="$FT2_LIBS $LIBS"
+
+         #
+         # Sanity checks for the results of freetype-config to some extent.
+         #
+         AC_RUN_IFELSE([
+             AC_LANG_SOURCE([[
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include <stdio.h>
@@ -92,7 +125,7 @@ int
 main()
 {
   FT_Library library;
-  FT_Error error;
+  FT_Error  error;
 
   error = FT_Init_FreeType(&library);
 
@@ -104,40 +137,59 @@ main()
     return 0;
   }
 }
-],, no_ft=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-      CFLAGS="$ac_save_CFLAGS"
-      LIBS="$ac_save_LIBS"
-    fi             # test $ft_config_version -lt $ft_min_version
-  fi               # test x$enable_fttest = xyes
-fi                 # test "$FT2_CONFIG" = "no"
-if test x$no_ft = x ; then
-   AC_MSG_RESULT(yes)
-   ifelse([$2], , :, [$2])
-else
-   AC_MSG_RESULT(no)
-   if test "$FT2_CONFIG" = "no" ; then
-     echo "*** The freetype-config script installed by FreeType 2 could not be found."
-     echo "*** If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in"
-     echo "*** your path, or set the FT2_CONFIG environment variable to the"
-     echo "*** full path to freetype-config."
+
+             ]])
+           ],
+           [],
+           [no_ft=yes],
+           [echo $ECHO_N "cross compiling; assuming OK... $ECHO_C"])
+
+         CFLAGS="$ac_save_CFLAGS"
+         LIBS="$ac_save_LIBS"
+       fi             # test $ft_config_version -lt $ft_min_version
+     fi               # test x$enable_fttest = xyes
+   fi                 # test "$FT2_CONFIG" = "no"
+
+   if test x$no_ft = x ; then
+     AC_MSG_RESULT([yes])
+     m4_if([$2], [], [:], [$2])
    else
-     if test x$ft_config_is_lt = xyes ; then
-       echo "*** Your installed version of the FreeType 2 library is too old."
-       echo "*** If you have different versions of FreeType 2, make sure that"
-       echo "*** correct values for --with-ft-prefix or --with-ft-exec-prefix"
-       echo "*** are used, or set the FT2_CONFIG environment variable to the"
-       echo "*** full path to freetype-config."
+     AC_MSG_RESULT([no])
+     if test "$FT2_CONFIG" = "no" ; then
+       AC_MSG_WARN([
+
+  The freetype-config script installed by FreeType 2 could not be found.
+  If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in
+  your path, or set the FT2_CONFIG environment variable to the
+  full path to freetype-config.
+       ])
      else
-       echo "*** The FreeType test program failed to run.  If your system uses"
-       echo "*** shared libraries and they are installed outside the normal"
-       echo "*** system library path, make sure the variable LD_LIBRARY_PATH"
-       echo "*** (or whatever is appropiate for your system) is correctly set."
+       if test x$ft_config_is_lt = xyes ; then
+         AC_MSG_WARN([
+
+  Your installed version of the FreeType 2 library is too old.
+  If you have different versions of FreeType 2, make sure that
+  correct values for --with-ft-prefix or --with-ft-exec-prefix
+  are used, or set the FT2_CONFIG environment variable to the
+  full path to freetype-config.
+         ])
+       else
+         AC_MSG_WARN([
+
+  The FreeType test program failed to run.  If your system uses
+  shared libraries and they are installed outside the normal
+  system library path, make sure the variable LD_LIBRARY_PATH
+  (or whatever is appropriate for your system) is correctly set.
+         ])
+       fi
      fi
+
+     FT2_CFLAGS=""
+     FT2_LIBS=""
+     m4_if([$3], [], [:], [$3])
    fi
-   FT2_CFLAGS=""
-   FT2_LIBS=""
-   ifelse([$3], , :, [$3])
-fi
-AC_SUBST(FT2_CFLAGS)
-AC_SUBST(FT2_LIBS)
-])
+
+   AC_SUBST([FT2_CFLAGS])
+   AC_SUBST([FT2_LIBS])])
+
+# end of freetype2.m4
diff --git a/m4/ggz.m4 b/m4/ggz.m4
index 6cc2682..64f7962 100644
--- a/m4/ggz.m4
+++ b/m4/ggz.m4
@@ -1004,7 +1004,7 @@ AC_DEFUN([AC_GGZ_CHECK_SERVER],
   if test "$try_ggz" = "yes"; then
     # For now, version 0.0.14 is required.  This could be an additional
     # parameter.
-    AC_GGZ_VERSION([0], [0], [14], [], [try_ggz=no])
+    AC_GGZ_VERSION([0], [99], [4], [], [try_ggz=no])
   fi
 
   ggz_server="no"
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 7a08a8d..66bc76f 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,20 +1,40 @@
-#serial AM2
+# iconv.m4 serial AM6 (gettext-0.17)
+dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
 dnl From Bruno Haible.
 
-AC_DEFUN([AM_ICONV],
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
 [
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
   dnl those with the standalone portable GNU libiconv installed).
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 
-  AC_ARG_WITH([libiconv-prefix],
-[  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib], [
-    for dir in `echo "$withval" | tr : ' '`; do
-      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-      if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
-    done
-   ])
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
 
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libiconv and not disabled its use
+  dnl via --without-libiconv-prefix, he wants to use it. The first
+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  am_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+  AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     AC_TRY_LINK([#include <stdlib.h>
@@ -25,7 +45,7 @@ AC_DEFUN([AM_ICONV],
       am_cv_func_iconv=yes)
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
-      LIBS="$LIBS -liconv"
+      LIBS="$LIBS $LIBICONV"
       AC_TRY_LINK([#include <stdlib.h>
 #include <iconv.h>],
         [iconv_t cd = iconv_open("","");
@@ -37,7 +57,104 @@ AC_DEFUN([AM_ICONV],
     fi
   ])
   if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+    AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
+      dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
+      am_save_LIBS="$LIBS"
+      if test $am_cv_lib_iconv = yes; then
+        LIBS="$LIBS $LIBICONV"
+      fi
+      AC_TRY_RUN([
+#include <iconv.h>
+#include <string.h>
+int main ()
+{
+  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
+     returns.  */
+  {
+    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+    if (cd_utf8_to_88591 != (iconv_t)(-1))
+      {
+        static const char input[] = "\342\202\254"; /* EURO SIGN */
+        char buf[10];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_utf8_to_88591,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if (res == 0)
+          return 1;
+      }
+  }
+#if 0 /* This bug could be worked around by the caller.  */
+  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
+  {
+    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+    if (cd_88591_to_utf8 != (iconv_t)(-1))
+      {
+        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+        char buf[50];
+        const char *inptr = input;
+        size_t inbytesleft = strlen (input);
+        char *outptr = buf;
+        size_t outbytesleft = sizeof (buf);
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &inptr, &inbytesleft,
+                            &outptr, &outbytesleft);
+        if ((int)res > 0)
+          return 1;
+      }
+  }
+#endif
+  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+     provided.  */
+  if (/* Try standardized names.  */
+      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
+      /* Try IRIX, OSF/1 names.  */
+      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
+      /* Try AIX names.  */
+      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
+      /* Try HP-UX names.  */
+      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
+    return 1;
+  return 0;
+}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+        [case "$host_os" in
+           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+           *)            am_cv_func_iconv_works="guessing yes" ;;
+         esac])
+      LIBS="$am_save_LIBS"
+    ])
+    case "$am_cv_func_iconv_works" in
+      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+      *)   am_func_iconv=yes ;;
+    esac
+  else
+    am_func_iconv=no am_cv_lib_iconv=no
+  fi
+  if test "$am_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1,
+      [Define if you have the iconv() function and it works.])
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    AC_MSG_CHECKING([how to link with libiconv])
+    AC_MSG_RESULT([$LIBICONV])
+  else
+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+    dnl either.
+    CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  AC_SUBST(LIBICONV)
+  AC_SUBST(LTLIBICONV)
+])
+
+AC_DEFUN([AM_ICONV],
+[
+  AM_ICONV_LINK
+  if test "$am_cv_func_iconv" = yes; then
     AC_MSG_CHECKING([for iconv declaration])
     AC_CACHE_VAL(am_cv_proto_iconv, [
       AC_TRY_COMPILE([
@@ -60,9 +177,4 @@ size_t iconv();
     AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
       [Define as const if the declaration of iconv() needs const.])
   fi
-  LIBICONV=
-  if test "$am_cv_lib_iconv" = yes; then
-    LIBICONV="-liconv"
-  fi
-  AC_SUBST(LIBICONV)
 ])
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
new file mode 100644
index 0000000..96c4e2c
--- /dev/null
+++ b/m4/lib-ld.m4
@@ -0,0 +1,110 @@
+# lib-ld.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH(gnu-ld,
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(acl_cv_path_LD,
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break ;;
+      *)
+	test "$with_gnu_ld" != yes && break ;;
+      esac
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
new file mode 100644
index 0000000..e3d26fc
--- /dev/null
+++ b/m4/lib-link.m4
@@ -0,0 +1,709 @@
+# lib-link.m4 serial 13 (gettext-0.17)
+dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ(2.54)
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
+dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    LIBS="$LIBS $LIB[]NAME"
+    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+    LIB[]NAME[]_PREFIX=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  AC_SUBST([LIB]NAME[_PREFIX])
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl   acl_libext,
+dnl   acl_shlibext,
+dnl   acl_hardcode_libdir_flag_spec,
+dnl   acl_hardcode_libdir_separator,
+dnl   acl_hardcode_direct,
+dnl   acl_hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  acl_libext="$acl_cv_libext"
+  acl_shlibext="$acl_cv_shlibext"
+  acl_libname_spec="$acl_cv_libname_spec"
+  acl_library_names_spec="$acl_cv_library_names_spec"
+  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  acl_hardcode_direct="$acl_cv_hardcode_direct"
+  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
+dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  dnl Autoconf >= 2.61 supports dots in --with options.
+  define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
+[  --with-lib]N_A_M_E[-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
+  --without-lib]N_A_M_E[-prefix     don't search for lib$1 in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  LIB[]NAME[]_PREFIX=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
+          if test -n "$acl_shlibext"; then
+            shrext=".$acl_shlibext"             # typically: shrext=.so
+          else
+            shrext=
+          fi
+          if test $use_additional = yes; then
+            dir="$additional_libdir"
+            dnl The same code as in the loop below:
+            dnl First look for a shared library.
+            if test -n "$acl_shlibext"; then
+              if test -f "$dir/$libname$shrext"; then
+                found_dir="$dir"
+                found_so="$dir/$libname$shrext"
+              else
+                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                  ver=`(cd "$dir" && \
+                        for f in "$libname$shrext".*; do echo "$f"; done \
+                        | sed -e "s,^$libname$shrext\\\\.,," \
+                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                        | sed 1q ) 2>/dev/null`
+                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                    found_dir="$dir"
+                    found_so="$dir/$libname$shrext.$ver"
+                  fi
+                else
+                  eval library_names=\"$acl_library_names_spec\"
+                  for f in $library_names; do
+                    if test -f "$dir/$f"; then
+                      found_dir="$dir"
+                      found_so="$dir/$f"
+                      break
+                    fi
+                  done
+                fi
+              fi
+            fi
+            dnl Then look for a static library.
+            if test "X$found_dir" = "X"; then
+              if test -f "$dir/$libname.$acl_libext"; then
+                found_dir="$dir"
+                found_a="$dir/$libname.$acl_libext"
+              fi
+            fi
+            if test "X$found_dir" != "X"; then
+              if test -f "$dir/$libname.la"; then
+                found_la="$dir/$libname.la"
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  dnl First look for a shared library.
+                  if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
+                  fi
+                  dnl Then look for a static library.
+                  if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/$libname.$acl_libext"
+                    fi
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$acl_hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$acl_hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */$acl_libdirstem | */$acl_libdirstem/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
+                LIB[]NAME[]_PREFIX="$basedir"
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$acl_hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])
+
+dnl For those cases where a variable contains several -L and -l options
+dnl referring to unknown libraries and directories, this macro determines the
+dnl necessary additional linker options for the runtime path.
+dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
+dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
+dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
+dnl otherwise linking without libtool is assumed.
+AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
+[
+  AC_REQUIRE([AC_LIB_RPATH])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  $1=
+  if test "$enable_rpath" != no; then
+    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+      dnl Use an explicit option to hardcode directories into the resulting
+      dnl binary.
+      rpathdirs=
+      next=
+      for opt in $2; do
+        if test -n "$next"; then
+          dir="$next"
+          dnl No need to hardcode the standard /usr/lib.
+          if test "X$dir" != "X/usr/$acl_libdirstem"; then
+            rpathdirs="$rpathdirs $dir"
+          fi
+          next=
+        else
+          case $opt in
+            -L) next=yes ;;
+            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
+                 dnl No need to hardcode the standard /usr/lib.
+                 if test "X$dir" != "X/usr/$acl_libdirstem"; then
+                   rpathdirs="$rpathdirs $dir"
+                 fi
+                 next= ;;
+            *) next= ;;
+          esac
+        fi
+      done
+      if test "X$rpathdirs" != "X"; then
+        if test -n ""$3""; then
+          dnl libtool is used for linking. Use -R options.
+          for dir in $rpathdirs; do
+            $1="${$1}${$1:+ }-R$dir"
+          done
+        else
+          dnl The linker is used for linking directly.
+          if test -n "$acl_hardcode_libdir_separator"; then
+            dnl Weird platform: only the last -rpath option counts, the user
+            dnl must pass all path elements in one option.
+            alldirs=
+            for dir in $rpathdirs; do
+              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+            done
+            acl_save_libdir="$libdir"
+            libdir="$alldirs"
+            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            libdir="$acl_save_libdir"
+            $1="$flag"
+          else
+            dnl The -rpath options are cumulative.
+            for dir in $rpathdirs; do
+              acl_save_libdir="$libdir"
+              libdir="$dir"
+              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              libdir="$acl_save_libdir"
+              $1="${$1}${$1:+ }$flag"
+            done
+          fi
+        fi
+      fi
+    fi
+  fi
+  AC_SUBST([$1])
+])
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
new file mode 100644
index 0000000..a8684e1
--- /dev/null
+++ b/m4/lib-prefix.m4
@@ -0,0 +1,185 @@
+# lib-prefix.m4 serial 5 (gettext-0.15)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/$acl_libdirstem"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
+dnl the basename of the libdir, either "lib" or "lib64".
+AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
+[
+  dnl There is no formal standard regarding lib and lib64. The current
+  dnl practice is that on a system supporting 32-bit and 64-bit instruction
+  dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
+  dnl libraries go under $prefix/lib. We determine the compiler's default
+  dnl mode by looking at the compiler's library search path. If at least
+  dnl of its elements ends in /lib64 or points to a directory whose absolute
+  dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
+  dnl default, namely "lib".
+  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
+        esac
+      fi
+    done
+    IFS="$acl_save_IFS"
+  fi
+])
diff --git a/m4/locale.m4 b/m4/locale.m4
index 7a43b76..0df5e0a 100644
--- a/m4/locale.m4
+++ b/m4/locale.m4
@@ -1,19 +1,4 @@
-#serial AM1
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])
+#serial 0
 
 AC_DEFUN([AM_LIBCHARSET],
 [
diff --git a/m4/version.m4 b/m4/version.m4
index e4e6239..a970886 100644
--- a/m4/version.m4
+++ b/m4/version.m4
@@ -19,4 +19,7 @@ AC_DEFUN([FREECIV_DEVEL_VERSION], [IS_DEVEL_VERSION=$1])
 AC_DEFUN([FREECIV_BETA_VERSION], [IS_BETA_VERSION=$1])
 AC_DEFUN([FREECIV_NEXT_VERSION], [NEXT_STABLE_VERSION=$1])
 AC_DEFUN([FREECIV_RELEASE_MONTH], [RELEASE_MONTH=$1])
-AC_DEFUN([FREECIV_NETWORK_CAPSTRING], [NETWORK_CAPSTRING=$1])
+AC_DEFUN([FREECIV_NETWORK_CAPSTRINGS],
+	 [NETWORK_CAPSTRING_MANDATORY=$1
+	  NETWORK_CAPSTRING_OPTIONAL=$2]
+)
diff --git a/m4/win32-client.m4 b/m4/win32-client.m4
index 5b45158..d414aef 100644
--- a/m4/win32-client.m4
+++ b/m4/win32-client.m4
@@ -7,6 +7,10 @@ AC_DEFUN([FC_WIN32_CLIENT],
 [
   if test "$client" = "win32" || test "$client" = "yes" ; then
     if test "$MINGW32" = "yes"; then
+    
+      PKG_PROG_PKG_CONFIG
+      
+      dnl Check for libpng
       PKG_CHECK_MODULES([PNG], [libpng],
       [
         CLIENT_LIBS="-lwsock32 -lcomctl32 -mwindows $PNG_LIBS"
diff --git a/m4/xaw-client.m4 b/m4/xaw-client.m4
index 62f3cac..636ac70 100644
--- a/m4/xaw-client.m4
+++ b/m4/xaw-client.m4
@@ -21,6 +21,8 @@ AC_DEFUN([FC_XAW_CLIENT],
       AC_DEFINE_UNQUOTED(NARROWPROTO, $fc_x_proto_value, [Narrowproto])
     fi
 
+    PKG_PROG_PKG_CONFIG
+
     dnl Check for libpng
     PKG_CHECK_MODULES([PNG], [libpng],
     [
diff --git a/manual/Makefile.in b/manual/Makefile.in
index ba02fa9..38c8775 100644
--- a/manual/Makefile.in
+++ b/manual/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2f98e8d..fd36d32 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -170,6 +170,7 @@ client/gui-xaw/cma_fe.c
 client/gui-xaw/colors.c
 client/gui-xaw/connectdlg.c
 client/gui-xaw/dialogs.c
+client/gui-xaw/diplomat_dialog.c
 client/gui-xaw/diplodlg.c
 client/gui-xaw/graphics.c
 client/gui-xaw/gui_main.c
@@ -182,6 +183,7 @@ client/gui-xaw/menu.c
 client/gui-xaw/messagedlg.c
 client/gui-xaw/messagewin.c
 client/gui-xaw/optiondlg.c
+client/gui-xaw/pages.c
 client/gui-xaw/plrdlg.c
 client/gui-xaw/ratesdlg.c
 client/gui-xaw/repodlgs.c
diff --git a/po/ar.gmo b/po/ar.gmo
index d21f0d6..1186e30 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 54d2f7f..93b3c11 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\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"
@@ -48,22 +48,22 @@ msgstr "الرفاهية"
 msgid "Science"
 msgstr "العلوم"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:ب"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:ع"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:Ù‚"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:Ù…"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:ب"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:ع"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -483,81 +483,81 @@ msgstr "رسائل الاتصال أو  قطع الاتصال"
 msgid "AI Debug messages"
 msgstr "رسائل حل مشاكل DEBUG ل ذ.ا"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:ابادة جماعية"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:مولع بالقتال"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:معادي"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:غير متعاون"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:صعب"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?attitude:محايد"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:محترم"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:متعاون"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:متحمس"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:معجب"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:مبجل"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:هدنة"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:حرب"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:وقف اطلاق النار"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:سلام"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:متحالف"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:لم يقابل أبدا"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:فريق"
 
@@ -603,13 +603,13 @@ msgstr "%s وحدات"
 msgid "Size %d"
 msgstr "حجم %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "تكنولوجيا المستقبل. %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -621,65 +621,65 @@ msgstr "تكنولوجيا المستقبل. %d"
 msgid "None"
 msgstr "لا يوجد"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "تكنولوجيا المستقبل."
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(مجهول)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "طريق"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "الري"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "سكة حديد"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "منجم"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "تلوث"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "كوخ"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "حصن"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "النهر"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "أرض زراعية"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "قاعدة جوية"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "غبار ذري"
 
@@ -789,11 +789,11 @@ msgstr "نووي"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr "Ùˆ"
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?مع:, "
 
@@ -954,81 +954,81 @@ msgstr[0] " (المجموع %d مكررة مرة)"
 msgstr[1] " (المجموع %d مكررة مرتين)"
 msgstr[2] " (المجموع %d مكرر مرات)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "باراميتر فارغ ل \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "باراميتر مفقود ل \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d قبل الميلاد"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d بعد الميلاد"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "المتغير FREECIV_PATH محدد ولكنه فارغ; جاري استعمال الدليل الافتراضي بدلا عنه."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "لا يمكن قراءة مجلد البيانات %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "دليل البيانات يمكن تحديده بواسطة متغير البيئة FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "دليل البيانات الحالي هو: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "الملف \"%s\" مطلوب ... جاري الغاء العملية!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 "ال %s: خطأ قاتل: أنت تحاول تشغيلي كمستخدم الكومبيوتر ذو الصلاحيات العليا  !\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "استعمل حساب بلا صلاحيات بدلا من ذلك.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "مطابق تماما"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "فقط مطابق"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "مبهم"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "فارغ"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "طويل جدا"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "غير مطابق"
 
@@ -1057,22 +1057,22 @@ msgstr "ال %s قد بدء بناء ال %s في %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s يبيع %s (غير محتاج) ب %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "ال *%s (ذ.ا)* في نمط away، لا يستطيع ذ.ا أن يوقع هكذا معاهدة."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "ال *%s (ذ.ا)* أول نقض للتحالف مع %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "ال *%s (AI)* دعنا نوقف العداوات أولا، %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1080,47 +1080,47 @@ msgid ""
 msgstr ""
 "ال *%s (ذ.ا)* أرغب أولا ابقاء وقف اطلاق النار الحالي لمدة أطول قليلا  ، %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "ال *%s (ذ.ا)* أنا لا أثق بك للتحالف حتى اﻵن, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "ال *%s (ذ.ا)* أنا لا أعرف المدينة التي ذكرتها."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "ال *%s (ذ.ا)* متأسف، الرؤية المشتركة معاك ليست آمنة."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "ال *%s (ذ.ا)* هذه الصفقة ليست جيدة جدا لنا، %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "ال *%s (ذ.ا)* مرحبا بك بِحِلفنا %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "ال *%s (ذ.ا)* نعم، يمكننا البقاء متحدين للأبد، %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "ال *%s (ذ.ا)* نعم، السلام في وقتنا!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "ال *%s (ذ.ا)* موافق. لا مزيد من العداوات، %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1129,40 +1129,40 @@ msgstr ""
 "ال *%s (ذ.ا)* تحياتي يا %s! هل من الممكن اقتراح وقف اطلاق نار بينما نتعارف "
 "أكثر?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "ال *%s (ذ.ا)* لن يكون الفضاء ملكك أبدا. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "ال *%s (ذ.ا)* لقد تحملت أعمالك الشريرة لوقت طويل بما فيه الكفاية! إلى الحرب!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "ال *%s (ذ.ا)* السلام في ... وقت آخر."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
 "away with your crimes?"
 msgstr "ال *%s (ذ.ا)* أخيرا أصل إليك! هل فكرت أنك تستطيع حقا الهروب من جرائمك?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "ال *%s (ذ.ا)* عداواتك الخفية جلبت هذه الحرب عليك!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "ال *%s (ذ.ا)* عنفك ضد %s كان آخر خطأ لك!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1180,7 +1180,7 @@ msgstr[2] ""
 "ال *%s (ذ.ا)* سنقوم بشن حرب كاملة ضد %s في %d أدوار لايقاف إطلاق السفينة "
 "الفضائية."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1188,7 +1188,7 @@ msgid ""
 msgstr ""
 "ال *%s (ذ.ا)* إن مساعدتك في هذا الأمر متوقعة. ليعش تحالفنا المجيد طويلا!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1208,7 +1208,7 @@ msgstr[2] ""
 "ال *%s (ذ.ا)* لقد انتهك %s معاهداته معنا بشكل فظيع لمصلحته الشخصية.  سنرد "
 "عليه بالقوة في %d أدوار ونتوقع منك الايفاء بتحالفك معنا والعمل مثلنا!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1222,13 +1222,13 @@ msgstr[1] ""
 msgstr[2] ""
 "ال *%s (ذ.ا)* نود نهب وسلب حضارة %s الغنية. سنعلن الحرب في %d أدوار."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr "ال *%s (ذ.ا)* إذا كنت تريد جزءا من الغنيمة،شاركنا بالعملية!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1246,12 +1246,12 @@ msgstr[2] ""
 "ال *%s (ذ.ا)* لقد أخذنا بما فيه الكفاية من %s. دعنا نمزق هذه الحضارة المثيرة "
 "للشفقة. سنعلن الحرب في %d أدوار."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr "ال *%s (ذ.ا)* كحلفائك المجيدين، نتوقع مساعدتك في هذه الحرب."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1269,7 +1269,7 @@ msgstr[2] ""
 "ال *%s (ذ.ا)* سنوفي بتحالفنا وسنعلن الحرب على %s في %d أدوار.  اصمد - نحن "
 "قادمون!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1287,7 +1287,7 @@ msgstr[2] ""
 "ال *%s (ذ.ا)* سنوفي بتحالفنا مع %s وسنعلن الحرب على %s في %d أدوار.  نتوقع "
 "منك العمل مثلنا."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1296,7 +1296,7 @@ msgstr ""
 "ال *%s (ذ.ا)* محاولتك لاحتلال الفضاء لنفسك تخون بها نواياك الحقيقية، ولن "
 "أكون بهذا التحالف بعد اﻵن!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1304,19 +1304,19 @@ msgid ""
 msgstr ""
 "ال *%s (ذ.ا)* تعبر محاولتك للسيطرة الفردية على الفضاء الخارجي مهينة جدا."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr "ال *%s (ذ.ا)* إذا لم توقف بناء سفينك الفضائية، سأجبر على اتخاد عمل!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr "ال *%s (ذ.ا)* آسف، الرؤية المشتركة معاك ليست آمنة بعد اﻵن."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1324,7 +1324,7 @@ msgid ""
 msgstr ""
 "ال *%s (ذ.ا)* تحياتي يا أكثر حليف جدير بالثقة. نطلب منك تدمير عدونا، %s."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1333,7 +1333,7 @@ msgstr ""
 "ال *%s (ذ.ا)* تحياتي أيها الحليف، أرى أنك لم تعلن الحرب على عدونا، %s. لماذا "
 "يجب علي أن أذكرك بوعودك?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1343,7 +1343,7 @@ msgstr ""
 "ال *%s (ذ.ا)* يا خائن الشرف، لقد دخلنا في تحالف، ولكنك حتى اﻵن في حالة سلام "
 "مع عدونا اللدود، %s! هذا غير مقبول، لا تحالف بيننا بعد اﻵن!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1352,13 +1352,13 @@ msgstr ""
 "ال *%s (ذ.ا)* تحياتي أيها الصديق، هل من الممكن أن نقترح هدفا موحدا وانضماما "
 "لتحالف?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "ال *%s (ذ.ا)* تحياتي أيها الجار، هل من الممكن أن نقترح علاقات سلمية أكثر?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1367,7 +1367,7 @@ msgstr ""
 "ال *%s (ذ.ا)* لقد أرهقنا اراقة الدماء المستمر. هل من الممكن أن نقترح التوقف "
 "عن العداوات?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1377,133 +1377,138 @@ msgstr ""
 "واسمك لن ينسى أبدا!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "كل الخيارات"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (خيير)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "ذلك الاسم غير مسموح."
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "فشل العثور على ملف الصوت %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr "تحذير: تم أخذ اسم الضيف '%s' ، جاري إعادة التسمية إلى المستخدم '%s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "الضيوف غير مسموح بهم على هذا الخادم. آسف."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "تم رفض %s: الضيوف غير مسموح بهم."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr "خطأ قراءة قاعدة معلومات المستخدمين، جاري الدخول كاتصال الضيف '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr "خطأ قراءة قاعدة معلومات المستخدمين والدخول للضيوف غير مسموح به. متأسف"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "تم رفض %s: خطأ قاعدة المعلومات والضيوف غير مسموح بهم."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "إدخال كلمة السر ل %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "إدخال كلمة سر جديدة (وتذكرها)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "آسف، هذا الخادم يسمح فقط المستخدمين المسجلين مسبقا."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "تم رفض %s: يسمح فقط بالمستخدمين المسجلين مسبقا."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "آسف، محاولات خاطئة كثيرة..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr "تم رفض %s: محاولات التحقق من كلمة السر خاطئة وكثيرة لمستخدم جديد."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
 msgstr ""
 "تحذير: فشل الحفظ في قاعدة المعلومات. سيتم الاستمرار، ولكن لن تحفظ احصائياتك."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "تم رفض %s: محاولات دخول خاطئة كثيرة."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "كلمة السر غير صحيحة. حاول مرة أخرى."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "متأسف، اتصالك انفصل بعد عدم الاستخدام..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "تم رفض %s: انتهت مدة الخروج للاتصال بينما جاري الانتظار لكلمة السر."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "كلمة السر قصيرة جدا، أقل طول هو %d. حاول مرة أخرى."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2264,13 +2269,11 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "أي - الحرف الأوّل في الأبجديّة اللّاتينيّة مع جديد الـ إذا أنت الـ إذا دوران."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2278,33 +2281,33 @@ msgstr ""
 "debug [ player <اللاعب> | city <س> <ص> | units <س> <ص> | unit <رقم التعريف> "
 "| tech <اللاعب> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "يفعل أو يعطل تنقيح الذكاء الاصطناعي (ذ.ا) لكيان معطى."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr "إظهار أو اخفاء معلومات تنقيح ال ذ.ا ومخرجات التنقيح عن كيان معطى."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <اسم الخيار> <قيمة>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "تحديد خيار الخادم."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <اللاعب> [team]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "تغيير، إضافة أو إزالة عضوية لاعب لفريق."
 
-#: server/commands.c:135
+#: server/commands.c:134
 #, fuzzy
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
@@ -2313,15 +2316,15 @@ msgid ""
 "to achieve team victory with averaged individual scores."
 msgstr "المجموعات إذا الإستعمال أي - الحرف الأوّل في الأبجديّة اللّاتينيّة مع مع."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <الدليل>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "اختيار دليل مجموعة القواعد  أو رزمة التغيير  modpack الجديدة."
 
-#: server/commands.c:144
+#: server/commands.c:143
 #, fuzzy
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
@@ -2331,15 +2334,15 @@ msgstr ""
 "."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <نص>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "تحديد سطر معلومات metaserver."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2348,19 +2351,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <رقعة المعلومات>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "تحديد سطر رقع معلومات metaserver."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "السيطرة على اتصال metaserver."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2368,33 +2371,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <عنوان انترنت>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "اختيار عنوان موقع الانترنت لارسال التقارير له من metaserver."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <اسم اللاعب>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "تفعييل أو تعطيل حالة الذّكاء الاصطناعيّ للاعب."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [connection-name] <اسم اللاعب>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "الاستيلاء على مكان لاعب في اللعبة."
 
-#: server/commands.c:185
+#: server/commands.c:184
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2405,15 +2408,15 @@ msgid ""
 msgstr "فقط مع إذا<player-name> إذا."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [اسم الاتصال] [اسم اللاعب]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "مراقبة لاعب أو كل اللعية."
 
-#: server/commands.c:195
+#: server/commands.c:194
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2424,15 +2427,15 @@ msgid ""
 msgstr "فقط مع إذا إذا."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <اسم الاتصال>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "الانفصال عن لاعب."
 
-#: server/commands.c:205
+#: server/commands.c:204
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2440,20 +2443,20 @@ msgid ""
 msgstr "فقط مع."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <اسم اللاعب>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "انشاء لاعب ذ.ا باسم معطى."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "يتوفر الأمر 'create' فقط قبل بداية اللعبة."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2461,16 +2464,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "وضع نفسك في نمط away. سيحمي الذكاء الاصطناعي ظهرك."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "سيحكم ال ذ.ا أمتك ولكنه سيفعل تغييرات بسيطة."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2478,11 +2481,11 @@ msgstr ""
 "novice\n"
 "novice <اسم اللاعب>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "وضع لاعب أو كل لاعبي ذ.ا إلى مستوى 'مبتدئ'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 #, fuzzy
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
@@ -2491,7 +2494,7 @@ msgid ""
 msgstr "مع ذكاء اصطناعي مبتدئ جديد ذكاء اصطناعي مبتدئ مع."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2499,11 +2502,11 @@ msgstr ""
 "easy\n"
 "easy <اسم اللاعب>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "وضع لاعب أو كل لاعبي ذ.ا إلى مستوى 'سهل'."
 
-#: server/commands.c:235
+#: server/commands.c:234
 #, fuzzy
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
@@ -2512,7 +2515,7 @@ msgid ""
 msgstr "مع ذكاء اصطناعي سهل جديد ذكاء اصطناعي سهل مع."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2520,11 +2523,11 @@ msgstr ""
 "normal\n"
 "normal <اسم اللاعب>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "وضع لاعب أو كل لاعبي ذ.ا إلى مستوى 'عادي'."
 
-#: server/commands.c:244
+#: server/commands.c:243
 #, fuzzy
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
@@ -2533,7 +2536,7 @@ msgid ""
 msgstr "مع ذكاء اصطناعي عادي جديد ذكاء اصطناعي عادي مع."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2541,11 +2544,11 @@ msgstr ""
 "hard\n"
 "hard <اسم اللاعب>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "وضع لاعب أو كل لاعبي ذ.ا إلى مستوى 'صعب'."
 
-#: server/commands.c:253
+#: server/commands.c:252
 #, fuzzy
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
@@ -2554,7 +2557,7 @@ msgid ""
 msgstr "مع ذكاء اصطناعي صعب جديد ذكاء اصطناعي صعب مع."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2562,11 +2565,11 @@ msgstr ""
 "experimental\n"
 "experimental <اسم اللاعب>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "وضع لاعب أو كل لاعبي ذ.ا إلى مستوى 'تجريبي'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 #, fuzzy
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
@@ -2576,7 +2579,7 @@ msgid ""
 msgstr "مع ذكاء اصطناعي تجريبي جديد ذكاء اصطناعي مع ذكاء اصطناعي لـ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2590,11 +2593,11 @@ msgstr ""
 "cmdlevel <المستوى> first\n"
 "cmdlevel <المستوى> <اسم الاتصال>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "الإستفسار أو تحديد مستوى صلاحية الأوامر."
 
-#: server/commands.c:276
+#: server/commands.c:275
 #, fuzzy
 msgid ""
 "The command access level controls which server commands are available\n"
@@ -2622,20 +2625,20 @@ msgstr ""
 "\n"
 " جديد مع الملاحظة."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "إذا لم يكن هناك أحد ، ستصبح منظم اللعبة مع صلاحيات أكثر."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <الدور> <زيادة الدور> <القيمة> <مضاعف القيمة>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "انظر \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 #, fuzzy
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
@@ -2645,24 +2648,24 @@ msgstr ""
 "كلّ<turn> أدوار<value><turninc><turn><value><valuemult> الإستعمال مع التقصيرات"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "الخروج من اللعبة فورا بتعادل."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "surrender"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "خسارة اللعبة."
 
-#: server/commands.c:317
+#: server/commands.c:316
 #, fuzzy
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
@@ -2670,15 +2673,15 @@ msgid ""
 msgstr "هذا."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <اسم اللاعب>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "إزالة اللاعب من اللعبة بشكل كامل."
 
-#: server/commands.c:325
+#: server/commands.c:324
 #, fuzzy
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
@@ -2686,7 +2689,7 @@ msgid ""
 msgstr "هذا الإستعمال مع!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2694,11 +2697,11 @@ msgstr ""
 "save\n"
 "save <اسم الملف>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "حفظ اللعية على ملف."
 
-#: server/commands.c:333
+#: server/commands.c:332
 #, fuzzy
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
@@ -2712,7 +2715,7 @@ msgstr ""
 "<filename>."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2720,11 +2723,11 @@ msgstr ""
 "load\n"
 "load <اسم الملف>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "تحميل اللعبة من ملف."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2733,28 +2736,28 @@ msgstr ""
 "مجموعات القواعد وخيارات الخادم.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <اسم الملف>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "قراءة و تنفيد أوامر الخادم من ملف."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <اسم الملف>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "كتابة الاعدادات الحالية كأوامر للخادم على ملف."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "تحويل مخرجات الخادم بين 'أسلوب RFC' والأسلوب العادي."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "ببساطة يعيد رقم تعريف الخادم."
 
@@ -3272,26 +3275,35 @@ msgstr "لقد سببت حادثا عند محاولة التحريض على ث
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "لقد سبب %s حادثا عند محاولة التحريض على ثورة في %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "الوحدات البحرية البادئة غير مدعومة حتى اﻵن, لا يستطيع أي أحد الحصول على %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "السنة: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr "زادت مدة الخروج من الدور الحد الاعلى، جاري تثبيت على الحد الأعلى"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "مدة الخروج أقل من الصفر، جاري تثبيت على الصفر."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "يسمح فقط لعميل GGZ مناداة civclient في نمط ggz!\n"
 
@@ -3334,25 +3346,25 @@ msgstr "لا يوجد هناك اتصال باسم %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "لا يوجد هناك لاعب أو اتصال باسم %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "حصل الاحترار العالمي!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr "تم غمر الشرائط الساحلية وتصحر مساحات شاسعة من الأرض العشبية."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "حدث الشتاء النووي!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr "جفت الأهوار وتحولت سهول كثيرة من الأرض الزراعية إلى التندرا."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3361,7 +3373,7 @@ msgstr ""
 "ينتشر أمل جديد كالنار في كل أنحاء المدينة عند اعلان اكتشاف سكة الحديد.\n"
 "      يجتمع العمال بعفوية ويطورون كل مدنك إلى سكك الحديد."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3370,12 +3382,12 @@ msgstr ""
 "يفرح الناس عند سماع معرفة علمائك عن سكك الحديد.\n"
 "      يجتمع العمال بعفوية ويطورون كل مدنك إلى سكك الحديد."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "تم تحريك وحدتك %s لتغير التضاريص."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "تم تسريح وحدتك %s لتغير التضاريص."
@@ -3437,27 +3449,27 @@ msgstr "الثورة : العودة إلى حكم الفوضوية."
 msgid "You should choose a new government from the government menu."
 msgstr "يجب عليك اختيار حكومة جديدة من قائمة الحكومة."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "تعدت نسبة الضريبة الحد الأعلى ل %s، تم التعديل."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "تعدت نسبة العلوم الحد الأعلى ل %s، تم التعديل."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "تعدت نسبة الرفاهية الحد الأعلى ل %s، تم التعديل."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "لا يعطينا %s رؤية مشتركة بعد اﻵن!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3466,13 +3478,13 @@ msgstr ""
 "لن يسمح لك مجلس الشيوخ بنقض المعاهدة مع %s. يجب عليك حل المجلس أو الانتظار "
 "لوقف أفضل."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "وافق مجلس الشيوخ على مشروع قانونك بسبب الاستفزازات المستمرة من %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3481,12 +3493,12 @@ msgstr ""
 "يرفض مجلس الشيوخ انهاء المعاهدة مع %s، ولكن لن تجد صعوبة في العثور على مجلس "
 "جديد."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "الحالة الدبلوماسية بين ال %s و ال %s هي اﻵن %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3495,67 +3507,67 @@ msgstr ""
 "الغى  %s الاتفاقية الدبلوماسية! الحالة الدبلوماسية بين ال %s و ال %s هي اﻵن %"
 "s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr "هاجم %s حليفك %s! أنت تلغي تحالفك مع المعتدي."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr "أعلن زميلك في الفريق %s الحرب على %s. أنت مجبر أن تلغي تحالفك مع %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "إزالة اللاعب %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "لقد تم إزالتك من اللعبة!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "لقد تم إزالة %s من اللعبة."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "لقد اتصلت لأول مرة مع %s, المحكوم من %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, fuzzy, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr "هاجم %s حليفك %s! أنت تلغي تحالفك مع المعتدي."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "لا يمكن اشعال الحرب الأهلية في %s  - لوجود لاعبيين كثر"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "لا يمكن اشعال الحرب الأهلية في %s  - لوجود لاعبيين كثر"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr "أمتك في حرب أهلية تحت قيادة %s للولايات الثائرة."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "يعلن %s الولاء إلى %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3794,21 +3806,21 @@ msgstr " "
 msgid "th"
 msgstr " "
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "تحتوي السلسلة الحرفية للديمغرافيا على أحرف غير صحيحة. جرّب \"help demography"
 "\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "تقرير الديمغرافية:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "آسف، تقرير الديمغرافية غير متوفر."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "ال %s من %s (%s)"
@@ -3819,11 +3831,11 @@ msgstr "ال %s من %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "فشل العثور على ملف مجموعة القواعد قابل للقراءة \"%s.%s\"."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "جاري تحميل مجموعات القواعد"
 
@@ -3838,7 +3850,7 @@ msgstr ""
 "يحتوي الملف المحفوظ على بيانات خريطة غير كاملة.  يمكن أن يحدث هذا مع اللعب "
 "المحفوظة القديمة، أو يمكن أن يعني ملفا محفوظا خاطئ. استمر على مسئوليتك."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "ملف اللعبة المحفوظة قديم جدا، يشترط على الأقل 1.9.0."
@@ -3862,13 +3874,13 @@ msgstr ""
 "استعمال '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3904,7 +3916,7 @@ msgstr "داخلي"
 msgid "Networking"
 msgstr "شبكي"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "الكل"
@@ -3925,7 +3937,7 @@ msgstr "نادر"
 msgid "Changed"
 msgstr "متغيّر"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -3933,7 +3945,7 @@ msgstr ""
 "تحتوي سلسلة الحروف للأخذ المسموح به على\n"
 "أحرف خاطئة.  جرّب \"help allowtake\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -3941,7 +3953,7 @@ msgstr ""
 "تحتوي سلسلة الحروف لوحدات البداية\n"
 "على أحرف خاطئة.  جرّب \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -3951,26 +3963,31 @@ msgstr ""
 "على الأقل مّؤسس مدينة واحد.  جرّب \n"
 "\"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "لا يمكن تغيير الحد الأعلى من اللاعبيين في نمط GGZ."
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr "عدد اللاعبين أكبر من القيمة المطلوبة، سيتم الحفاظ على القيمة القديمة."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "لا يُسْمَح لك تغيير هذا الخيار."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "حجم الخريطة (بآلاف البلاطات)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -3980,12 +3997,12 @@ msgstr ""
 "  يعني حجم 4 خريطة عادية ب 4,000 بلاطة (افتراضي)\n"
 "  ويعني حجم  20 خريطة ضخمة ب 20,000 بلاطة"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "دليل الخريطة البنيوي"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 #, fuzzy
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
@@ -4052,11 +4069,11 @@ msgstr ""
 "\n"
 "\n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "الطريقة المستخدمة لعمل الخريطة"
 
-#: server/settings.c:288
+#: server/settings.c:279
 #, fuzzy
 msgid ""
 "0 = Scenario map - no generator;\n"
@@ -4069,11 +4086,11 @@ msgid ""
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr "السيناريو بالكامل مزيّف الجزيرة إذا شاهد."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "الطريقة المستخدمة لاختيار مواقع البداية"
 
-#: server/settings.c:302
+#: server/settings.c:293
 #, fuzzy
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
@@ -4090,37 +4107,37 @@ msgstr ""
 "\n"
 " شاهد المحاولة المحاولة المحاولة المكان الحجم"
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "وجود جزر حجم 1x1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "تعني قيمة 0 بلا جزر حجم 1x1 ، وتعني قيمة 1 بعض جزر حجم 1x1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "اعتبار الأقطاب قارات منفصلة"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "تعني قيمة  0 أن القارات يمكن أن تتحد مع الأقطاب و قيمة 1 تعني أن الأقطاب "
 "منفصلة عادة"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "كلّ الخريطة معتدلة"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "تعني قيمة 0 كوكب عاديا كاﻷرض وتعني قيمة 1 كوكبا معتدلا ككل"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "معدل حرارة الكوكب"
 
-#: server/settings.c:335
+#: server/settings.c:326
 #, fuzzy
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
@@ -4139,21 +4156,21 @@ msgid ""
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr "صغير مع مع مع عادي مع مع"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "نسبة الأرض المئوبة في الخريطة"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr "يعطي هذا الاعداد النسبة المئوية التقريبية للخريطة التي ستصبح أرض."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "كمية التلال/الجبال"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4161,11 +4178,11 @@ msgstr ""
 "تعطي القيم الصغيرة خرائط مسطحة بينما تعطي القيم الأعلى خريطة مع تلال وجبال "
 "أكثر."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "كمية المياه على الأراضي"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4173,11 +4190,11 @@ msgstr ""
 "تعني القيم الصغيرة أرضا صحراوية جافة بينما تعطي القيم الأعلى خريطة أكثر بللا "
 "مع مستنقعات وأدغال وأنهار."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "القيمة الأولية لعشوائية توليد الخريطة"
 
-#: server/settings.c:375
+#: server/settings.c:366
 #, fuzzy
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
@@ -4185,11 +4202,11 @@ msgid ""
 "usually only of interest while debugging the game."
 msgstr "الـ هذا."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "القيمة الأولية لعشوائية اللعبة"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4197,11 +4214,11 @@ msgstr ""
 "إذا كانت صفرا (الافتراضي) فإن القيمة الأولية للعشوائية ستختار بناء على "
 "الوقت. هذا الاعداد عادة مهم فقط عند تنقيح اللعبة"
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "كمية مربعات المصادر \"الخاصة\" "
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4209,11 +4226,11 @@ msgstr ""
 "تحسن المصادر الخاصة من نوع التضاريص الأساسي الموجودة فوقه. يقاس متغير الخادم "
 "بأجزاء الألف."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "كمية الأكواخ (قرى قبائل الأقليات)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4221,23 +4238,24 @@ msgstr ""
 "يعطي هذا الاعداد عدد الأكواخ بالضبط التي ستوضع على الخريطة. الأكواخ هي قرى "
 "قبائل صغيرة الممكن التحقق منها من قبل الوحدات."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "أقل حد لعدد اللاعبيين"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "يجب أن يكون هناك هذا العدد  من اللاعبيين  (لاعبيين أناس أو ذ.ا) على الأقل "
 "قبل بداية اللعبة."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "أعلى حد لعدد اللاعبيين"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4246,11 +4264,11 @@ msgstr ""
 "الحد الأعلى من اللاعبيين (الناس ، ذ.ا) اللذين يمكن أي يكونوا في اللعبة. سيتم "
 "رفض أي زيادة عن هذا العدد قبل بدء اللعبة."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "مجموع عدد اللاعبيين الكلي (مع لاعبيين ذ.ا)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4258,11 +4276,11 @@ msgstr ""
 "إذا كانت رقم موجب ، سيتم إضافة أو ازالة لاعبي ذ.ا لإبقاء هذا العدد من "
 "اللاعبيين."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "قائمة وحدات اللاعبيين عند البداية"
 
-#: server/settings.c:449
+#: server/settings.c:440
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
@@ -4289,27 +4307,27 @@ msgstr ""
 " يصوم، سريع الهجوم وحدات الخيالة\n"
 " أي - الحرف الأوّل في الأبجديّة اللّاتينيّة قوي الهجوم وحدات منجنيق"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "المنطقة حيث ستتواجد الوحدات عند البداية"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "هذا هو نصف القطر الذي ستتواجد الوحدات فيه متفرقة عند البداية."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "كمية الذهب لكل لاعب عند البداية"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "عند البداية سيعطى كل لاعب هذه الكمية من الذهب."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "عدد التكنولوجيات لكل لاعب عند البداية"
 
-#: server/settings.c:481
+#: server/settings.c:472
 #, fuzzy
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
@@ -4318,11 +4336,11 @@ msgid ""
 "next techs really expensive."
 msgstr "في الـ الإعتماد."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "مضاعف تكلفة نسبة التكنولوجيا المئوي"
 
-#: server/settings.c:491
+#: server/settings.c:482
 #, fuzzy
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
@@ -4330,11 +4348,11 @@ msgid ""
 "determined by the ruleset or other game settings."
 msgstr "هذا جديد الكل الـ."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "نسبة الجزاء المئوية عند تغيير التكنولوجيا"
 
-#: server/settings.c:501
+#: server/settings.c:492
 #, fuzzy
 msgid ""
 "If you change your current research technology, and you have positive "
@@ -4342,12 +4360,12 @@ msgid ""
 "does not apply when you have just gained a technology this turn."
 msgstr "إذا هذا دوران."
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "الجزاء عند أخذ التكنولوجيا عن طريق معاهدة"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4356,11 +4374,11 @@ msgid ""
 "to gold transfers in diplomatic treaties."
 msgstr "لـ جديد أنت مع."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "الجزاء عند أخذ التكنولوجيا عن طريق الاحتلال"
 
-#: server/settings.c:522
+#: server/settings.c:513
 #, fuzzy
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
@@ -4368,11 +4386,11 @@ msgid ""
 "this is non-zero, you can end up with negative research points."
 msgstr "لـ جديد أنت مع."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "الجزاء عند أخذ تكنولوجيا مجانية"
 
-#: server/settings.c:533
+#: server/settings.c:524
 #, fuzzy
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
@@ -4382,11 +4400,11 @@ msgid ""
 "points."
 msgstr "لـ رائع مكتبة جديد أنت مع."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "كمية الطعام المتطلب لتوسع المدينة"
 
-#: server/settings.c:545
+#: server/settings.c:536
 #, fuzzy
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
@@ -4394,12 +4412,12 @@ msgid ""
 "the size of the city."
 msgstr "هذا الطعام هذا الحجم."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "نسبة الطعام المئوية المفقودة عند الحاجة لقناة مائية"
 
-#: server/settings.c:554
+#: server/settings.c:545
 #, fuzzy
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
@@ -4407,22 +4425,22 @@ msgid ""
 "it has a Granary)."
 msgstr "إذا قناة مائية البالوعة النظام مخزن الحبوب."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "مضاعفة النسبة المئوية لتكاليف الانتاج"
 
-#: server/settings.c:564
+#: server/settings.c:555
 #, fuzzy
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr "هذا الـ."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "أقل حجم مدينة للحصول على تجارة كاملة"
 
-#: server/settings.c:579
+#: server/settings.c:570
 #, fuzzy
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
@@ -4431,11 +4449,11 @@ msgid ""
 "also notradesize."
 msgstr "هناك الـ عادي الحجم شاهد."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "أكبر حجم لمدينة بدون تجارة"
 
-#: server/settings.c:590
+#: server/settings.c:581
 #, fuzzy
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
@@ -4443,22 +4461,22 @@ msgid ""
 "notradesize and smaller than fulltradesize. See also fulltradesize."
 msgstr "المدن الحجم الـ شاهد."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "حجم المدينة قبل أن يصبح الناس تعيسين"
 
-#: server/settings.c:600
+#: server/settings.c:591
 #, fuzzy
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
 msgstr "فيما مضى شاهد."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "عدد المدن لزيادة التعاسة"
 
-#: server/settings.c:609
+#: server/settings.c:600
 #, fuzzy
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
@@ -4467,11 +4485,11 @@ msgid ""
 "numbers of cities."
 msgstr "متى مواطنيين هذا الحكم الديقراطي."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "أقل مسافة بين مدينتين"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4480,11 +4498,11 @@ msgid ""
 "(default), the ruleset value will be used."
 msgstr "متى جديد لـ فارغ إذا."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "عدد الأدوار بين أثر نشوة الطرب"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4492,22 +4510,22 @@ msgstr ""
 "يحدد عدد الأدوار بين توسع المدينة البهيج. إذا كان محددا ب ن فإن المدينة "
 "ستتوسع بعد الاحتفال ل ن+1 أدوار."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "فرصة تدمير المباني المحتلة"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr ""
 "عند احتلال لاعب لمدينة، يحصل كل تحسين مدني هذه النسبة المئوية لفرصة التدمير."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "فرصة التحرك إلى بلاطة بعد الهجوم"
 
-#: server/settings.c:648
+#: server/settings.c:639
 #, fuzzy
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
@@ -4517,11 +4535,11 @@ msgid ""
 "\"occupying\" territory."
 msgstr "إذا الهجوم إذا إذا."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "تفعيل أو تعطيل الهجوم التلقائي عند الخادم"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4529,11 +4547,11 @@ msgstr ""
 "إذا كان مفعلا، فإن الوحدات الممكن تحريكها ستنظر في امكانية الهجوم على وحدات "
 "العدو المجاورة لها."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "تقليل عدد سكان مدينة بعد أي هجوم"
 
-#: server/settings.c:667
+#: server/settings.c:658
 #, fuzzy
 msgid ""
 "This flag indicates whether city population is reduced after successful "
@@ -4548,11 +4566,11 @@ msgstr ""
 "\n"
 "\n"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "نصف قطر الحدود الاقليمية"
 
-#: server/settings.c:680
+#: server/settings.c:671
 #, fuzzy
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
@@ -4560,21 +4578,21 @@ msgid ""
 "tiles or tiles within range of more than one nation's cities."
 msgstr "إذا خاص."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "الوحدات داخل الحدود لا تسبب تعاسة"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr "إذا كان مفعلا، فإن الوحدات داخل حدودها لا تسبب تعاسة."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "القدرة على الدبلوماسية مع اللاعبيين الآخرين"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4588,11 +4606,11 @@ msgstr ""
 "3 = الدبلوماسية محصورة فقط بين الفرق.\n"
 "4 = الدبلوماسية معطلة للكل."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "أسماء المدن المسموحة"
 
-#: server/settings.c:708
+#: server/settings.c:699
 #, fuzzy
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
@@ -4608,11 +4626,11 @@ msgid ""
 "another nations unless it is a default for their nation also."
 msgstr "هناك مع المدينة مع المدينة مثل."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "تردد ضهور البربري"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4626,19 +4644,19 @@ msgstr ""
 "3 = نسبة متكررة لثورات البرابرة \n"
 "4 = حشود غاضبة، كثيير من البرابرة"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "سنة البداية لظهور البرابرة"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "لن يظهر البرابرة قبل هذه السنة."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "مدة الثورة بالأدوار"
 
-#: server/settings.c:755
+#: server/settings.c:746
 #, fuzzy
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
@@ -4647,11 +4665,11 @@ msgstr ""
 "متى أدوار وضْع :: إطار الفصّ (في خاتم) :: محيط :: خلفيّة :: مكان :: الموسيقى "
 "الموضوعة لقصيدة إلخ :: \"حَضْنَة\" بيض أدوار."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "تشغيل ضباب الحرب"
 
-#: server/settings.c:765
+#: server/settings.c:756
 #, fuzzy
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
@@ -4659,11 +4677,11 @@ msgid ""
 "cities or terrain changes in tiles not observed."
 msgstr "إذا أنت جديد."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "أحسن فرصة للدبلوماسيين والجواسيس للنجاح."
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4671,19 +4689,19 @@ msgid ""
 msgstr ""
 "فرصة عودة جاسوس من مهمة ناجحة والفرصة الاساسية لنجاح الدبلوماسيين والجواسيس."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "السماح بسباق الفضاء"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "إذا كان هذا الخيار موضوعا على 1، فيمكن للاعبيين بناء سفن فضائية."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "أقل عدد مدن للحرب الأهلية"
 
-#: server/settings.c:790
+#: server/settings.c:781
 #, fuzzy
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
@@ -4691,11 +4709,11 @@ msgid ""
 "civil wars are turned off altogether."
 msgstr "أي - الحرف الأوّل في الأبجديّة اللّاتينيّة إذا."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "عدد الأدوار حتى يفقد الاتصال بلاعب"
 
-#: server/settings.c:800
+#: server/settings.c:791
 #, fuzzy
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
@@ -4703,12 +4721,12 @@ msgid ""
 "players cannot meet unless they have an embassy."
 msgstr "اللاعبين أدوار إذا."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "إعادة بناء القصر إذا تم احتلال العاصمة"
 
-#: server/settings.c:811
+#: server/settings.c:802
 #, fuzzy
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
@@ -4717,22 +4735,22 @@ msgid ""
 "ignored."
 msgstr "إذا هذا."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "السماح باستعمال اسماء مدن طبيعية"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr ""
 "إذا كان مفعلا، فستحدد اسماء المدن الافتراضية بناء على التضاريص المحيطة."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "اللاعبون الذين يسمح للمستخدمين أخذ محلهم"
 
-#: server/settings.c:835
+#: server/settings.c:826
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
@@ -4774,11 +4792,11 @@ msgstr ""
 " إتش - الحرف الثامن في اللغة الإنجليزية انساني الوصف هكذا ذكاء اصطناعي أعلى "
 "لا شيئ جهاز السيطرة الإزاحة جهاز السيطرة جهاز السيطرة جهاز السيطرة لا"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "السماح بتفعيل أو تعطيل حالة ال ذ.ا مع الاتصال"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -4786,56 +4804,58 @@ msgstr ""
 "إذا كان محددا ب 1، فتعطل حالة ال ذ.ا عند اتصال لاعب، وتفعل عند قطع اتصال "
 "لاعب."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "السّنة لنهاية اللعبة"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "ستنهي اللعبة عند نهاية السنة المعطاه."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "الحدّ الأعلى من الثواني لكل دور"
 
-#: server/settings.c:885
+#: server/settings.c:876
 #, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "إذا الدور انتهى دوران الصّفر :: النّكرة - شخص عديم الشّأن في مع الإستعمال مع."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "وقت الخروج على الأقل ن ثواني عند تحرك العدو"
 
-#: server/settings.c:896
+#: server/settings.c:889
 #, fuzzy
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr "أيّ وحدات."
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "السماح بوجود مراحل متزامنة للاعبين."
 
-#: server/settings.c:906
+#: server/settings.c:899
 #, fuzzy
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr "إذا صحيح خطأ."
 
-#: server/settings.c:913
+#: server/settings.c:906
 #, fuzzy
 msgid "Seconds to let a client's network connection block"
 msgstr "الثواني"
 
-#: server/settings.c:914
+#: server/settings.c:907
 #, fuzzy
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
@@ -4843,12 +4863,12 @@ msgid ""
 "connections will be automatically disconnected eventually)."
 msgstr "إذا الصّفر :: النّكرة - شخص عديم الشّأن مفصول."
 
-#: server/settings.c:923
+#: server/settings.c:916
 #, fuzzy
 msgid "Max seconds for network buffers to drain"
 msgstr "ماكس"
 
-#: server/settings.c:924
+#: server/settings.c:917
 #, fuzzy
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
@@ -4856,53 +4876,53 @@ msgid ""
 "not wait at all."
 msgstr "الـ الصّفر :: النّكرة - شخص عديم الشّأن."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "الثواني بين PING"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr "سيستطلع ال civserver العملاء بطلب PING كل مرة تنقضي هذه المدة."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "الوقت لقطع اتصال عميل"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr "إذا لم يرد العميل إلى PING خلال هذا الوقت، سيفصل اتصاله."
 
-#: server/settings.c:947
+#: server/settings.c:940
 #, fuzzy
 msgid "Turn-blocking game play mode"
 msgstr "الدور"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
 msgstr "إذا دوران انتهى دوران مفصول."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "نمط لعب ادوار المدة المحددة"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
 msgstr "إذا دوران الدور انتهى."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "محتويات تقرير الديمغرافية"
 
-#: server/settings.c:964
+#: server/settings.c:957
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
@@ -4938,11 +4958,11 @@ msgstr ""
 "\n"
 "."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "عدد الأدوار للحفظ التلقائي"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -4950,11 +4970,11 @@ msgstr ""
 "تحفظ اللعبة تلقائيا عند هذا العدد من الأدوار. يعني الصفر تعطيل الحفظ "
 "التلقائي."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "مستوى ضغط اللعبة المحفوظة"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 #, fuzzy
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
@@ -4962,11 +4982,11 @@ msgid ""
 "this server was not compiled to use zlib."
 msgstr "إذا أكبر إذا."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "بادئة اسم الحفظ التلقائي"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -4974,11 +4994,11 @@ msgstr ""
 "يكون اسم اللعب المحفوظة تلقائيا على شكل \"<البادئة><السنة>.sav\". يحدد هذا "
 "الاعداد جزء <البادئة>."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "السماح بتسجيل احصائيات اللاعب"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 #, fuzzy
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
@@ -4990,7 +5010,7 @@ msgstr "إذا دوران هذه."
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "فشل قراءة الخادم للادخال القياسي.جاري إهمال الادخال."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "الخادم: العنوان سيء: [%s:%d]."
@@ -5119,102 +5139,102 @@ msgstr "فشل حفظ اللعبة ك %s"
 msgid "Game saved as %s"
 msgstr "تم حفظ اللعبة ك %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "اللعبة أصلا شغالة."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr "فقد %s سيطرة cmdlevel عند بداية اللعبة.  استخدم التصويت من اﻵن فصاعدا."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "جاري بدء اللعبة."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "طلب لتقرير مجهول (نوع %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "تحذير: جاري رفض عميل قديم %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "حصلت على حزمة من النوع %d من لاعب ميت أو مراقب"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "الرجاء إختيار اسم بدون فراغات."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "هذه الأمة أصلا مستعملة."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "عند لاعب آخر أصلا هذا الاسم '%s'.  الرجاء اختيار اسم آخر."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "الرجاء اختيار اسم يحتوي على أحرف  ASCII فقط."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "الأمة %s غير متوفرة في هذا السيناريو."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "الأمة %s أصلا مستعملة."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s حاكم %s على %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "جاري الانتظار لبدء اللعبة، %d من %d لاعب جاهز لبدء اللعب."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "تم إضافة %s كلاعب ذكاء اصتناعي من مستوى %s."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "اللاعب %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s يحكم %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "جاري إرسال المعلومات إلى  metaserver [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "انتهت اللعبة..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "جاري اﻵن استقبال اتصالات عملاء جدد."
 
@@ -5235,7 +5255,7 @@ msgstr "(مبهم)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5409,7 +5429,7 @@ msgstr "لا يمكن إزالة اللاعبيين متى بدأت اللعبة
 msgid "Removed player %s from the game."
 msgstr "إزالة اللاعب %s من اللعبة."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "الاسم \"%s\" ممنوع لأسباب أمنية."
@@ -5482,201 +5502,201 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr "لا يمكن زيادة مستوى صلاحيات الأوامر إلى '%s'; لديك فقط '%s' لنفسك."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "تم تحديد مستوى صلاحيات الأوامر ب '%s' للاتصال %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "فشل تحديد مستوي صلاحيات الأوامر ب '%s' للاتصال %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "تم تحديد مستوي صلاحيات الأوامر ب '%s' للاعبين الجدد."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "تم تحديد مستوي صلاحيات الأوامر ب '%s' لأول لاعب يأخذها."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "لا يعني الأمر 'first' شيئا عند سطر أوامر الخادم."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "لديك أصلا مستوى صلاحيات  الأوامر '%s' أو أفضل."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "شخص ما هو أصلا منظم اللعبة."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "اختار الإتّصال %s أن يصير منظم اللعبة."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "باراميتر خاطئ %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 "Usage: timeoutincrease <الدور> <إضافة إلى الدور> <القيمة> <مضاعف القيمة>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "تم تحديد وقت الخروج الديناميكي ب %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "الخيار:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "الوصف:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "الحالة: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "قابل للتغيير"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "غير قابل للتغيير"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "القيمة: %d, الحد الأدنى: 0, الافتراضي: %d, الحد الأعلى: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "القيمة: %d, الحد الأدنى: %d, الافتراضي: %d, الحد الأعلى: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "القيمة: \"%s\", الافتراضي: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "تتوفر التفسيرات لخيارات الخادم التالية:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "لا يوجد تفسير لهذا حتى اﻵن."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "اسم خيار مبهم."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "مشغل الخادم: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "لدى اللاعب '%s' اﻵن مستوى ذ.ا '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "يسيطر ال ذ.ا على %s."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "تحديد مستوى لعب ال ذ.ا الاقتراضي ب '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "هذا الأمر هو للعميل فقط."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "الاستعمال: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "يسمح للاعبيين فقط استخدام أمر away."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "وضع %s في نمط away."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "رجع %s إلى اللعبة."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "آسف، ليس عندك الصلاحية لعرض خيار '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "الخيار مجهول '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "كل الخيارات مع قيم غير افتراضية"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "كل الخيارات"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "الخيارات الحيوية"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "الخيارات الموقعية"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "الخيارات النادر استعمالها"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ يعني أنك تستطيع تغيير الخيار"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= يعني أن الخيار موضوع على القيمة الافتراضية"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s القيمة   (الحد الأدنى,الحد الأعلى)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "الخيار"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "الوصف"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -5684,37 +5704,37 @@ msgstr ""
 "جرب 'show situational' أو 'show rare' لعرض خيارات أخرى.\n"
 "جرب 'show changed' لعرض اعدادات مع قيم غير افتراضية."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "لا تستطيع تغيير الفرق متى بدأت اللعبة."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "باراميتر غير معرف.  الاستعمال: team <اسم اللاعب> <الفريق>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr "الفريق %s غير موجود.  الرجاء إعطاء اسم أو رقم فريق صالح."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "لا تستطيع أن تكون فريق مع بربري."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "اللاعب %s مع فريق %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "باريمترات غير معرفة. الاستعمال: vote yes|no [رقم التصويت]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "لا يستطيع المراقبون التصويت."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -5722,39 +5742,39 @@ msgstr ""
 "تستطيع التصويت فقط في لعبة شغالة.  استعمل 'first' لتصبح منظم اللعبة إذا لم "
 "يكن هناك حاليا أحد."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "التصويت %d \"%s\": %d مع, %d ضد"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "لا يوجد أي تصويت جاري."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "بلا تصويت أخير شرعي."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "يجب أن تكون القيمة رقم صحيح."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "التصويت غير موجود (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "لقد صَوّت ل \"%s\""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "لقد صَوّت ضد \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -5762,421 +5782,449 @@ msgstr ""
 "باريمترات غير معرفة. الاستعمال: debug <diplomacy <اللاعب> | city <س> <ص> | "
 "units <س> <ص> | unit <رقم التعريف> | tech <اللاعب> | timing | info>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "تستطيع فقط استخدام هذا الأمر متى بدأت اللعبة."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "لا يتم تنقييح دبلوماسية %s بعد اﻵن "
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "يتم تنقييح دبلوماسية %s"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "لا يتم تنقييح تكنولوجيا %s بعد اﻵن "
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "يتم تنقييح تكنولوجيا %s"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "يجب أن تكون القيمة 2 &  3 رقم صحيح."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "احداثيات خريطة خاطئة."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "لا توجد مدينة في هذه الاحداثيات."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "لا يتم تنقييح  %s بعد اﻵن "
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "لا يتم تنقييح %s %s بعد اﻵن."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "يتم تنقييح %s %s بعد اﻵن."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "يجب أن تكون القيمة 2  رقم صحيح."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "لا وجود للوحدة %d."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "باريمتر غير معرف.  الاستعمال: set <الخيار> <القيمة>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "لا يُسْمَح لك تغيير هذا الخيار."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "لا يمكن تغيير هذا الاعداد بعد بدء اللعبة."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "يجب أن تكون القيمة رقما صحيحا."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "القيمة خارج المدى (الحد الأدنى: 0, الحد الأعلى: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "الخيار: %s تم تغييره إلى %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "القيمة خارج المدى (الحد الأدنى: %d, الحد الأعلى: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "القيمة النصية طويلة جدا.  طريقة الاستعمال: set <الخيار> <القيمة>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "الخيار: %s تم تغييره إلى  \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "آسف، لا يمكن المراقبة عالميا في هذا اللعبة."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr "آسف، لا يمكن أخد مراقب عالمي. راقبه بدلا من ذلك."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "آسف، لا يمكن أخذ لاعبيين اتسانيين في هذه اللعبة."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "آسف، لا يمكن مراقبة البرابرة في هذه اللعبة."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "آسف، لا يمكن أخد البرابرة في هذه اللعبة."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "آسف، لا يمكن مراقبة اللاعبيين الأموات في هذا اللعبة."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "آسف، لا يمكن أخد لاعبيين أموات في هذه اللعبة."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "آسف، لا يمكن مراقبة لاعبي الذكاء الاصطناعي في هذه اللعبة."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "آسف، لا يمكن أخذ لاعبي الذكاء الاصطناعي في هذه اللعبة."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "آسف، لا يمكن مراقبة لاعبيين اتاس في هذه اللعبة."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "آسف، لا يمكن أخذ لاعبيين اتسانيين في هذه اللعبة."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "آسف، لا يمكن المراقبة في هذه اللعبة."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "آسف، لا يمكن أخذ لاعبيين في هذه اللعبة."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "آسف، لا يمكن أخد لاعبيين متصليين أصلا في هذه اللعبة."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "الاستعمال: observe [اسم الاتصال [اسم اللاعب]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "الاستعمال: observe [اسم اللاعب]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "يسيطر %s أصلا على %s. استعمال 'observe' سيزيل %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "يراقب %s أصلا %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "يقوم %s بالمراقبة أصلا."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "يراقب %s اﻵن %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "يراقب %s اﻵن"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "الاستعمال: take <اسم الاتصال> <اسم اللاعب>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "الاستعمال: take <اسم اللاعب>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "الاستعمال: take [اسم الاتصال] <اسم اللاعب>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "يسيطر %s أصلا على %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "لا يوجد هناك لاعب أو اتصال باسم %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "تم الفصل عن %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "يملك %s اﻵن %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "بربري"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "ذكاء اصطناعي"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "انساني"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "حي"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "ميت"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "ال %s هو غير متصل إلى أي لاعب."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "الاستعمال: detach <اسم الاتصال>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "لا تستطيع فصل اللاعبين اﻵخرين."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "ال %s هو غير متصل إلى أي لاعب."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "يفصل %s عن %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "لا يقوم  %s بالمراقبة بعد اﻵن."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "جاري الفصل عن %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "الاستعمال: load <اسم اللعبة>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "لا يمكن تحميل لعبة عند وجود لعبة أخرى جارية."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "فشل العثور على لعبة محفوظة أو سيناريو بهذا الاسم \"%s\"."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "فشل تحميل ملف محفوظ: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "دليل مجموعة القواعد الحالي هو \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "دليل مجموعة القواعد \"%s\" غير موجود"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "دليل مجموعة القواعد هو أصلا  \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "تم تحديد دليل مجموعة القواعد ب \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "مع السّلامة."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "آسف، لا يُسْمح لك استخدام أوامر الخادم."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr "تحذير: تم تفسير '%s' ك '%s', ولكنه مبهم.  حاول '%shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "الأمر مجهول.  حاول '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "الغى تصويتك القديم تصويتك السابق."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "تصويت جديد (رقم %d) من قبل %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "لا يُسْمح لك استخدام هذا الأمر."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr ""
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "انتهت اللعبة بتعادل."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr "جاري انهاء اللعبة. سيعاد تشغيل الخادم بعد انفصال كل العملاء."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "لا يمكن انهاء اللعبة: لا وجود للعبة جارية."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "استسلم %s وهكذا لا يستطيع الفوز بعد اﻵن."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "لا تستطيع الاستسلام اﻵن."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
+msgstr "لا يوجد لاعبيين كفاية, لن تبدأ اللعبة ."
+
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
 msgstr "لا يوجد لاعبيين كفاية, لن تبدأ اللعبة ."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "لا يوجد لاعبيين كفاية, لن تبدأ اللعبة ."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "كل اللاعبيين جاهزين، جاري بدء اللعبة."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr "لا يمكن بدء اللعبة: تنتظر اللعبة كل العملاء أن ينفصلوا."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "لا يمكن بدء اللعبة: لقد بدأت أصلا."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "جاري قطع الاتصال %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 #, fuzzy
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
@@ -6203,77 +6251,77 @@ msgstr ""
 "\n"
 "\n"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "الأمر:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "الخلاصة: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "المستوى: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "أوامر الخادم التالية متوفرة:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "باريمتر المساعدة '%s' مبهم."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "بلا مطابقة لبراميتر المساعدة '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "خطأ باريمتر القائمة: '%s'.  جرب '%shelp القائمة'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "قائمة اللاعبيين:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<بلا لاعبيين>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "المستخدم %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", ميت"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", مستوى الصعوبة %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", جاهز"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", غير جاهز"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
@@ -6281,21 +6329,21 @@ msgstr[0] " %d اتصال:"
 msgstr[1] "%d اتصالان:"
 msgstr[2] "%d اتصالات:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s من %s (مستوى صلاحية الأمر %s), bufsize=%d ك.ب"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (نمط المراقبة)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "قائمة الفرق:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
@@ -6303,25 +6351,25 @@ msgstr[0] "%2d : '%s' : %d لاعب"
 msgstr[1] "%2d : '%s' : %d لاعبان"
 msgstr[2] "%2d : '%s' : %d لاعبيين"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 لاعب : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "فريق فارغ: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "قائمة الاتصالات إلى الخادم:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<بلا اتصال>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "قائمة السيناريوهات المتوفرة:"
 
@@ -6388,17 +6436,17 @@ msgstr "ينضم علماء عظماء من كل العالم إلى حضارت
 msgid "Technology goal is %s."
 msgstr "الهدف التكنولوجي هو %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "لقد سرقت %s من ال %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "سرق %s ال %s منك!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "سرق %s  %s من ال %s."
@@ -6914,20 +6962,20 @@ msgstr "فشل محاولة بناء أعجوبة ل %s."
 msgid "Your %s has invalid orders."
 msgstr "لدى وحدتك %s أوامر خاطئة."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "كتلة أرض عالية - هذا سيأخد بعض الثواني."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "جاري الرجوع إلى المولد %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "لم يضع المولّد 3 كل الجزر الكبيرة."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "ترك المولّد 3 %li كتل أرضية بدون مكان."
@@ -7013,16 +7061,17 @@ msgstr "ربما يوجد خطأ في التعريف أو صلاحيات خاط
 msgid "Cannot find audio file %s"
 msgstr "فشل العثور على ملف الصوت %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX أدوار"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d ذهب لكل دور"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
@@ -7030,30 +7079,30 @@ msgstr[0] "%3d دور"
 msgstr[1] "%3d دوران"
 msgstr[2] "%3d أدوار"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "مستحيل"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/دور"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
@@ -7061,74 +7110,74 @@ msgstr[0] "%s (%d) %d دور"
 msgstr[1] "%s (%d) %d دوران"
 msgstr[2] "%s (%d) %d أدوار"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "قديم"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "تم البناء"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "أعجوبة عظيمة"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "أعجوبة صغيرة"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/دور"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : المواطنيين\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : مفروض عليه ضريبة من التجارة\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : طريق تجارة مع %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : جاري بناء الأعشار\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : مكافأة من %s (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : النفاية\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : الفوضى\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : مستعمل\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : يضيف إلى\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : مجموع الفائض"
@@ -7241,8 +7290,8 @@ msgid "Best defending units"
 msgstr "أفضل الوحدات الدفاعية"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7422,8 +7471,8 @@ msgstr "?pollution [short]:تلوث"
 msgid "?cma:Governor"
 msgstr "?cma:الحاكم"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7682,19 +7731,19 @@ msgid ""
 "%d times"
 msgstr "السّيّارة"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "مبتدئ"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "سهل"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "عادي"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "صعب"
 
@@ -7702,32 +7751,32 @@ msgstr "صعب"
 msgid "experimental"
 msgstr "تجريبي"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "جاري تشغيل الخادم..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "فشل بدء الخادم."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "يجب عليك بدء هذا يدويا. متأسف..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "لا يمكن الاتصال بالخادم."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "لن نستطيع غالبا تشغيلها من هنا."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 #, fuzzy
 msgid "We have control of the server (command access level hack)"
 msgstr "نحن"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 #, fuzzy
 msgid "We can't take control of server, attempting to kill it."
 msgstr "نحن."
@@ -7832,27 +7881,27 @@ msgstr ""
 "يتطلّب الحد الأدنى من الحجم %d.\n"
 " \n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "يسمح %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "يسمح %s (مع %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr "الأنهار"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "آسف, لا يوجد موضوع مساعدة ل %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -7863,7 +7912,7 @@ msgstr ""
 "تم انشاء هذه الصفحة تلقائيا.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
@@ -7872,58 +7921,58 @@ msgstr ""
 "يتطلّب البناية %s.\n"
 " \n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* سيجعل اكتشاف %s ال %s قديما.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* السماح لكل اللاعبين مع معرفة ال %s ببناء وحدات %s.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* يسمح %s (مع %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* يسمح %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, fuzzy, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* يمكن فقط بنائها مع حكومة %s \n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* يمكن فقط بنائها مع حكومة %s \n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* لا يمكن بنائها في المدن.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* لا مدينة الأصل أبدا.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* خسارة هذه الوحدة تعني خسارة اللعبة!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* يمكن لكل لاعب الحصول على واحدة من نوع هذه الوحدة.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* يحتاج إلى عدد السكان %d للبناء.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, fuzzy, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
@@ -7931,7 +7980,7 @@ msgstr[0] "يمكن أن وحدات"
 msgstr[1] "يمكن أن وحدات"
 msgstr[2] "يمكن أن وحدات"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, fuzzy, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -7939,7 +7988,7 @@ msgstr[0] "يمكن أن وحدات"
 msgstr[1] "يمكن أن وحدات"
 msgstr[2] "يمكن أن وحدات"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, fuzzy, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
@@ -7947,229 +7996,229 @@ msgstr[0] "يمكن أن وحدات"
 msgstr[1] "يمكن أن وحدات"
 msgstr[2] "يمكن أن وحدات"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 #, fuzzy
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr "يمكن أن كوكتيل مانهاتان وحدات"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, fuzzy, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "يمكن أن"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* لا يمكن تسريحها.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, fuzzy, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr "أيار"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* يستطيع بناء مدن جديدة.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, fuzzy, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "يمكن أن الحجم"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* يستطيع بناء طرق وسكك حديدية.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* يستطيع بناء مناجم على المربعات.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* يستطيع بناء قنوات ري على المربعات.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* يستطيع بناء أرض زراعية.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* يستطيع بناء أرض زراعية (إذا كان %s معروفا).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, fuzzy, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "يمكن أن"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* يستطيع بناء القلاع.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* يستطيع بناء القلاع (إذا كان %s معروفا).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* يستطيع بناء القلاع (إذا كان أي من التالى معروفا: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* يستطيع تنظيف التلوث من المربعات.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* يستطيع تنظيف الغبار الذري من المربعات.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* يستطيع تحويل مربعات.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* يستطيع بناء قواعد جوية.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* يستطيع التحصن، فيعطى مكافأة دفاع بمقدار 50%%.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* يستطيع النهب لتدمير البنية التحتية من المربعات.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* يستطيع تنفيذ أوامر دبلوماسية، بالاضافة إلى امكانيات التجسس الخاصة.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* يستطيع تنفيذ أوامر دبلوماسية.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 #, fuzzy
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "سوف مستحيل"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* لا تستطيع رشوته.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* يستطيع مهاجمة وحدات العدو الجوية.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* يكون خفيا إلا قرب وحدة أو مدينة العدو.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* يستطيع فقط مهاجمة الوحدات على مربعات المحيط (بدون هجوم بري ).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 #, fuzzy
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr "يمكن أن الهجوم"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* يمكن اسقاطه بالمظلة من مدينة صديقة (المدى: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 #, fuzzy
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "يصبح الدفاع"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 #, fuzzy
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "التهم"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 #, fuzzy
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "أي - الحرف الأوّل في الأبجديّة اللّاتينيّة وحدات الهجوم"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 #, fuzzy
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "الجعل الهجوم وحدات دوران"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 #, fuzzy
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "هذا وحدات الهجوم"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 #, fuzzy
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "يصبح"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* يهمل آثار جدران المدينة.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, fuzzy, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr "يعمل دوران هذه مستحيل"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 #, fuzzy
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "يصبح"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 #, fuzzy
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "يهمل"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* يهمل مناطق السيطرة.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 #, fuzzy
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "أي - الحرف الأوّل في الأبجديّة اللّاتينيّة وحدات الهجوم"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 #, fuzzy
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "أي - الحرف الأوّل في الأبجديّة اللّاتينيّة وحدات"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* لا يستطيع أبدا الحصول على  وضع الخبير.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 #, fuzzy
 msgid "* May become veteran through training or combat.\n"
 msgstr "أيار خيير"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, fuzzy, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
 "at sea.\n"
 msgstr "يجب أن دوران"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, fuzzy, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "الـ"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* يخفض %s المخاطرة إلى 12%%.\n"
@@ -8178,15 +8227,15 @@ msgstr "* يخفض %s المخاطرة إلى 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " أو "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:، "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, fuzzy, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
@@ -8194,100 +8243,100 @@ msgstr[0] "الوحدة دوران"
 msgstr[1] "الوحدة دوران"
 msgstr[2] "الوحدة دوران"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, fuzzy, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "إذا مع."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, fuzzy, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
 "will require %d bulbs to complete."
 msgstr "إلى الـ."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "لا تستطيع بحث هذه التكنولوجيا."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr "هذا الرقم متغيير حسب أبحاث اللاعبيين اﻵخرين.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, fuzzy, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr "الـ"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* يخفض من فرصة خسارة مراكب في الأمواج العارمة إلى 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* يخفض من فرصة خسارة مراكب في الأمواج العارمة إلى 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* يزيد من التلوث الصادر من عدد السكان.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* يسمح  %s ببناء طرق على مربعات الأنهار.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* يسمح %s ببناء القلاع.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* يسمح %s ببناء القواعد الجوية.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* يسمح %s بتطوير الطرق إلى سكك حديدية.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* يسمح %s بتطوير قنوات الري إلى أرض زراعية.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* لا تستطيع توليد التلوث على هذه التضاريص."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* لا تستطيع بناء المدن على هذه التضاريص."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* الشريط الساحلي لهذه التضاريص خطر."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* هذه التضاريص خطرة لترحال الوحدات عليها."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* لا تستطيع الوحدات الأرضية الترحال على تضاريص محيطية."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "الميزّات:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8299,7 +8348,7 @@ msgstr[0] "عسكري"
 msgstr[1] "عسكري"
 msgstr[2] "عسكري"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, fuzzy, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8307,23 +8356,23 @@ msgid ""
 msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واحد"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, fuzzy, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "أنت عادي"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, fuzzy, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "أنت عادي"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, fuzzy, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "أنت عادي"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 #, fuzzy
 msgid "* You pay no upkeep for your units.\n"
 msgstr "أنت عادي"
@@ -8331,25 +8380,25 @@ msgstr "أنت عادي"
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, fuzzy, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واحد وحدات"
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, fuzzy, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واحد وحدات"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, fuzzy, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "الفرصة"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, fuzzy, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8357,24 +8406,24 @@ msgid ""
 msgstr "الـ مواطنيين الحجم"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, fuzzy, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr "فيما بعد مواطنيين الحجم مواطنيين"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, fuzzy, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr "الـ الذهب"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 #, fuzzy
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "له الذهب"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, fuzzy, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8386,7 +8435,7 @@ msgstr[0] "ملكك كلّ :: كلّ امرئ :: لكل قطعة :: لكل وا
 msgstr[1] "ملكك كلّ :: كلّ امرئ :: لكل قطعة :: لكل واحد وحدات"
 msgstr[2] "ملكك كلّ :: كلّ امرئ :: لكل قطعة :: لكل واحد وحدات"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, fuzzy, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8395,69 +8444,69 @@ msgstr[1] "أي - الحرف الأوّل في الأبجديّة اللّاتي
 msgstr[2] "أي - الحرف الأوّل في الأبجديّة اللّاتينيّة"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, fuzzy, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr "أنت ملكك الحجم"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 #, fuzzy
 msgid "* Your units cannot be bribed.\n"
 msgstr "ملكك"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 #, fuzzy
 msgid "* Your cities cannot be incited.\n"
 msgstr "ملكك"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 #, fuzzy
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr "حكومة أدوار"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 #, fuzzy
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "له"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 #, fuzzy
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr "يسمح"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 #, fuzzy
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr "المباني :: العمارات الذهب"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 #, fuzzy
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "الدفعات"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 #, fuzzy
 msgid "* Has no unhappy citizens.\n"
 msgstr "له"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, fuzzy, c-format
 msgid "* Veteran %s units.\n"
 msgstr "الخبير"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 #, fuzzy
 msgid "* Veteran units.\n"
 msgstr "الخبير"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, fuzzy, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8465,7 +8514,7 @@ msgid ""
 msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واحد"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, fuzzy, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8473,71 +8522,71 @@ msgid ""
 msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واحد مع"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, fuzzy, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واحد مع"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, fuzzy, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* سيخسر انتاج ال %s كمية هائلة.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* سيخسر انتاج ال %s كمية هائلة.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* سيخسر انتاج ال %s بعض الكمية.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* سيخسر انتاج ال %s كمية قليلة.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, fuzzy, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "مع"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, fuzzy, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "مع"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, fuzzy, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr "مع"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* يسمح لك ببناء %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d تعساء"
@@ -8999,16 +9048,16 @@ msgstr "الخادم"
 msgid "Start of turn %d"
 msgstr "بداية الدور %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "نمط ذ.ا هو اﻵن %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "شغال"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "مطفئ"
 
@@ -9039,13 +9088,13 @@ msgstr "?Player:الاسم"
 msgid "Username"
 msgstr "اسم المستخدم"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "علم"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9059,7 +9108,7 @@ msgstr "حدود"
 msgid "Score"
 msgstr "نتيجة"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "فريق"
 
@@ -9092,36 +9141,36 @@ msgstr "?Player_dlg:عاطل"
 msgid "Ping"
 msgstr "بينج"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "لا تستطيع بيع التحسينات."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "تم بيع %d %s ب %d ذهب."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "لا يمكن بيع %s."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "لا تستطيع تسريح الوحدات."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "لا يمكن تسريح %s."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "تم تسريح %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "لا يمكن تسريح %s."
@@ -9445,64 +9494,69 @@ msgstr "الذهب: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "الضريبة: %d الرفاهية: %d العلوم: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "جاري التحرك: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "جاري التحرك: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(انقر لمعلومات أكثر)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s الناس"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "الدور: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "الذهب: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "الدخل الصافي: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "نسب الضريبة: الذهب:%d%% الرفاهية:%d%% العلوم:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "جاري البحث العلمي %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "فرصة الاحترار العالمي: %d%% (%+d%%/دور)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "فرصة الشتاء النووي: %d%% (%+d%%/دور)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "الحكومة: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9511,21 +9565,21 @@ msgstr[1] "%d وحدتان"
 msgstr[2] "%d وحدات"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "الأدوار للهدف: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "الأدوار للهدف: %d إلى %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
@@ -9533,34 +9587,34 @@ msgstr[0] "%d وحدة مختارة"
 msgstr[1] "%d وحدتان مختارتان"
 msgstr[2] "%d وحدات مختارة"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "بلا أي وحدات مختارة."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "الآخرون: %d مدني; %d عسكري"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "الآخرون: %d مدني"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "الآخرون: %d عسكري"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "لا توجد أي وحدة لتطويرها!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "لا يمكن تطوير أي من هذه الوحدات."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9572,73 +9626,73 @@ msgstr[0] "تطوير وحدات الذهب الذهب."
 msgstr[1] "تطوير وحدات الذهب الذهب."
 msgstr[2] "تطوير وحدات الذهب الذهب."
 
-#: client/text.c:887
+#: client/text.c:891
 #, fuzzy
 msgid "Shows your progress in researching the current technology."
 msgstr "المعارض."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "بلا هدف للبحث العلمي."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "يعرض لك تقدم الاحترار العالمي:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "نسبة التلوث: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "فرصة حصول كارثة الاحترار لكل دور: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "يعرض لك تقدم الشتاء النووي:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "نسبة الغبار الذري: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "فرصة حصول كارثة الشتاء لكل دور: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "يظهر لك حكومتك الحالية:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "عدد السكان:      %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "الدعم:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "الطاقة:          %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9647,96 +9701,96 @@ msgstr[1] "الكتلة:            %5d طنان"
 msgstr[2] "الكتلة:            %5d أطنان"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "مدة السفر:     %5.1f سنوات"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "مدة السفر:        غير متوفرة     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "احتمالية النجاح:   %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "سنة الوصول: %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:مطفئ"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02dث"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dد %02dث"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr ""
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr ""
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:فائض"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ملي ثانية"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s من ال %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "المراقب : %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "المباني : "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "لا شيئ.  "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "العجائب:  "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "المدن: %d المجموع, %d فوق حد %d من المدن."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9745,7 +9799,7 @@ msgstr[1] "%d السعادة قبل العقوبة مع"
 msgstr[2] "%d السعادة قبل العقوبة مع"
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9754,16 +9808,16 @@ msgstr[1] "%d مواطنين تعيسيين إضافيين."
 msgstr[2] "%d مواطنين تعيسيين إضافيين."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "الحكم العرفي موجود ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "بدون حد أقصى, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9772,20 +9826,20 @@ msgstr[1] "%d وحدتان الحد الأقصى, "
 msgstr[2] "%d وحدات الحد الأقصى, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d لكل وحدة). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "يمكن للوحدات العسكرية في الميدان أن تسبب التعاسة. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "لا يوجد للوحدات العسكرية تأثير على السعادة. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "الرفاهية: %d المجموع."
@@ -9829,12 +9883,12 @@ msgid ""
 "have a look."
 msgstr "الـ مواطنيين مع أنت."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "لا شيئ"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "مُعدّل"
 
@@ -9885,11 +9939,13 @@ msgid "Ooops..."
 msgstr "لاااا..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "لا يمكن رشوة هذه الوحدة!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -9906,6 +9962,7 @@ msgstr "رشوة وحدة العدو"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -9946,6 +10003,7 @@ msgstr "التقدمات:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "بتقدير الجاسوس"
 
@@ -9970,12 +10028,13 @@ msgstr "_تحسينات:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "انتاج المدينة"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "لا تستطيع التحريض على ثورة في %s."
@@ -9987,6 +10046,7 @@ msgstr "لا يمكن التحريض على ثورة في هذه المدينة!
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10003,6 +10063,7 @@ msgstr "تحريض على الثورة!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10012,6 +10073,7 @@ msgstr ""
 "تحتوي الخرينة على %d ذهب."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10081,11 +10143,13 @@ msgid "Subvert Enemy Unit"
 msgstr "تخريب وحدة العدو"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "يا سيدي، ينتظر الدبلوماسي أوامرك"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "يا سيدي، ينتظر الجاسوس أوامرك"
@@ -10186,7 +10250,7 @@ msgstr "التلوث:"
 msgid "_Overview"
 msgstr "_ملخص"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10211,11 +10275,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d أدوار"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_شراء"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "ا_نتاج"
@@ -10335,7 +10399,7 @@ msgstr "الوحدات المدعومة %d"
 msgid "Present units %d"
 msgstr "الوحدات الموجودة %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "و_سط"
 
@@ -10424,32 +10488,32 @@ msgstr "تغيير اسم المدينة"
 msgid "What should we rename the city to?"
 msgstr "ماذا تريد تغيير اسم المدينة إلى?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "ت_غيير"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "إضافة إلى الأ_ول"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "إضافة _بعد الحالي"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "إضافة إلى اﻵ_خر"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "ا_ختيار"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "ا_ظهار"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10459,13 +10523,13 @@ msgstr "ا_ظهار"
 msgid "Cities"
 msgstr "المدن"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "قافزة"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10474,85 +10538,90 @@ msgstr "قافزة"
 msgid "Improvements"
 msgstr "التحسينات"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "العجائب"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "كل المدن"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "بلا مدن"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "عكس الاختيار"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "جاري بناء الوحدات"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "جاري بناء التحسينات"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "جاري بناء العجائب"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "جاري بناء الوحدة"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "حاري بناء التحسين"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "جاري بناء الأعجوبة"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "المدن الساحلية"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "نفس الجزيرة"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "الوحدات المدعومة"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "الوحدات الموجودة"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "تحسينات المدينة"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "عجائب المدينة"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "الوحدات المتوفرة"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "التحسينات المتوفرة"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "العجائب المتوفرة"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "الكلفة الكلية: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 #, fuzzy
 msgid ""
@@ -10615,126 +10684,126 @@ msgstr "ماذا تريدنا أن نسمي التجهيز المسبق?"
 msgid "Remove this preset?"
 msgstr "هل تريد إزالة هذا التجهيز المسبق?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "الذهاب إلى ال_موقع"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "قافزة المدينة"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "هل تريد ثورة?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "ثورة!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "ماذا تريد أن تنهب"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "اختيار ماذا تريد أن تنهب:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "الوحدة"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "الاسم"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "اختيار الوحدة"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "تجهيز ال_كل"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "تعطيل ال_حراسة"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "الأ_مم:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "أية أمة تريد أن تكون?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "اختيار الأمة"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "أمة عشوائية"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "اختر أمة"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_خصائص"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "ال_قائد:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "أ_نثى"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_ذكر"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "أساليب ال_مدينة:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "ال_مفتاح"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "يجب أن تختار جنسك."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "يجب أن تختار أسلوب مدينتك."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "يجب أن تطبع اسم صحيحا."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "تطوير الوحدة!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -10991,61 +11060,67 @@ msgstr ""
 msgid "Not _ready"
 msgstr "غير _جاهز"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_جاهز"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_بدء"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "أخذ مكان هذا اللاعب"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "اختيار الأ_مة"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_مراقبة"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "_لا تراقب"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<ذ.ا>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<ذ.ا مبتدئ>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<ذ.ا سهل>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<ذ.ا عادي>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<ذ.ا صعب>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "عشوائي"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "متفرج"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "منفصل"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "هل تريد الخروج?"
 
@@ -11964,217 +12039,217 @@ msgstr "الا_تصال بلعبة على الشبكة"
 msgid "Connect to Gaming _Zone"
 msgstr "الاتصال ب_منطقة اللعب"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "كلمات السر غير مطابقة، إدخل كلمة السر."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "اسم الخادم"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "المنفذ"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "اصدار"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "الحالة"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "اللاعبين"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "ملاحظة"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "الشبكة الداخلية"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "إنترنت _Metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "المضيف:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "ال_منفذ:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "اسم ال_مستخدم:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "كلمة ال_سر:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "_تأكيد كلمة السر:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "ا_تصال"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "اسم الاتصال: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "اسم اللاعب: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "المضيف: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "معلومات اللاعب والاتصال"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "معلومات %s "
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "تفعيل أو تعطيل جاهزية اللاعب"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "اختيار الأمة"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "مراقبة هذا اللاعب"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "أخذ مكان هذا اللاعب"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "فصل الاتصال"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "تفعيل أو تعطيل ال ذ.ا للاعب"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "إزالة اللاعب"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "اعطاء صلاحية info"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "اعطاء صلاحية ctrl"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "وضع على %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "عدد اللاعبين (مع ذ.ا):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "مستوى مهارة ال _ذ.ا:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "مجموعة ال_قواعد:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "خيارات اللعبة أكثر..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "السجل"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "التقدير"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "جاهز"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "القائد"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "اختيار اللعبة المحفوظة للتحميل"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "اختيار اللعبة المحفوظة لل_تحميل:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "ال_تصفّح..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "إختيار سيناريو"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "إختيار _سيناريو:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "النوع"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "اختيار الأمة للعب بها:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "اختيار موقع الحفظ"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "حفظ اللعبة"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "ال_لعب المحفوظة:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "اسم ملف الحفظ:"
 
@@ -12210,7 +12285,7 @@ msgstr "?Building:اسم"
 msgid "Count"
 msgstr "العدد"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12455,30 +12530,30 @@ msgstr "_قوائم العمل:"
 msgid "Edit Global _Worklists"
 msgstr "تحرير قوائم ال_عمل العالمية"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "الأدوار"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 #, fuzzy
 msgid "Source _Tasks:"
 msgstr "المصدر المهام:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "إظهاء الأهداف ال_مستقبلية"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 #, fuzzy
 msgid "Target _Worklist:"
 msgstr "الهدف قائمة العمل:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "إ_ضافة قائمة عمل عالمية"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "ت_غيير الانتاج"
 
@@ -12785,8 +12860,8 @@ msgid "City shrinks: %d %s"
 msgstr "انكماش المدينة : %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12893,11 +12968,11 @@ msgstr "تقرير الحامية"
 msgid "Maintenance Report"
 msgstr "تقرير الصيانة"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "قائمة العمل"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13332,21 +13407,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "جاري إستعمال مخرج الفيديو: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "جاري بدء تشغيل العميل"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "جاري الإنتظار لبداية اللعبة"
 
@@ -14651,7 +14726,7 @@ msgstr "أسلوب المدينة:"
 msgid "Unit Selection"
 msgstr "اختيار الوحدة"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "لا يوجد"
 
diff --git a/po/ca.gmo b/po/ca.gmo
index df2c637..846e369 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index 554830a..801dc68 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
-"PO-Revision-Date: 2008-06-03 00:38+0200\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"PO-Revision-Date: 2008-11-25 23:47+0100\n"
 "Last-Translator: Joan Creus <joan.creus at gmail dot com>\n"
 "Language-Team: Català <ca at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -51,22 +51,22 @@ msgstr "Luxes"
 msgid "Science"
 msgstr "Ciència"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "C"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "m"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolet:O"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "C"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "m"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -485,81 +485,81 @@ msgstr "Missatges de connexió/desconnexió"
 msgid "AI Debug messages"
 msgstr "Missatges de depuració d'IA"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "Genocida"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "Bel·ligerant"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "Hostil"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "No cooperativa"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "Intranquil·la"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "Neutral"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "Respectuosa"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "Col·laboració"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "Entusiasta"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "Admiració"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "Veneració"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "Armistici"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "Guerra"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "Alto el foc"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "Pau"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "Aliança"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "Sense contacte"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "Equip"
 
@@ -605,13 +605,13 @@ msgstr "%s unitats"
 msgid "Size %d"
 msgstr "Mida %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Tecnologia del futur %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -623,65 +623,65 @@ msgstr "Tecnologia del futur %d"
 msgid "None"
 msgstr "Cap"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Tecnologia del futur"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Camí"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Irrigació"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Ferrocarril"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Mina"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Contaminació"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Cabana"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Fortificació"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Riu"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Horta"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Base aèria"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Radioactivitat"
 
@@ -787,11 +787,11 @@ msgstr "Míssil nuclear"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " i "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr ", "
 
@@ -952,81 +952,81 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (en total %d cop)"
 msgstr[1] " (en total %d cops)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Argument buit per a \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Falten arguments per a \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d a.C."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d d.C."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH està establert però és buit; s'usarà la ruta per defecte."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "No s'ha pogut llegir el directori de dades %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "La ruta de les dades es pot establir mitjançant la variable d'entorn "
 "FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "La ruta de dades actual és: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "El fitxer \"%s\" és necessari ... s'està avortant!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Error fatal: estàs intentant executar-me com a superusuari!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Utilitza un compte no privilegiat.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "coincidència exacta"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "única coincidència"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "ambigu"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "buit"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "massa llarg"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "no hi ha coincidència"
 
@@ -1055,22 +1055,22 @@ msgstr "Els %s han començat a construir %s a %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s està venent %s (innecessari) per %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (IA)* En mode \"fora\" l'IA no pot signar aquest tractat."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (IA)* Primer trenca l'aliança amb %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (IA)* Primer aturem les hostilitats, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1078,49 +1078,49 @@ msgid ""
 msgstr ""
 "*%s (IA)* Abans, vull que mantinguis l'alto el foc actual una mica més, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 "*%s (IA)* Senzillament, encara no et tinc prou confiança per formar una "
 "aliança, %s"
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (AI)* No conec la ciutat de què parles."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (IA)* Ho sento, compartir la visió amb tu no és segur."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (AI)* Aquest tracte no és gaire bo per nosaltres, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (IA)* Benvingut a la nostra aliança %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (IA)* Sí, tant de bo estiguem units per sempre, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (IA)* Sí, pau en aquest moment!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (IA)* D'acord. Prou d'hostilitats, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1129,23 +1129,23 @@ msgstr ""
 "*%s (AI)* Salut, %s! Podem suggerir un alto el foc mentre ens coneixem una "
 "mica millor?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (IA)* L'espai no serà mai teu. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "*%s (AI)* Ja en tinc prou de les teves tàctiques retorçades! A la guerra!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (IA)* Pau ... en un altre moment."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1154,19 +1154,19 @@ msgstr ""
 "*%s (IA)* Finalment t'he trobat! Et pensaves que podries sortir impune de "
 "tots els teus crims?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 "*%s (AI)* Les teves hostilitats encobertes et fan responsable d'aquesta "
 "guerra!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (IA)* L'agressió contra %s ha estat la teva última errada!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1181,7 +1181,7 @@ msgstr[1] ""
 "*%s (AI)* Engegarem una guerra total contra %s en %d torns per aturar el "
 "llançament de la nau espacial."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1190,7 +1190,7 @@ msgstr ""
 "*%s (AI)* Esperarem la vostra ajuda en aquest assumpte. Llarga vida a la "
 "nostra gloriosa aliança!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1209,7 +1209,7 @@ msgstr[1] ""
 "seu. Contestarem amb la força en %d torns i esperem que honoris la teva "
 "aliança amb nosaltres i facis el mateix!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1224,13 +1224,13 @@ msgstr[1] ""
 "*%s (AI)* Tenim la intenció de robar i saquejar la rica civilització de %s. "
 "Declarem la guerra en %d torns."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr "*%s (AI)* Si vols compartir el botí, apunta't a la festa!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1245,14 +1245,14 @@ msgstr[1] ""
 "*%s (AI)* Ja en tenim prou del %s. Ha arribat el moment de destruir aquesta "
 "penosa civilització. Declarem la guerra en %d torns."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (AI)* Com a gloriosos aliats que sou, esperem la vostra ajuda en aquesta "
 "guerra."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1267,7 +1267,7 @@ msgstr[1] ""
 "*%s (AI)* Farem honor a la nostra aliança i declararem la guerra a %s en %d "
 "torns.  Aguanteu, que venim!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1282,7 +1282,7 @@ msgstr[1] ""
 "*%s (AI)* Farem honor a la nostra aliança amb %s i declararem la guerra a %s "
 "en %d torns.  Esperem que facis el mateix."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1291,7 +1291,7 @@ msgstr ""
 "*%s (IA)* L'intent de conquerir l'espai pel teu compte traeix les teves "
 "intencions reals, no en vull saber res més de la nostra aliança!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1300,7 +1300,7 @@ msgstr ""
 "*%s (IA)* El teu intent de dominar unilateralment l'espai exterior és del "
 "tot ofensiu."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1309,12 +1309,12 @@ msgstr ""
 "*%s (IA)* Si no deixes de construir la nau espacial, hauré de prendre "
 "mesures!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr "*%s (IA)* Ho sento, compartir la visió amb tu ja no és segur."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1323,7 +1323,7 @@ msgstr ""
 "*%s (IA)* Salutacions al nostre indiscutible aliat, apel·lem a tu per a "
 "destruir el nostre enemic, %s."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1332,7 +1332,7 @@ msgstr ""
 "*%s (IA)* Salutacions aliat, veig que encara no has declarat la guerra al "
 "nostre enemic %s. Com és que t'he de recordar les teves promeses?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1343,7 +1343,7 @@ msgstr ""
 "amb el nostre enemic mortal, %s! Això és inacceptable; la nostra aliança "
 "s'ha acabat!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1352,13 +1352,13 @@ msgstr ""
 "*%s (IA)* Salutacions amic, ens permets suggerir de fer causa comuna i unir-"
 "nos en aliança?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "*%s (IA)* Salutacions veí, ens permets suggerir relacions més pacífiques?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1367,7 +1367,7 @@ msgstr ""
 "*%s (IA)* Ens estem cansant de tant vessament de sang. Ens permets suggerir "
 "un atur de les hostilitats?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1377,59 +1377,64 @@ msgstr ""
 "Honora la nostra gloriosa aliança i el teu nom no serà mai oblidat!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, c-format
 msgid "Auth option \"%s\":"
 msgstr "Opció autent. \"%s\":"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr "no és al fitxer de configuració (usant el defecte)"
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr " (defecte)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr " (config)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr " (fixada)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr "Valor il·legal per al port d'autenticació: \"%s\""
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "El nom de fitxer \"%s\" de configuració d'autenticació no és permès!"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr ""
 "No s'ha pogut carregar el fitxer de configuració d'autenticació \"%s\"!"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 "Atenció: ja s'ha usat el nom de convidat '%s', renomenant a usuari '%s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "No es permeten convidats en aquest servidor. Ho sentim."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s s'ha refusat. No es permeten convidats."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1438,7 +1443,7 @@ msgstr ""
 "Hi ha hagut un error en llegir la base de dades de l'usuari, accedint com a "
 "connexió de convidat '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1446,41 +1451,41 @@ msgstr ""
 "Hi ha hagut un error en llegir la base de dades de l'usuari i els accessos "
 "de convidat no estan permesos. Ho sento."
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s s'ha refusat: error de base de dades i convidats no permesos."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Entrar contrasenya per a %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Entrar una contrasenya nova (i recordar-la)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Aquest servidor només accepta usuaris preregistrats. Ho sento."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s ha estat refusat: Només es permeten usuaris preregistrats."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Ho sento, massa intents erronis ..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 "%s ha estat refusat: massa verificacions de contrasenya errònies per usuari "
 "nou."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1488,33 +1493,33 @@ msgstr ""
 "Atenció: Hi ha hagut un error en guardar a la base de dades. Es continua "
 "però les teves estadístiques no es conservaran."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s s'ha refusat. Massa intents erronis de contrasenya."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "La teva contrasenya és incorrecta. Torna-ho a provar."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Ho sento, temps de connexió excedit..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 "%s ha estat refusat: Temps de connexió excedit esperant la contrasenya."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 "La teva contrasenya és massa curta, la longitud mínima és %d. Torna a provar-"
 "ho."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2313,9 +2318,7 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Un jugador amb nivell d'accés info que emeti una comanda de nivell de "
 "control engega una nova votació per la comanda. La comanda '/vote' seguida "
@@ -2324,10 +2327,9 @@ msgstr ""
 "comanda. Només pots suggerir una votació cada vegada. La votació s'aprovarà "
 "immediatament si més de la meitat dels jugadors hi voten a favor, o es "
 "rebutjarà immediatament si almenys la meitat dels jugadors hi voten en "
-"contra. Si passa un torn sencer, la votació pot aprovar-se de totes maneres "
-"si ningú no hi vota en contra."
+"contra."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2335,11 +2337,11 @@ msgstr ""
 "debug [ player <jugador> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<jugador> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Activar o desactivar depuració d'IA de l'entitat donada."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2347,23 +2349,23 @@ msgstr ""
 "Imprimir informació de depuració d'IA d'una entitat determinada i activar/"
 "desactivar la sortida de depuració contínua d'aquesta entitat."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <nom-opció> <valor>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Estableix una opció del servidor."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <jugador> [equip]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Canvia, afegeix o suprimeix l'afiliació d'un jugador a un equip."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2376,15 +2378,15 @@ msgstr ""
 "compartida i ambaixades, i que lluiten plegats per a aconseguir una victòria "
 "d'equip amb puntuacions individuals promitjades."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <directori>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Escollir un nou directori de jocs de regles o modificacions (modpack)."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2393,15 +2395,15 @@ msgstr ""
 "sense cap argument mostra el conjunt de regles seleccionat actualment."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <meta-línia>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Estableix la línia d'informació al metaservidor."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2415,19 +2417,19 @@ msgstr ""
 "de missatges generats automàticament, si és que està disponible."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <meta-línia>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Estableix la línia de pegats al metaservidor."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Controla la connexió amb el metaservidor."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2438,33 +2440,33 @@ msgstr ""
 "'metaconnection up' o 'metac u' aixeca la connexió amb el metaservidor."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <adreça>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Estableix l'adreça (URL) del metaservidor al qual informar."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <nom-jugador>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Activa / Desactiva la IA per a un jugador."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [nom-connexió] <nom-jugador>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Prendre el lloc d'un jugador a la partida."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2479,15 +2481,15 @@ msgstr ""
 "i s'assigna a la connexió."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [nom-connexió] [nom-jugador]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Observar un jugador o tota la partida."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2502,15 +2504,15 @@ msgstr ""
 "associada a un observador global."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <nom-connexió>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "desconnectar d'un jugador."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2519,21 +2521,21 @@ msgstr ""
 "d'altres connexions es desconnectin d'un jugador."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <nom-jugador>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Crea un jugador IA amb el nom donat."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 "La comanda 'create' només està disponible abans que la partida hagi començat."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2541,16 +2543,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Et deixa en mode 'no hi sóc'. La IA es cuidarà de tu."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "La IA governarà la teva nació però fent canvis mínims."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2558,11 +2560,11 @@ msgstr ""
 "novice\n"
 "novice <nom-jugador>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Estableix un o tots el jugadors d'IA a 'principiant'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2574,7 +2576,7 @@ msgstr ""
 "donat."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2582,11 +2584,11 @@ msgstr ""
 "easy\n"
 "easy <nom-jugador>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Estableix un o tots el jugadors a 'fàcil'."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2597,7 +2599,7 @@ msgstr ""
 "un argument, només estableix la dificultat per al jugador donat."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2605,11 +2607,11 @@ msgstr ""
 "normal\n"
 "normal <nom-jugador>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Estableix un o tots el jugadors a 'normal'."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2620,7 +2622,7 @@ msgstr ""
 "un argument, només estableix la dificultat per al jugador donat."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2628,11 +2630,11 @@ msgstr ""
 "hard\n"
 "hard <nom-jugador>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Estableix un o tots el jugadors a 'difícil'."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2643,7 +2645,7 @@ msgstr ""
 "Amb un argument, només estableix la dificultat per al jugador donat."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2651,11 +2653,11 @@ msgstr ""
 "experimental\n"
 "experimental <nom-jugador>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Estableix un o tots el jugadors a 'experimental'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2669,7 +2671,7 @@ msgstr ""
 "normals, aquesta opció no té efecte."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2683,11 +2685,11 @@ msgstr ""
 "cmdlevel <nivell> first\n"
 "cmdlevel <nivell> <nom-connexió>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Consultar o fixar el nivell d'accés a les comandes."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2729,22 +2731,22 @@ msgstr ""
 "persona en qui no es confia. S'ha de tenir en compte que aquesta comanda ara "
 "accepta noms de connexions i no noms de jugadors."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 "Si no n'hi ha cap, convertir-se en l'organitzador de la partida amb permisos "
 "augmentats."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <torn> <inctorn> <valor> <valormult>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Vegeu \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2756,24 +2758,24 @@ msgstr ""
 "predeterminats són 0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Acabar la partida immediatament amb un empat."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "surrender"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Donar per perduda la partida."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2783,15 +2785,15 @@ msgstr ""
 "s'acaba."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <nom-jugador>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Elimina completament el jugador de la partida."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2800,7 +2802,7 @@ msgstr ""
 "unitats, etc.  Usa amb compte!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2808,11 +2810,11 @@ msgstr ""
 "save\n"
 "save <nom-fitxer>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Desa la partida en un fitxer."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2830,7 +2832,7 @@ msgstr ""
 "i usar la comanda 'start' un cop els jugadors s'hagin reconnectat."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2838,11 +2840,11 @@ msgstr ""
 "load\n"
 "load <nom-fitxer>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Carrega la partida d'un fitxer."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2851,28 +2853,28 @@ msgstr ""
 "jugadors, conjunts de regles i opcions de servidor.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <nom-fitxer>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Processa comandes del servidor des de fitxer."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <nom-fitxer>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Desa la configuració actual com a comandes del servidor en un fitxer."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Commutar sortida servidor entre estil RFC i estil normal."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Simplement retorna l'identificador del servidor"
 
@@ -3386,26 +3388,35 @@ msgstr "Has causat un incident en incitar una revolta a %s."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s han causat un incident en incitar una revolta a %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "Les unitats marines d'inici encara no estan suportades. Ningú no obté %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Any: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr "El temps màxim per torn ha superat el valor màxim, el poso al màxim."
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "El temps màxim per torn no pot ser negatiu, el poso a zero."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr "No s'ha pogut crear el directori temporal per la partida GGZ.\n"
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr "No s'ha pogut entrar al directori temporal del servidor %s.\n"
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Només el client GGZ ha de cridar civclient en mode ggz!\n"
 
@@ -3448,28 +3459,28 @@ msgstr "No hi ha cap connexió amb el nom %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "No hi ha cap connexió ni jugador amb el nom %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Ha ocorregut l'escalfament global!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 "Les costes s'han inundat i grans quantitats de prats s'han desertitzat."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Ha ocorregut l'hivern nuclear!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Les àrees humides s'han assecat i grans quantitats de prats s'han convertit "
 "en tundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3480,7 +3491,7 @@ msgstr ""
 "      Els treballadors s'apleguen espontàniament i instal·len ferrocarril en "
 "totes les ciutats."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3491,12 +3502,12 @@ msgstr ""
 "      Els treballadors s'apleguen espontàniament i instal·len ferrocarril en "
 "totes les ciutats."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "S'ha mogut el teu %s degut a un canvi de terreny."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Desmantellat el teu %s degut a un canvi de terreny."
@@ -3559,27 +3570,27 @@ msgstr "Revolució: retorn a l'anarquia."
 msgid "You should choose a new government from the government menu."
 msgstr "Hauries de triar un nou govern del menú de governs."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "La taxa d'impostos excedeix la taxa màxima per %s; s'ha ajustat."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "La taxa de ciència excedeix la taxa màxima per %s; s'ha ajustat."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "La taxa de luxes excedeix la taxa màxima per %s; s'ha ajustat."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s ens ha retirat la visió compartida!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3588,14 +3599,14 @@ msgstr ""
 "El senat no et permetrà trencar el tractat amb els %s. Has de dissoldre el "
 "senat, o bé esperar un moment més propici."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 "El senat aprova la teva moció degut a les constants provocacions dels %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3604,12 +3615,12 @@ msgstr ""
 "El senat refusa de trencar el tractat amb els %s, però no tens cap problema "
 "per trobar un senat nou."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "L'estat diplomàtic entre %s i %s ara és %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3618,14 +3629,14 @@ msgstr ""
 " %s ha cancel·lat el tractat diplomàtic! L'estat diplomàtic entre els %s i "
 "els %s ara és %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 "%s ha atacat el teu aliat %s! Cancel·les la teva aliança amb l'agressor."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3634,26 +3645,26 @@ msgstr ""
 "El teu company d'equip %s ha declarat la guerra a %s. Estàs obligat a "
 "cancel·lar l'aliança amb %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "S'elimina el jugador %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Has estat eliminat de la partida!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s ha estat eliminat de la partida."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Has contactat amb els %s, governats per %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3661,17 +3672,17 @@ msgstr ""
 "%s i %s fan una cimera i van directament a la guerra. Cancel·les la teva "
 "aliança amb tots dos."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "No s'ha pogut posar els %s en guerra civil - massa jugadors."
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "No s'ha pogut posar els %s en guerra civil - no queden nacions."
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3680,12 +3691,12 @@ msgstr ""
 "La teva nació es veu abocada a una guerra civil, %s és declarat el líder de "
 "la part rebel."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s declara la seva lleialtat a %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3923,21 +3934,21 @@ msgstr "er"
 msgid "th"
 msgstr "è"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "La cadena de demografia conté caràcters invàlids. Intenta \"help demography"
 "\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Informe demogràfic:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Ho sento, l'informe demogràfic no està disponible."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "La %s dels %s (%s)"
@@ -3948,12 +3959,12 @@ msgstr "La %s dels %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "No s'ha pogut trobar un fitxer de regles \"%s.%s\" llegible."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 "No hi ha cap nació de bàrbars als jocs de regles, com a mínim en cal una!"
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "S'està carregant el conjunt de regles"
 
@@ -3968,7 +3979,7 @@ msgstr ""
 "partides desades antigues o pot indicar que el fitxer desat no és correcte. "
 "Continua coneixent el risc."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "La partida desada és massa vella, cal la versió 1.9.0 com a mínim."
 
@@ -3990,13 +4001,13 @@ msgstr ""
 "regles. Usant '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr "%s tenia una nació no vàlida; canviant a %s."
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4033,7 +4044,7 @@ msgstr "Intern"
 msgid "Networking"
 msgstr "Xarxa"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Tot"
@@ -4054,7 +4065,7 @@ msgstr "Rar"
 msgid "Changed"
 msgstr "Canviat"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4062,7 +4073,7 @@ msgstr ""
 "La cadena de 'Permisos per prendre' conté caràcters invàlids.\n"
 "Intenta \"help allowtake\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4070,7 +4081,7 @@ msgstr ""
 "La cadena d'unitats inicials conté caràcters invàlids.\n"
 "Intenta \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4079,15 +4090,15 @@ msgstr ""
 "La cadena d'unitats inicials no conté almenys un fundador de ciutats. "
 "Intenta \"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr "L'any final no pot ser abans que l'any actual."
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "No es pot canviar maxplayers en mode GGZ."
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
@@ -4095,11 +4106,15 @@ msgstr ""
 "El nombre de jugadors es més gran que el valor sol·licitat;\n"
 "es manté el valor anterior."
 
-#: server/settings.c:236
+#: server/settings.c:181
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "No està permès de posar temporitzadors a valors de menys de 30 segons"
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Mida de mapa (en milers de caselles)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4109,12 +4124,12 @@ msgstr ""
 "  size = 4 és un mapa normal de 4.000 caselles (per defecte)\n"
 "  size = 20 és un mapa enorme de 20.000 caselles."
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Índex de topologia del mapa"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4183,11 +4198,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/            \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Mètode usat per generar el mapa"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4208,11 +4223,11 @@ msgstr ""
 "s'escollirà un valor de startpos segons el generador. Veure la descripció de "
 "\"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Mètode usat per triar les posicions d'inici"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4234,37 +4249,37 @@ msgstr ""
 "Nota: els generadors intenten crear el número adequat de continents segons "
 "l'elecció de la posició d'inici i el nombre de jugadors."
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Presència o absència d'illes 1x1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = no hi ha illes 1x1; 1 = algunes illes 1x1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Si els pols són continents separats"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = els continents poden connectar amb els pols; 1 = els pols estaran "
 "normalmentseparats"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Tot el mapa és temperat"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = planeta normal semblant a la Terra; 1 = tot el planeta és temperat"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Temperatura mitjana del planeta"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4297,22 +4312,22 @@ msgstr ""
 "\n"
 "0 vol dir un planeta molt fred amb grans zones polars i sense tròpics. "
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Percentatge del mapa que és terra"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 "Aquesta variable dóna el percentatge aproximat del mapa que serà terra."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Quantitat de turons/muntanyes"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4320,11 +4335,11 @@ msgstr ""
 "Valors petits donen mapes plans, mentre que valors més grans donen més "
 "turons i muntanyes."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Quantitat d'aigua a les terres"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4332,11 +4347,11 @@ msgstr ""
 "Valors petits signifiquen molta terra seca i desèrtica; valors més alts "
 "donen un mapa més humit amb més aiguamolls, jungles i rius."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Llavor aleatòria de generació de mapa"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4346,11 +4361,11 @@ msgstr ""
 "es triarà una llavor en funció del temps, així s'obté un mapa aleatori. "
 "Aquesta configuració sol ser interessant només quan s'està depurant el joc."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Llavor aleatòria de la partida"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4358,11 +4373,11 @@ msgstr ""
 "Per a zero (predeterminat) es triarà una llavor en funció del temps. Aquesta "
 "configuració només sol ser interessant per depurar el joc."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Quantitat de caselles de recursos \"especials\" "
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4370,11 +4385,11 @@ msgstr ""
 "Els recursos especials milloren els tipus de terreny bàsics on es troben. "
 "L'escala de la variable del servidor és parts per miler."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Quantitat de cabanes (llogarrets indígenes)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4383,23 +4398,23 @@ msgstr ""
 "mapa. Les cabanes són petits pobles tribals que poden ser investigats per "
 "les unitats."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Nombre mínim de jugadors"
 
-#: server/settings.c:419
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
-"Ha d'haver-hi aquest nombre de jugadors com a mínim (humans connectats o IA) "
+"Ha d'haver-hi aquest nombre de jugadors com a mínim (humans connectats) "
 "abans que la partida no pugui començar."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Nombre màxim de jugadors"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4409,11 +4424,11 @@ msgstr ""
 "aquest nombre de jugadors connectats abans de començar la partida, qualsevol "
 "nou jugador que s'intenti connectar serà refusat."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Nombre total de jugadors (comptant els IA)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4421,11 +4436,11 @@ msgstr ""
 "Si té un valor positiu, es crearan o destruiran automàticament jugadors IA "
 "per mantenir el nombre total de jugadors en aquest valor."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Llista de les unitats inicials dels jugadors"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4453,28 +4468,28 @@ msgstr ""
 "    a   = Unitat d'atac ràpida (p.ex., Genets)\n"
 "    A   = Unitat d'atac forta (p.ex., Catapulta)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Àrea on se situen les unitats inicials"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "És el radi dins del qual es dispersen les unitats inicials"
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Or inicial per a cada jugador"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 "Al principi de la partida, cada jugador rep aquesta quantitat de peces d'or."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Nombre de tecnologies inicials per jugador"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4486,11 +4501,11 @@ msgstr ""
 "de tech_cost_style del joc de regles, un valor alt per techlevel pot fer que "
 "les següents tecnologies siguin molt i molt cares."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Percentatge multiplicador de cost de tecnologia"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4501,11 +4516,11 @@ msgstr ""
 "quantitat (com a percentatge). Els costos base de tecnologia es determinen "
 "pel joc de regles (ruleset) o per altres opcions del joc."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Percentatge de penalització en canviar de tecnologia"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4515,11 +4530,11 @@ msgstr ""
 "positius, llavors perds aquest percentatge dels punts d'investigació. Això "
 "no s'aplica si acabes de descobrir una tecnologia en aquest torn mateix."
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Penalització quan s'adquireix tecnologia o or en un tractat"
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4532,11 +4547,11 @@ msgstr ""
 "negatius si aquest valor és diferent de zero. També s'aplica a les "
 "transferències d'or en tractats diplomàtics."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Penalització quan s'adquireix tecnologia d'una conquesta"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4547,11 +4562,11 @@ msgstr ""
 "percentatge al cost d'investigar una nova tecnologia. Pots acabar amb punts "
 "d'investigació negatius si aquest valor és diferent de zero."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Penalització quan s'adquireix una tecnologia de franc"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4565,11 +4580,11 @@ msgstr ""
 "d'aplicar aquest percentatge al cost d'investigar una nova tecnologia. Pots "
 "acabar amb punts d'investigació negatius si aquest factor no és zero."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Menjar necessari perquè una ciutat creixi"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4579,11 +4594,11 @@ msgstr ""
 "creixi. Aquest valor es multiplica per un altre factor que prové del joc de "
 "regles (ruleset) i depèn de la mida de la ciutat."
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr "Percentatge de menjar que es perd quan es necessita un edifici"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4593,11 +4608,11 @@ msgstr ""
 "l'Aqüeducte (o Clavegueram), perd aquest percentatge del seu caixetí de "
 "menjar (o la meitat d'aquesta quantitat si disposa de Graner)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Percentatge multiplicador per costos de producció"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4605,11 +4620,11 @@ msgstr ""
 "Això afecta la velocitat amb què es poden produir unitats i edificis. Els "
 "costos base es multipliquen per aquest valor (com a percentatge)."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Mida mínima de ciutat per aconseguir comerç complet"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4623,11 +4638,11 @@ msgstr ""
 "mida-comerç-complet (fulltradesize). Vegeu també mida-sense-comerç "
 "(notradesize)."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Mida màxima de ciutat sense comerç"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4638,11 +4653,11 @@ msgstr ""
 "sense-comerç (notradesize) i fins a mida-comerç-complet (fulltradesize). "
 "Vegeu també mida-comerç-complet (fulltradesize)."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Mida de ciutat a partir de la qual hi ha gent descontenta"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4651,11 +4666,11 @@ msgstr ""
 "unhappysize estan contents, els següents a partir d'aquí estan descontents. "
 "Veure també cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Nombre de ciutats perquè el descontent sigui més alt"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4667,11 +4682,11 @@ msgstr ""
 "ajustaments; vegeu també unhappysize. Això assumeix el govern en Democràcia, "
 "per a altres formes de govern l'efecte té lloc amb menys nombre de ciutats."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Distancia mínima entre ciutats"
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4684,11 +4699,11 @@ msgstr ""
 "direcció. Si s'estableix a 0 (el valor predeterminat), es fa servir el que "
 "digui el conjunt de regles actual."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Nombre de torns entre els efectes d'estar \"en festa\""
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4696,11 +4711,11 @@ msgstr ""
 "Estableix el nombre de torns entre creixements per estar en Festa. Si es "
 "fixa a n una ciutat en Festa creixerà cada n+1 torns."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Probabilitat de destrucció d'edificació conquerida"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4708,11 +4723,11 @@ msgstr ""
 "Quan un jugador conquereix una ciutat, cada edifici de la ciutat té aquesta "
 "probabilitat de ser destruït."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Probabilitat de moure's a la casella després d'un atac."
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4726,11 +4741,11 @@ msgstr ""
 "la casella). Si s'estableix a un valor entre 0 i 100, s'utilitzarà com a "
 "probabilitat d' \"ocupar\" territori."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Engegar/apagar autoatac a la part del servidor"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4738,11 +4753,11 @@ msgstr ""
 "Si està en \"on\", les unitats que encara tinguin moviments consideraran "
 "automàticament atacar les unitats enemigues que es moguin pel seu costat."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Reduir la població de la ciutat després d'un atac."
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4759,11 +4774,11 @@ msgstr ""
 "  4 = heli\n"
 "  8 = aire"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Radi de fronteres nacionals"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4774,11 +4789,11 @@ msgstr ""
 "regles especials per caselles d'oceà o caselles que estiguin dins del radi "
 "de ciutats de més d'una nació."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Les unitats dins de les fronteres no causen infelicitat"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4786,11 +4801,11 @@ msgstr ""
 "Si això està fixat, les unitats no causaran infelicitat quan estiguin dins "
 "de les teves pròpies fronteres."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Capacitat de exercir diplomàcia amb altres jugadors"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4804,11 +4819,11 @@ msgstr ""
 "3 = la diplomàcia està restringida als equips.\n"
 "4 = la diplomàcia s'inhabilita per tothom."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Noms de ciutat permesos"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4835,11 +4850,11 @@ msgstr ""
 "predeterminat d'altres nacions a no ser que també sigui un nom predeterminat "
 "per la seva nació."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Freqüència d'aparició de bàrbars"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4853,19 +4868,19 @@ msgstr ""
 "3 - aparició freqüent de bàrbars\n"
 "4 - hordes furioses, molts bàrbars"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Any d'aparició de bàrbars"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Els bàrbars no apareixeran abans d'aquest any."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Llargada en torns d'una revolució"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4874,11 +4889,11 @@ msgstr ""
 "quantitat de torns. Fixar aquest valor a 0 donarà una llargada aleatòria de "
 "1-6 torns."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Si s'activa la penombra de guerra"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4888,11 +4903,11 @@ msgstr ""
 "dintre del rang de visió de les teves pròpies unitats i ciutats. No veuràs "
 "ni les noves ciutats ni canvis de terreny a les caselles que no observis."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Probabilitat base d'èxit per diplomàtics i espies"
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4901,19 +4916,19 @@ msgstr ""
 "La probabilitat que un espia torni d'una missió reeixida i la probabilitat "
 "bàsica d'èxit per diplomàtics i espies."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Si es permet la carrera espacial"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Si aquesta opció és 1, els jugadors poden construir naus espacials. "
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Nombre mínim de ciutats per a la guerra civil"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4923,11 +4938,11 @@ msgstr ""
 "ciutats i la capital d'aquest jugador és capturada. Si aquesta opció "
 "s'estableix al seu valor màxim, es desactiva totalment la guerra civil."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Torns fins que es perd el contacte amb un jugador."
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4937,11 +4952,11 @@ msgstr ""
 "de l'últim encontre entre unitats, encara que no tinguin ambaixada. Si es "
 "fixa a zero els jugadors no poden fer una cimera si no tenen una ambaixada."
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Reconstruir el palau si la capital és conquerida."
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4953,11 +4968,11 @@ msgstr ""
 "significatiu, perquè el requeriment de tecnologia per construir un Palau "
 "serà ignorat."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Si s'usen noms naturals per a les ciutats"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -4965,11 +4980,11 @@ msgstr ""
 "Si està activada, els noms de les ciutats per defecte es basaran en el "
 "terreny dels voltants."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Jugadors que els usuaris poden prendre"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -5036,11 +5051,11 @@ msgstr ""
 "4 = No es permet controlador, es permeten observadors,\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Si l'estat d'IA canvia amb la connexió"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5048,36 +5063,39 @@ msgstr ""
 "Si és 1, l'estat d'IA es desactiva quan un jugador es connecta i s'activa "
 "quan un jugador es desconnecta."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Any que la partida s'acaba"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "La partida s'acabarà al final de l'any donat."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Nombre màxim de segons per torn"
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
-msgstr ""
-"Quan expira aquest temps, encara que no tots els jugadors hagin premut "
-"\"Acabar el torn\", el torn s'acaba automàticament. Zero significa que el "
-"temps no s'esgota. En servidors compilats amb depuració, un temps d'1 fixa "
-"la modalitat de prova automàtica. Usa'l amb la comanda \"timeoutincrease\" "
-"per a tenir un temporitzador dinàmic."
-
-#: server/settings.c:895
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
+msgstr ""
+"Encara que no tots els jugadors hagin premut \"Acabar el torn\" en passar "
+"aquest temps, el torn s'acaba automàticament. Zero significa que no hi ha "
+"temps màxim. En servidors compilats amb depuració, un temps de -1 fixa la "
+"modalitat de prova automàtica. Només les connexions amb nivell d'accés \"hack"
+"\" poden fixar un temps màxim de menys de 30 segons. Usa'l juntament amb la "
+"comanda \"timeoutincrease\" per a tenir un temporitzador dinàmic."
+
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "Esperar almenys n segons quan l'enemic s'ha mogut."
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
@@ -5085,11 +5103,11 @@ msgstr ""
 "Cada vegada que una unitat es mou quan està a la vista d'un jugador enemic, "
 "el temps restant augmenta fins aquest valor."
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Si es tenen fases de jugador simultànies."
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5097,11 +5115,11 @@ msgstr ""
 "Si està a cert, les fases de moviment de tots els jugadors ocorreran de "
 "forma simultània; si està a fals, els jugadors alternaran el moviment."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Segons que es permet que una connexió de client estigui bloquejada"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5111,11 +5129,11 @@ msgstr ""
 "valor, llavors es tanca la connexió. Zero significa que no hi ha cap temps "
 "límit (encara que al final les connexions es desconnectaran igualment)"
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Segons màxims per a buidar els búfers de xarxa."
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5125,30 +5143,30 @@ msgstr ""
 "els búfers de xarxa de les connexions dels clients es desbloquegin. Zero "
 "significa que el servidor no esperarà gens."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Segons entre PINGs"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr "El servidor enviarà PINGs als clients cada cop que passi aquest temps."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Temps per tallar a un client"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr "Si un client no respon a un PING en aquest temps, se'l desconnectarà."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Modalitat de joc amb bloqueig de torn"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5156,11 +5174,11 @@ msgstr ""
 "Si es fixa a 1, el torn del joc no avança fins que tots els jugadors han "
 "acabat llur torn, incloent-hi els jugadors desconnectats."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Modalitat de joc amb torns de durada fixa"
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
@@ -5168,11 +5186,11 @@ msgstr ""
 "Si es fixa a 1, el torn del joc no avançarà fins que expiri el temps fixat, "
 "encara que tots els jugadors hagin clicat a \"Acabar el torn\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Què hi ha a l'informe demogràfic"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5212,11 +5230,11 @@ msgstr ""
 "    b = mostrar columna \"millor nació\" \n"
 "(L'ordre d'aquests caràcters no és important, però majúscules/minúscules sí)."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Torns per desar automàticament"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5224,11 +5242,11 @@ msgstr ""
 "La partida es desarà automàticament cada cop que passi aquest nombre de "
 "torns. Zero vol dir que no es desa mai automàticament."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Nivell de compressió de les partides desades"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5239,11 +5257,11 @@ msgstr ""
 "Si el valor màxim és zero vol dir que el servidor no es va compilar perquè "
 "utilitzés zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Prefix dels noms de desar automàtic"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5251,11 +5269,11 @@ msgstr ""
 "Les partides desades automàticament tindran el nom \"<prefix><any>.sav\".\n"
 "Aquest paràmetre fixa la part <prefix>."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Si es registren les estadístiques de jugador"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5269,7 +5287,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "El servidor no pot llegir l'entrada estàndard. S'ignora l'entrada."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Servidor: adreça incorrecta: [%s:%d]."
@@ -5405,91 +5423,91 @@ msgstr "No s'ha pogut desar la partida com a %s"
 msgid "Game saved as %s"
 msgstr "Partida desada com a %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "La partida ja s'està jugant."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%s ha perdut el control cmdlevel en començar la partida. A partir d'ara, feu "
 "servir votacions."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "S'està iniciant la partida."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "sol·licitud d'informe desconegut (tipus %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Avís: rebutjant client antic %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Rebut un paquet del tipus %d d'un jugador mort o observador"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Si us plau, escull un nom no buit."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Aquesta nació ja està agafada."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "Un altre jugador ja té el nom '%s'.  Si us plau, escull un altre nom."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Si us plau, escull un nom que contingui només caràcters ASCII"
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "La nació %s no està disponible en aquest escenari."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "La nació %s ja està agafada."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s és el dirigent %s %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr ""
 "Esperant per començar la partida: %d de %d jugadors estan a punt per "
 "començar."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s ha estat afegit com un jugador de nivell %s controlat per IA."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Jugador %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s governa els %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
@@ -5497,16 +5515,16 @@ msgstr ""
 "Aquest programa civserver té suport d'autenticació de jugadors, però ara "
 "mateix no es fa servir."
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "S'està enviant informació al metaservidor [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "La partida ha acabat..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "S'estan acceptant noves connexions de clients."
 
@@ -5528,7 +5546,7 @@ msgstr "(ambigu)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5705,7 +5723,7 @@ msgstr "Els jugadors no es poden esborrar un cop la partida ha començat."
 msgid "Removed player %s from the game."
 msgstr "S'ha eliminat el jugador %s de la partida."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Nom \"%s\" no permès per raons de seguretat."
@@ -5785,203 +5803,203 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr "No es pot augmentar nivell d'accés de comanda a '%s'; només tens '%s'."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Nivell d'accés de comanda fixat a '%s' per a connexió %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 "El nivell d'accés de comanda no s'ha pogut fixar a '%s' per a la connexió %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Nivell d'accés de comanda fixat a '%s' per a nous jugadors."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 "Nivell d'accés de comanda fixat a '%s' per al primer jugador que l'agafi."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 "La comanda 'first' no té sentit des de la línia de comandes del servidor."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Ja tens nivell d'accés de comanda '%s' o millor."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Algú altre ja és organitzador de la partida."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "La connexió %s ha decidit convertir-se en organitzadora de la partida."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Argument invàlid %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Ús: timeoutincrease <torn> <tornafeg> <valor> <valormult>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Temps màxim dinàmic fixat a %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Opció:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Descripció:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Estat: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "canviable"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fix"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Valor: %d, Mínim: 0, per Defecte: %d, Màxim: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Valor: %d, Mínim: %d, per Defecte: %d, Màxim: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Valor: \"%s\", per Defecte: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Hi ha explicacions disponibles per les següents opcions del servidor:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "No hi ha explicació per això encara."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Nom d'opció ambigu."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Operador de servidor: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "El jugador '%s' ha passat a tenir el nivell IA '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s no està control·lat per la IA."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "S'ha establert el nivell d'IA per defecte a '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Aquesta comanda és només per al client."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Ús: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Només els jugadors poden utilitzar la comanda away (no hi sóc)"
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s fixat a mode away (no hi sóc)."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s ha tornat a la partida."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Ho sento, no tens accés per veure l'opció '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Opció desconeguda '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Totes les opcions amb valors diferents del defecte"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Totes les opcions"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Opcions vitals"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Opcions de situació"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Opcions poc utilitzades"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ significa que pots canviar l'opció"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= significa que l'opció està al seu valor per defecte"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s valor   (mín,màx)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Opció"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "descripció"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -5990,38 +6008,38 @@ msgstr ""
 "Intenta 'show changed' per mostrar les opcions amb valors diferents del "
 "defecte."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "No es poden canviar els equips un cop la partida ha començat."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Argument no definit. Ús: team <jugador> <equip>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 "No existeix l'equip %s. Si us plau dóna un nom o nombre d'equip vàlids."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Un bàrbar no es pot ajuntar a un equip."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "El jugador %s s'ha unit a l'equip %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Arguments no definits. Ús: vote yes|no [número de votació]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Els observadors no poden votar."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -6029,39 +6047,39 @@ msgstr ""
 "Només pots votar en una partida en curs. Utilitza 'first' per convertir-te "
 "en organitzador de la partida si ara mateix no n'hi ha cap."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Votació %d \"%s\": %d a favor, %d en contra"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "No hi ha cap votació en marxa."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Últim vot no legal"
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "El valor ha de ser un enter."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "No existeix la votació (%d)"
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Has votat a favor de \"%s\""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Has votat en contra de \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6069,426 +6087,451 @@ msgstr ""
 "Arguments no definits. Ús: debug <diplomacy <jugador> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <jugador> | timing | info>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Només es pot usar aquesta comanda un cop la partida ha començat."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "La diplomàcia %s ja no es depura"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "La diplomàcia %s s'està depurant"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "Tecnologia %s ja no es depura"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "La tecnologia %s s'està depurant"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Els valors 2 i 3 han de ser enters."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Coordenades de mapa dolentes."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "No hi ha cap ciutat en aquestes coordenades."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "Ja no es depura a %s"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr "Ja no es depura el %2$s %1$s."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr "Depurant %2$s %1$s."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "El valor 2 ha de ser un enter."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "La unitat %d no existeix."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Argument no definit.  Ús: set <opció> <valor>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "No tens permís per establir aquesta opció."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Aquesta opció no pot ser modificada un cop ha començat la partida."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "El valor ha de ser un enter."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr "El paràmetre %s només pot contenir els dígits 0-1."
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Valor fora de rang (mínim: 0, màxim 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Opció: S'ha establert %s a %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr "El paràmetre %s només pot contenir +- i 0-9."
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Valor fora de rang (mínim: %d, màxim: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Valor de cadena massa llarg. Ús: set <opció> <valor>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Opció: %s s'ha establert a \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Ho sento, en aquesta partida no es pot observar globalment."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr "Ho sento, No pots agafar un observador global. Pots observar-lo, però."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Ho sento, en aquesta partida no es poden prendre els jugadors humans."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Ho sento, en aquesta partida no es poden observar els bàrbars."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Ho sento, en aquesta partida no es poden prendre els bàrbars."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Ho sento, en aquesta partida no es poden observar els jugadors morts."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Ho sento, en aquesta partida no es poden prendre els jugadors morts."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Ho sento, en aquesta partida no es poden observar els jugadors d'IA."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Ho sento, en aquesta partida no es poden prendre els jugadors d'IA."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Ho sento, en aquesta partida no es poden observar els jugadors humans."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "Ho sento, en aquesta partida no es poden prendre els jugadors humans."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Ho sento, en aquesta partida no es pot observar."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Ho sento, en aquesta partida no es poden prendre jugadors."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 "Ho sento, en aquesta partida no es poden prendre els jugadors ja connectats."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Ús: observe [nom-connexió [nom-jugador]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Ús: observe [nom-jugador]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s ja controla %s. Usar 'observe' suprimiria %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s ja està observant %s"
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s ja està observant."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s ara observa a %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s ara observa"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Ús: take [nom-connexió] <nom-jugador>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Ús: take <nom-jugador>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Ús: take [nom-connexió] <nom-jugador>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s ja controla %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
 msgstr "No queda cap espai de jugador lliure per a %s"
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "desconnectant-se de %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s ara controla %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Bàrbar"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "IA"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Humà"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Viu"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Mort"
 
-#: server/stdinhand.c:3088
-#, c-format
-msgid "%s failed to attach to any player"
+#: server/stdinhand.c:3147
+#, fuzzy, c-format
+msgid "%s failed to attach to any player."
 msgstr "%s no s'ha pogut associar a cap jugador"
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Ús: detach <nom-connexió>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "No pots desconnectar altres jugadors."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s no s'ha associat a cap jugador."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "desassociant %s de %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s ja no està observant."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "s'està desassociant de %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Ús: load <nom-partida>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "No es pot carregar una partida mentre n'hi ha una altra en joc."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "No puc trobar la partida desada ni l'escenari de nom \"%s\"."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "No s'ha pogut carregar el fitxer desat: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "El directori del conjunt de regles actuals és \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "No s'ha trobat el directori de regles \"%s\" "
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Directori de regles ja és \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Directori de regles fixat a \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Adéu."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Ho sento, no tens permès usar comandes de servidor."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr "Atenció: '%s' interpretat com '%s', però és ambigu. Prova '%shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Comanda desconeguda.  Prova '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "El teu nou vot ha cancel·lat l'anterior."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Nou vot (número %d) per %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr "El teu vot nou (\"%s\") no és legal o no s'ha reconegut."
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "No tens permís per usar aquesta comanda."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(prompt del servidor)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "La partida ha acabat en un empat"
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Finalitzant partida. El servidor rearrancarà un cop s'hagin desconnectat "
 "tots els clients."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "No es pot acabar la partida, no n'hi ha cap en joc."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s ha donat la partida per perduda i ja no pot guanyar."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "No pots rendir-te ara."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
-msgstr "No hi ha prou jugadors, la partida no començarà."
+#: server/stdinhand.c:3883
+msgid "Not enough human players, game will not start."
+msgstr "No hi ha prou jugadors humans, la partida no començarà."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+msgid "No players, game will not start."
+msgstr "No hi ha jugadors, la partida no començarà."
+
+#: server/stdinhand.c:3892
 msgid "Not enough nations for all players, game will not start."
 msgstr ""
 "No hi ha prou nacions per a tots els jugadors, la partida no començarà."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Tots els jugadors estan a punt; començant la partida"
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "No es pot iniciar la partida: la partida està esperant que es desconnectin "
 "tots els clients."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "No es pot iniciar la partida: ja s'està jugant."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Tallant connexió %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6526,123 +6569,123 @@ msgstr ""
 "  save   - per desar la partida actual\n"
 "  quit   - per sortir"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Comanda:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Sinopsi: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Nivell: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Estan disponibles les següents comandes de servidor:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "L'argument de l'ajuda '%s' és ambigu."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Cap coincidència per l'argument d'ajuda '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Argument de llista incorrecte: '%s'. Prova '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Llista de jugadors:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<no hi ha cap jugador>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "usuari %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Mort"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", nivell de dificultat %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr "?clistmore:, %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", preparat"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", no preparat"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d connexió:"
 msgstr[1] " %d connexions:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s des de %s (nivell accés de comandes %s), bufsize=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr "(mode observador)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Llista d'equips:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : '%s' : %d jugador"
 msgstr[1] "%2d : '%s' : %d jugadors"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 jugador : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Equip buit: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Llista de connexions al servidor:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<no hi ha cap connexió>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Llista d'escenaris disponibles:"
 
@@ -6716,17 +6759,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "L'objectiu tecnològic és %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Robes %s dels %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "Els %s et roben %s!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "Els %s han robat %s dels %s."
@@ -7251,20 +7294,20 @@ msgstr "L'intent de construir meravella per %s ha fallat"
 msgid "Your %s has invalid orders."
 msgstr "El teu %s té ordres incorrectes"
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Massa de terra gran - pot trigar uns segons."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Tornant al generador %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "El generador 3 no ha situat totes les illes grans."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "El generador 3 ha deixat massa de terra %li sense situar."
@@ -7356,120 +7399,121 @@ msgstr "Potser hi ha quelcom mal configurat o permisos incorrectes"
 msgid "Cannot find audio file %s"
 msgstr "No s'ha pogut trobar el fitxer d'àudio %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX torns"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d d'or per torn"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d torn"
 msgstr[1] "%3d torns"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "mai"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/torn"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d torn"
 msgstr[1] "%s (%d) %d torns"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Obsolet"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Construït"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Gran Meravella"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Meravella Normal"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/torn"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Ciutadans\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Impostos sobre el comerç\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : Ruta comercial amb %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : Almoines per edificis\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : Bonificació per %s (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Malbaratament\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Desordre\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Usat\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : Total de\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Excedent Total"
@@ -7581,8 +7625,8 @@ msgid "Best defending units"
 msgstr "Unitats defensives millors"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7752,8 +7796,8 @@ msgstr "Cont"
 msgid "?cma:Governor"
 msgstr "Gestor"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -8021,19 +8065,19 @@ msgstr ""
 "Connexió automàtica al servidor \"%s\" port %d com a \"%s\" cada %f segon(s) "
 "durant %d intents"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "principiant"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "fàcil"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "difícil"
 
@@ -8041,31 +8085,31 @@ msgstr "difícil"
 msgid "experimental"
 msgstr "experimental"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "S'està engegant el servidor..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "No s'ha pogut engegar el servidor"
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "N'hauràs d'engegar un manualment. Ho sento..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "No ens hem pogut connectar al servidor."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Probablement no podríem engegar-lo des d'aquí."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Controlem el servidor (nivell d'accés a comandes hack)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "No podem controlar el servidor, intentant aturar-lo."
 
@@ -8152,27 +8196,27 @@ msgstr "S'aplica només a %s.\n"
 msgid "Requires a minimum size of %d.\n"
 msgstr "Requereix una mida mínima de %d.\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Permet %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Permet %s (amb %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Rius"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Ho sento, no hi ha ajuda pel tema %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8183,7 +8227,7 @@ msgstr ""
 "Aquesta pàgina s'ha generat automàticament.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
@@ -8191,80 +8235,80 @@ msgstr ""
 "Requereix: Res\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* El descobriment de %s farà que %s sigui obsolet.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 "* Permet a tots els jugadors amb coneixement de %s construir unitats %s.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Permet %s (amb %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Permet %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Només es pot construir si hi ha %s a la ciutat.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Només es pot construir amb govern de %s.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* No es pot construir en ciutats.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* No té mai una ciutat d'origen.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Perdre aquesta unitat et farà perdre la partida!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Cada jugador pot tenir només un d'aquests tipus d'unitat.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Requereix població %d per construir-se.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Pot transportar i carregar combustible a %d unitat aèria.\n"
 msgstr[1] "* Pot transportar i carregar combustible a %d unitats aèries.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Pot transportar i carregar combustible a %d unitat de míssil.\n"
 msgstr[1] "* Pot transportar i carregar combustible a %d unitats de míssil.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Pot transportar %d unitat de terra per l'aigua.\n"
 msgstr[1] "* Pot transportar %d unitats de terra per l'aigua.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8273,127 +8317,127 @@ msgstr ""
 "ha d'estar almenys a 9 caselles (seguint la graella, sense diagonals) des de "
 "la ciutat original d'aquesta unitat).\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Pot ajudar a construir meravelles (afegeix %d de producció).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* No es pot desmantellar.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Pot ser desmantellat en una ciutat per recuperar el 50%% del cost de "
 "producció.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Pot construir noves ciutats.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Pot afegir %d població a ciutats de mida no superior a %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Pot construir camins i ferrocarrils.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Pot construir mines en caselles.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Pot fer irrigacions en caselles.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Pot fer hortes.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Pot fer hortes (si es coneix %s).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Pot fer hortes (si es coneix alguna de les següents: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Pot construir fortaleses.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Pot construir fortaleses (si es coneix %s).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 "* Pot construir fortaleses (si es coneix alguna de les següents: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Pot netejar contaminació de les caselles.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Pot netejar la radioactivitat de les caselles.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Pot transformar caselles.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Pot construir bases aèries.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Pot fortificar-se, rebent una bonificació defensiva del 50%%.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Pot saquejar per destruir infraestructura de les caselles.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* Pot dur a terme accions diplomàtiques i té habilitats d'espia.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Pot dur a terme accions diplomàtiques.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Mai no perdrà una lluita de diplomàtic contra diplomàtic.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* No pot ser subornat.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Pot atacar unitats aèries enemigues.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* És invisible excepte quan és al costat d'una unitat o ciutat enemiga.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Només pot atacar unitats que siguin al mar (cap atac terrestre).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
@@ -8401,40 +8445,40 @@ msgstr ""
 "* Pot atacar estant embarcada en unitats marítimes: contra ciutats enemigues "
 "i contra caselles de terra.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Pot ser llançat en paracaigudes des d'una ciutat amiga (Rang: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Obté doble defensa contra unitats especificades com a 'muntades'.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Compta com a unitat 'muntada' contra certs defensors.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Un míssil: es gasta en fer un atac.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* S'acaba el torn d'aquesta unitat en atacar.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* L'atac d'aquesta unitat causa una explosió nuclear!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Obté el doble de potència de foc quan ataca ciutats.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignora els efectes de les muralles.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8443,38 +8487,38 @@ msgstr ""
 "* Fa atacs de bombardeig (%d per torn). Aquests atacs només fereixen (no "
 "maten mai) el defensor, però no suposen cap risc per l'atacant.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Obté una defensa quintuplicada contra míssils i avions.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 "* Ignora l'efecte del terreny (tracta totes les caselles com a camins).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignora les zones de control.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* No és una unitat militar (no pot atacar i no imposa llei marcial).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 "* És una unitat de camp, crea un descontent fins i tot quan no és "
 "agressiva.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* No aconseguirà mai veterania.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Pot guanyar experiència mitjançant entrenament o combat.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8483,12 +8527,12 @@ msgstr ""
 "* Ha d'acabar el torn en una ciutat o prop de la costa, o té el 50%% de "
 "possibilitats de perdre's al mar.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* El descobriment de %s redueix el risc a 25%%,\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s redueix el risc a 12%%.\n"
@@ -8497,27 +8541,27 @@ msgstr "* %s redueix el risc a 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " o "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr ", "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* Ha d'estar en una ciutat o en un %s després d'%d torn.\n"
 msgstr[1] "* Ha d'estar en una ciutat o en un %s després de %d torns.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Si ara comencéssim amb %s necessitaríem %d bombetes."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8526,89 +8570,89 @@ msgstr ""
 "Per assolir %s primer hem d'obtenir %d altres tecnologies. Per acabar tot el "
 "projecte es necessitaran %d bombetes."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "No pots investigar aquesta tecnologia."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 "Aquest nombre pot variar en funció del que investiguin els altres jugadors.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr "* El primer jugador a descobrir %s obté un avenç immediat.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Redueix la probabilitat de perdre vaixells a alta mar al 25%%,\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Redueix la probabilitat de perdre vaixells a alta mar al 12%%,\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Incrementa la contaminació generada per la població.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Permet als %s construir camins en caselles de riu.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Permet als %s construir fortificacions.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Permet als %s construir bases aèries.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Permet als %s millorar camins a ferrocarrils.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Permet als %s millorar la irrigació a horta.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Aquest terreny no pot ser contaminat."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* No pots construir ciutats sobre aquest terreny."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* La línia de costa d'aquest terreny és insegura."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Aquest terreny no és segur perquè hi viatgin unitats."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Les unitats terrestres no poden viatjar per terrenys oceànics."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Característiques:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr "Res"
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8623,7 +8667,7 @@ msgstr[1] ""
 "* Les unitats militars fora de casa i les unitats de batalla faran que %d "
 "ciutadans estiguin descontents.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8633,31 +8677,31 @@ msgstr ""
 "les unitats en cas contrari.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 "* Pagues %d vegades el manteniment normal en %s per les teves unitats.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* Pagues %d vegades el manteniment normal per les teves unitats.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* No pagues manteniment en %s per les teves unitats.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* No pagues manteniment per les teves unitats.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
@@ -8666,21 +8710,21 @@ msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 "* Cadascuna de les teves ciutats evitarà de pagar %d per manteniment "
 "d'unitat.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 "* La probabilitat de guerra civil és del %d%% si perds la teva capital.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8690,7 +8734,7 @@ msgstr ""
 "civilització apareixerà quan tinguis %d ciutats.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8699,16 +8743,16 @@ msgstr ""
 "* Després del primer ciutadà descontent degut a la mida de la ciutat, per "
 "cada %d ciutats addicionals, n'apareixerà un altre.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr "La taxa màxima que pots fixar per ciència, or o luxes és del %d%%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "No té cap límit per les taxes de ciència/or/luxes.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8723,7 +8767,7 @@ msgstr[1] ""
 "* Les teves unitats poden imposar la llei marcial.Cada unitat militar dins "
 "d'una ciutat forçarà que %d ciutadans descontents estiguin contents.\n"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8733,7 +8777,7 @@ msgstr[1] ""
 "* Un màxim de %d unitats a cada ciutat poden imposar la llei marcial.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8742,15 +8786,15 @@ msgstr ""
 "* Pots fer que les teves ciutats creixin a base de festes. Les teves ciutats "
 "han de ser almenys de mida %d abans que no puguin créixer d'aquesta manera.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Les teves unitats no poden ser subornades.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Les teves ciutats no poden ser incitades a la revolta.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8758,15 +8802,15 @@ msgstr ""
 "* El govern caurà en l'anarquia si qualsevol ciutat roman en desordre durant "
 "meÅ› de dos torns seguits.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Té un senat que pot impedir una declaració de guerra.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr "* Permet guerrillers quan les ciutats són capturades per l'enemic.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
@@ -8774,25 +8818,25 @@ msgstr ""
 "* Els edificis que normalment serveixen per mitigar la infelicitat generaran "
 "or.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* No paga manteniment pels fanàtics.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* No té ciutadans descontents.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* Unitats %s veteranes.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Unitats veteranes.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8802,7 +8846,7 @@ msgstr ""
 "penalització de -1 quan no s'estigui en festa.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8812,7 +8856,7 @@ msgstr ""
 "més quan s'estigui en festa.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
@@ -8820,31 +8864,31 @@ msgstr ""
 "més.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* La producció de %s augmenta en un %d%%.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* La producció de %s patirà malbaratament massiu.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* La producció de %s patirà malbaratament.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* La producció de %s patirà una petita quantitat de malbaratament.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
@@ -8852,38 +8896,38 @@ msgstr ""
 "capital.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 "* El malbaratament de %s augmentarà amb la distància des de la capital.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 "* El malbaratament de %s augmentarà lentament amb la distància des de la "
 "capital.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Et permet de construir %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d descontents"
@@ -9333,16 +9377,16 @@ msgstr "Capacitats del servidor: %s"
 msgid "Start of turn %d"
 msgstr "Inici del torn %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "El mode IA és ara %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "ENCÈS"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "APAGAT"
 
@@ -9373,13 +9417,13 @@ msgstr "Nom:"
 msgid "Username"
 msgstr "Usuari"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Bandera"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9393,7 +9437,7 @@ msgstr "Frontera"
 msgid "Score"
 msgstr "Puntuació"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Equip"
 
@@ -9426,36 +9470,36 @@ msgstr "Inactiu"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "No pots vendre millores."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Venut %d %s per %d d'or"
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "No s'ha pogut vendre cap %s"
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "No pots desmantellar unitats."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s no es pot desmantellar."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Desmantellada %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "No s'ha pogut desmantellar cap %s."
@@ -9763,64 +9807,68 @@ msgstr "Or: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Imp:%d Lux:%d Ciè:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+msgid "Moving: Nobody"
+msgstr "Movent: Ningú"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Movent: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Clica per més info)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s Persones"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Torn: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Or: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Ingressos nets: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Taxes: Or:%d%% Luxe:%d%% Ciè:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Investigant %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Probabilitat d'escalfament global: %d%% (%+d%%/torn)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Probabilitat d'hivern nuclear: %d%% (%+d%%/torn)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Govern: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9828,55 +9876,55 @@ msgstr[0] "%d unitat"
 msgstr[1] "%d unitats"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr "Inabastable"
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Torns fins l'objectiu: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Torns fins l'objectiu: %d a %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d unitat seleccionada"
 msgstr[1] "%d unitats seleccionades"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Cap unitat seleccionada."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Altres: %d civils; %d militars"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Altres: %d civils"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Altres: %d militars"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "No hi ha unitats a millorar!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Cap d'aquestes unitats no es pot millorar."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9891,72 +9939,72 @@ msgstr[1] ""
 "Millorar %d unitats per %d peces d'or?\n"
 "El tresor en té %d."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Mostra el teu progrés investigant la tecnologia actual."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "sense objectiu d'investigació."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Mostra el progrés de l'escalfament global:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Taxa de contaminació: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Probabilitat d'escalfament catastròfic a cada torn: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Mostra el progrés de l'hivern nuclear:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Taxa de radioactivitat: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Probabilitat d'hivern nuclear a cada torn: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Mostra el teu govern actual:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Població:          %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Suport:            %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energia:           %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9964,96 +10012,96 @@ msgstr[0] "Massa:            %5d tona"
 msgstr[1] "Massa:            %5d tones"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Temps de viatge: %5.1f anys"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Temps de viatge: N/D  "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Prob. d'èxit:      %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Any d'arribada: %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "Sense límit"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dd %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "desbordat"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s dels %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Observador: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Edificis: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Cap. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "?blistend:."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Meravelles: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Ciutats: total de %d, %d per damunt del límit de %d ciutats."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10061,7 +10109,7 @@ msgstr[0] "%d de content abans de penalitzar amb "
 msgstr[1] "%d de contents abans de penalitzar amb "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10069,16 +10117,16 @@ msgstr[0] "%d ciutadà descontent addicional."
 msgstr[1] "%d ciutadans descontents addicionals."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Llei marcial vigent ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "sense màxim, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10086,20 +10134,20 @@ msgstr[0] "%d unitats màxim, "
 msgstr[1] "%d unitats màxim, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d per unitat). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Les unitats militars al camp poden causar descontents."
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Les unitats militars no tenen cap efecte sobre la felicitat."
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luxes: %d en total."
@@ -10149,12 +10197,12 @@ msgid ""
 msgstr ""
 "El gestor de ciutadans s'ha confós a %s. Val més que hi donis un cop d'ull."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "cap"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "a mida"
 
@@ -10208,11 +10256,13 @@ msgid "Ooops..."
 msgstr "Uuuui..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Aquesta unitat no pot ser subornada."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10229,6 +10279,7 @@ msgstr "Subornar unitat enemiga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10269,6 +10320,7 @@ msgstr "_Avenços:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "A la discreció de l'espia"
 
@@ -10293,12 +10345,13 @@ msgstr "_Edificis:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Producció de la ciutat"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "No pots incitar una revolta a %s."
@@ -10310,6 +10363,7 @@ msgstr "La ciutat no pot ser incitada!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10326,6 +10380,7 @@ msgstr "Incitar una revolta!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10335,6 +10390,7 @@ msgstr ""
 "El tresor en té %d."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10404,10 +10460,12 @@ msgid "Subvert Enemy Unit"
 msgstr "Subvertir Unitat Enemiga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr "El diplomàtic està esperant ordres"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr "L'espia està esperant ordres"
 
@@ -10507,7 +10565,7 @@ msgstr "Contaminació:"
 msgid "_Overview"
 msgstr "_Resum"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10532,11 +10590,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d torns"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Comprar"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr "_Producció"
 
@@ -10655,7 +10713,7 @@ msgstr "Unitats suportades %d"
 msgid "Present units %d"
 msgstr "Unitats presents %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Cen_trar"
 
@@ -10744,31 +10802,31 @@ msgstr "Renomenar ciutat"
 msgid "What should we rename the city to?"
 msgstr "Com s'ha de dir la ciutat ?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "Can_vi"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Afegir al _Principi"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Afegir al _Següent"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Afegir al _Final"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr "_Mostrar"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10778,12 +10836,12 @@ msgstr "_Mostrar"
 msgid "Cities"
 msgstr "Ciutats"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr "_Inspeccionar"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10792,85 +10850,90 @@ msgstr "_Inspeccionar"
 msgid "Improvements"
 msgstr "Edificis"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Meravelles"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Totes les ciutats"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Cap ciutat"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Invertir la Selecció"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Construint Unitats"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Construint Edificis"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Construint Meravelles"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Construint Unitat"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Construint Edifici"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Construint Meravella"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Ciutats Costaneres"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Mateixa illa"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Unitats suportades"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Unitats presents"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Edificis de la ciutat"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Meravelles de la ciutat"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Unitats disponibles"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Edificis disponibles"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Meravelles disponibles"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Cost Total de Compra: %d"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10936,121 +10999,121 @@ msgstr "Com hem d'anomenar el prefixat ?"
 msgid "Remove this preset?"
 msgstr "Eliminar aquest prefixat?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "Anar a _lloc"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr "Inspeccionar _Ciutat"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Dius que vols una revolució?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revolució!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Què Saquejar"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Selecciona què saquejar:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Unitat"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Nom"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Selecció d'unitat"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_Preparar totes"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "_Sentinella inactives"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
 msgstr "_Grups de Nacions:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Quina nació seràs?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Tria Nació"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
 msgstr "Nació _Aleatòria"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Escull una nació"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Propietats"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Líder:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Dona"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Home"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
 msgstr "_Estils de Ciutat:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 msgid "_Description"
 msgstr "_Descripció"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Has d'escollir el teu sexe."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Has d'escollir un estil de ciutat."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Has d'escriure un nom vàlid."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Millorar unitat!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11312,60 +11375,65 @@ msgstr ""
 msgid "Not _ready"
 msgstr "No _preparat"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Totes Preparades"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Iniciar"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+msgid "_Take Player"
+msgstr "_Agafar jugador"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Tria _Nació"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_Observar"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr "No O_bservar"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<IA>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<IA Principiant>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<IA Fàcil>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<IA Normal>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<IA Difícil>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Aleatori"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Observador"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Deslligat"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Segur que vols sortir?"
 
@@ -12276,214 +12344,214 @@ msgstr "C_onnectar a Partida en Xarxa"
 msgid "Connect to Gaming _Zone"
 msgstr "Connectar a _Zona de Jocs"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Les contrasenyes no coincideixen, entra la contrasenya."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Nom del servidor"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versió"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Estat"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Jugadors"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Comentari"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Xarxa d'_Area Local"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "_Metaservidor d'Internet"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Host:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Port:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Login:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Contra_senya:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Conf_irmar la Contrasenya:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "C_onnectar"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Nom de connexió: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Nom del jugador: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Host: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Info Jugador/conn"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "Info %s"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Commutar disponibilitat jugador"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Tria nació"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Observar aquest jugador"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Agafar aquest jugador"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Tallar connexió"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "Commutar IA per jugador"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Eliminar jugador"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Donar accés d'info"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "Donar accés de control"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "Posar a %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr "_Nombre de Jugadors (comptant IA):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr "Nivell de _Dificultat dels IA:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
 msgstr "_Versió de Joc de Regles:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Més _Opcions de Joc..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Registrar"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Valoració"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Preparat"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Líder"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Tria Partida Desada per Carregar"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Tria Partida Desada per _Carregar:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Fullejar..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Tria un Escenari"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Tria un _Escenari:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Tipus"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Tria una _nació per jugar:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Tria el Lloc on Desar"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Desar la Partida"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Partides _Desades:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Nom de _Fitxer a Desar:"
 
@@ -12518,7 +12586,7 @@ msgstr "Nom"
 msgid "Count"
 msgstr "Quantitat"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12763,28 +12831,28 @@ msgstr "_Llistes de treball:"
 msgid "Edit Global _Worklists"
 msgstr "_Editar llistes de treball globals"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Torns"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "_Tasques de Font:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Mostrar objectius _futurs."
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "_Llista de treball objectiu:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "_Afegir llista de treball global"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Can_viar la producció"
 
@@ -13077,8 +13145,8 @@ msgid "City shrinks: %d %s"
 msgstr "Pèrdua de pob.: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13180,11 +13248,11 @@ msgstr "Informe militar"
 msgid "Maintenance Report"
 msgstr "Informe de manteniment"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "llista de treball"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -13610,21 +13678,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr "  -t,  --theme TEMA\tFer servir tema gràfic TEMA\n"
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr "Fent foto de pantalla fc_%05d.bmp"
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Usant sortida de vídeo: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Inicialitzant client"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Esperant el començament de la partida"
 
@@ -14928,7 +14996,7 @@ msgstr "_Estil de les ciutats:"
 msgid "Unit Selection"
 msgstr "Selecció d'unitat"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "CAP"
 
@@ -21267,7 +21335,7 @@ msgid ""
 "The Trireme is your first boat unit. It can act as a transport ship and has "
 "rudimentary offensive capabilities, but may not stray too far from the shore."
 msgstr ""
-"El Trirem és la primera unitat marítima que pots tenir. Pot fer de vaixell "
+"El Trirrem és la primera unitat marítima que pots tenir. Pot fer de vaixell "
 "de transport i té una capacitat ofensiva rudimentària, però no pot aventurar-"
 "se massa lluny de terra."
 
@@ -21278,7 +21346,7 @@ msgstr "Caravel·la"
 #: data/default/units.ruleset:1263 data/civ2/units.ruleset:1214
 msgid ""
 "The Caravel replaces the Trireme and is much more reliable on the open seas."
-msgstr "La Caravel·la substitueix el Trirem i és molt més segura a mar obert."
+msgstr "La Caravel·la substitueix el Trirrem i és molt més segura a mar obert."
 
 #: data/default/units.ruleset:1269 data/civ2/units.ruleset:1220
 msgid "Galleon"
@@ -25504,3868 +25572,3 @@ msgstr "Equip 30"
 #: data/default/game.ruleset:160
 msgid "Team 31"
 msgstr "Equip 31"
-
-#~ msgid "Technology: %s"
-#~ msgstr "Tecnologia: %s"
-
-#~ msgid "Improvement: %s"
-#~ msgstr "Millora: %s"
-
-#~ msgid "City: %s"
-#~ msgstr "Ciutat: %s"
-
-#~ msgid "Diplomat Action: %s"
-#~ msgstr "Acció Diplomàtica: %s"
-
-#~ msgid "Enemy Diplomat: %s"
-#~ msgstr "Diplomàtic Enemic: %s"
-
-#~ msgid "Global: %s"
-#~ msgstr "Global: %s"
-
-#~ msgid "Hut: %s"
-#~ msgstr "Barraca: %s"
-
-#~ msgid "Nation: %s"
-#~ msgstr "Nació: %s"
-
-#~ msgid "Treaty: %s"
-#~ msgstr "Tractat: %s"
-
-#~ msgid "Unit: %s"
-#~ msgstr "Unitat: %s"
-
-#~ msgid "Wonder: %s"
-#~ msgstr "Meravella: %s"
-
-#~ msgid "Learned From Great Library"
-#~ msgstr "Apresa de la Gran Biblioteca"
-
-#~ msgid "Learned New Tech"
-#~ msgstr "Nova tecnologia apresa"
-
-#~ msgid "Selected New Goal"
-#~ msgstr "Nou objectiu seleccionat"
-
-#~ msgid "Bought"
-#~ msgstr "Comprat"
-
-#~ msgid "Forced to Sell"
-#~ msgstr " Forçat a vendre"
-
-#~ msgid "New Improvement Selected"
-#~ msgstr "Seleccionat nou edifici"
-
-#~ msgid "Sold"
-#~ msgstr "Venut"
-
-#~ msgid "Building Unavailable Item"
-#~ msgstr "Construint element no disponible"
-
-#~ msgid "Captured/Destroyed"
-#~ msgstr "Capturada/Destruïda"
-
-#~ msgid "Celebrating"
-#~ msgstr "En festa"
-
-#~ msgid "Civil Disorder"
-#~ msgstr "Desordre Civil"
-
-#~ msgid "Famine"
-#~ msgstr "Fam"
-
-#~ msgid "Famine Feared"
-#~ msgstr "Es tem fam"
-
-#~ msgid "Growth"
-#~ msgstr "Creixement"
-
-#~ msgid "May Soon Grow"
-#~ msgstr "Pot créixer aviat"
-
-#~ msgid "Needs Aqueduct"
-#~ msgstr "Necessita Aqüeducte"
-
-#~ msgid "Needs Aqueduct Being Built"
-#~ msgstr "Necessita un aqüeducte que està en construcció"
-
-#~ msgid "Normal"
-#~ msgstr "Normal"
-
-#~ msgid "Nuked"
-#~ msgstr "Atacada nuclearment"
-
-#~ msgid "Released from citizen governor"
-#~ msgstr "No controlada per gestor de ciutadans"
-
-#~ msgid "Suggest Growth Throttling"
-#~ msgstr "Suggerir augment de creixement"
-
-#~ msgid "Transfer"
-#~ msgstr "Transferir"
-
-#~ msgid "Was Built"
-#~ msgstr "Construïda"
-
-#~ msgid "Worklist Events"
-#~ msgstr "Successos de llista de treball"
-
-#~ msgid "Production changed"
-#~ msgstr "Producció canviada"
-
-#~ msgid "Bribe"
-#~ msgstr "Suborn"
-
-#~ msgid "Caused Incident"
-#~ msgstr "Provocat incident"
-
-#~ msgid "Escape"
-#~ msgstr "Escapada"
-
-#~ msgid "Failed"
-#~ msgstr "Fallat"
-
-#~ msgid "Incite"
-#~ msgstr "Incitar"
-
-#~ msgid "Poison"
-#~ msgstr "Enverinar"
-
-#~ msgid "Theft"
-#~ msgstr "Robatori"
-
-#~ msgid "Eco-Disaster"
-#~ msgstr "Desastre ecològic"
-
-#~ msgid "Nuke Detonated"
-#~ msgstr "Arma nuclear detonada"
-
-#~ msgid "Barbarians in a Hut Roused"
-#~ msgstr "Bàrbars d'una cabana empipats"
-
-#~ msgid "City Founded from Hut"
-#~ msgstr "Ciutat fundada per cabana"
-
-#~ msgid "Gold Found in Hut"
-#~ msgstr "Or trobat en cabana"
-
-#~ msgid "Killed by Barbarians in a Hut"
-#~ msgstr "Mort per bàrbars en cabana"
-
-#~ msgid "Mercenaries Found in Hut"
-#~ msgstr "Mercenaris trobats a cabana"
-
-#~ msgid "Settler Found in Hut"
-#~ msgstr "Colon trobat a cabana"
-
-#~ msgid "Tech Found in Hut"
-#~ msgstr "Tecnologia trobada a cabana"
-
-#~ msgid "Unit Spared by Barbarians"
-#~ msgstr "Unitat no morta per bàrbars"
-
-#~ msgid "Barbarian Uprising"
-#~ msgstr "Rebel·lió de bàrbars"
-
-#~ msgid "Civil War"
-#~ msgstr "Guerra Civil"
-
-#~ msgid "Collapse to Anarchy"
-#~ msgstr "Col·lapse a l'Anarquia"
-
-#~ msgid "First Contact"
-#~ msgstr "Primer contacte"
-
-#~ msgid "Learned New Government"
-#~ msgstr "S'aprèn un nou govern"
-
-#~ msgid "Low Funds"
-#~ msgstr "Pocs diners"
-
-#~ msgid "Revolt Ended"
-#~ msgstr "S'acaba una revolta"
-
-#~ msgid "Revolt Started"
-#~ msgstr "S'inicia una revolta"
-
-#~ msgid "Spaceship Events"
-#~ msgstr "Esdeveniments de Nau espacial"
-
-#~ msgid "Alliance"
-#~ msgstr "Aliança"
-
-#~ msgid "Broken"
-#~ msgstr "Trencat"
-
-#~ msgid "Cease-fire"
-#~ msgstr "Alto el foc"
-
-#~ msgid "Peace"
-#~ msgstr "Pau"
-
-#~ msgid "Shared Vision"
-#~ msgstr "Visió compartida"
-
-#~ msgid "Attack Failed"
-#~ msgstr "Atac fallat"
-
-#~ msgid "Attack Succeeded"
-#~ msgstr "Atac reeixit"
-
-#~ msgid "Defender Destroyed"
-#~ msgstr "Defensor destruït"
-
-#~ msgid "Defender Survived"
-#~ msgstr "Defensor sobreviu"
-
-#~ msgid "Promoted to Veteran"
-#~ msgstr "Promocionat a veterà"
-
-#~ msgid "Production Upgraded"
-#~ msgstr "Producció millorada"
-
-#~ msgid "Relocated"
-#~ msgstr "Resituada"
-
-#~ msgid "Orders / goto events"
-#~ msgstr "Ordres / esdeveniments d'anada"
-
-#~ msgid "Finished"
-#~ msgstr "Acabada"
-
-#~ msgid "Made Obsolete"
-#~ msgstr "Feta obsoleta"
-
-#~ msgid "Started"
-#~ msgstr "Iniciada"
-
-#~ msgid "Stopped"
-#~ msgstr "Aturada"
-
-#~ msgid "Will Finish Next Turn"
-#~ msgstr "S'acabarà el proper torn"
-
-#~ msgid "Server Aborting"
-#~ msgstr "Servidor Avortant"
-
-#~ msgid "Server Problems"
-#~ msgstr "Problemes de Servidor"
-
-#~ msgid "Message from server operator"
-#~ msgstr "Missatge de l'operador del servidor"
-
-#~ msgid "Away"
-#~ msgstr "Fora"
-
-#~ msgid "Novice"
-#~ msgstr "Principiant"
-
-#~ msgid "Easy"
-#~ msgstr "Fàcil"
-
-#~ msgid "Hard"
-#~ msgstr "Difícil"
-
-#~ msgid "Cheating"
-#~ msgstr "Trampós"
-
-#~ msgid "Experimental"
-#~ msgstr "Experimental"
-
-#~ msgid "\"%s\" units"
-#~ msgstr "\"%s\" unitats"
-
-#~ msgid "%s AI"
-#~ msgstr "IA %s"
-
-#~ msgid "%s terrain"
-#~ msgstr "Terreny %s"
-
-#~ msgid "Oceanic"
-#~ msgstr "Oceànic"
-
-#~ msgid "Base"
-#~ msgstr "Base"
-
-#~ msgid "Freeciv version %s (%s)"
-#~ msgstr "Freeciv versió %s (%s)"
-
-#~ msgid ""
-#~ "THIS IS A BETA VERSION\n"
-#~ "Freeciv %s will be released in %s, at %s"
-#~ msgstr ""
-#~ "AQUESTA VERSIÓ ÉS BETA\n"
-#~ "Freeciv %s serà llançat el %s, a %s"
-
-#~ msgid "Run ok"
-#~ msgstr "Execució correcta"
-
-#~ msgid "Flush ok"
-#~ msgstr "Buidat correcte"
-
-#~ msgid "Finish ok"
-#~ msgstr "Final correcte"
-
-#~ msgid "Stream end"
-#~ msgstr "Final d'entrada"
-
-#~ msgid "Config error"
-#~ msgstr "Error de configuració"
-
-#~ msgid "Sequence error"
-#~ msgstr "Error de seqüència"
-
-#~ msgid "Parameter error"
-#~ msgstr "Error de paràmetre"
-
-#~ msgid "Mem error"
-#~ msgstr "Error de memòria"
-
-#~ msgid "Data error"
-#~ msgstr "Error de dades"
-
-#~ msgid "Not bzip2 file"
-#~ msgstr "Fitxer no bzip2"
-
-#~ msgid "IO error"
-#~ msgstr "Error d'E/S"
-
-#~ msgid "Unexpected EOF"
-#~ msgstr "Final de fitxer inesperat"
-
-#~ msgid "Output buffer full"
-#~ msgstr "Buffer de sortida ple"
-
-#~ msgid "Bz2: \"%s\" (%d)"
-#~ msgstr "Bz2: \"%s\" (%d)"
-
-#~ msgid "Bz2 error %d"
-#~ msgstr "Error de Bz2 %d"
-
-#~ msgid "Please report this message at %s"
-#~ msgstr "Si us plau informa d'aquest missatge a %s"
-
-#~ msgid "\"%s\" is set but empty; using default \"%s\" instead."
-#~ msgstr ""
-#~ "\"%s\" està establert però és buit; en comptes d'aquest, s'usarà \"%s\" "
-#~ "per defecte."
-
-#~ msgid "The data path may be set via the \"%s\" environment variable."
-#~ msgstr ""
-#~ "La ruta de les dades es pot establir mitjançant la variable d'entorn \"%s"
-#~ "\"."
-
-#~ msgid "%s was rejected: Only preregistered users allowed."
-#~ msgstr "%s ha estat refusat: Només es permeten usuaris preregistrats."
-
-#~ msgid "A replacement %s was built in %s."
-#~ msgstr "S'ha construït un %s de recanvi a %s."
-
-#~ msgid "Moved %s out of disbanded city %s since it cannot stay on %s."
-#~ msgstr ""
-#~ "S'ha mogut %s fora de la ciutat %s que s'ha desmantellat perquè no es pot "
-#~ "quedar a %s."
-
-#~ msgid ""
-#~ "%s can't build %s from the worklist; only AI of level %s may build this.  "
-#~ "Postponing..."
-#~ msgstr ""
-#~ "%s no pot construir %s de la llista de treball; només IA de nivell %s pot "
-#~ "construir-ho.  Es posposa..."
-
-#~ msgid ""
-#~ "%s can't build %s from the worklist; %s terrain class is required.  "
-#~ "Postponing..."
-#~ msgstr ""
-#~ "%s no pot construir %s de la llista de treball, necessita classe de "
-#~ "terreny %s.  Es posposa..."
-
-#~ msgid "Celebrations in your honour in %s."
-#~ msgstr "Celebracions en honor teu a %s"
-
-#~ msgid "Celebrations canceled in %s."
-#~ msgstr "Celebracions cancel·lades a %s."
-
-#~ msgid "Setting timeout to 0. Autogame will stop.\n"
-#~ msgstr "Fixant el temporitzador a 0. El joc automàtic s'aturarà.\n"
-
-#~ msgid ""
-#~ "cheating\n"
-#~ "cheating <player-name>"
-#~ msgstr ""
-#~ "cheating\n"
-#~ "cheating <nom-jugador>"
-
-#~ msgid "Set one or all AI players to 'cheating'."
-#~ msgstr "Assigna un o tots el jugadors IA a 'trampós'."
-
-#~ msgid ""
-#~ "With no arguments, sets all AI players to skill level 'cheating', and "
-#~ "sets the default level for any new AI players to 'cheating'.  With an "
-#~ "argument, sets the skill level for that player only."
-#~ msgstr ""
-#~ "Sense arguments, estableix tots els jugadors controlats per la IA al "
-#~ "nivell 'trampós' i estableix el nivell per defecte per nous jugadors IA a "
-#~ "'trampós'. Amb un argument, només estableix la dificultat per al jugador "
-#~ "donat."
-
-#~ msgid "%s Welcome"
-#~ msgstr "Benvingut %s"
-
-#~ msgid "%s has connected from %s."
-#~ msgstr "%s s'ha connectat des de %s."
-
-#~ msgid " *** Server is in edit mode. *** "
-#~ msgstr " *** El servidor està en mode d'edició. ***"
-
-#~ msgid "Client rejected: %s."
-#~ msgstr "Client refusat: %s."
-
-#~ msgid "Connection request from %s from %s"
-#~ msgstr "Petició de connexió de %s des de %s"
-
-#~ msgid "%s has client version %d.%d.%d%s"
-#~ msgstr "%s té la versió del client %d.%d.%d%s"
-
-#~ msgid ""
-#~ "The client is missing a capability that this server needs.\n"
-#~ "Server version: %d.%d.%d%s Client version: %d.%d.%d%s.  Upgrading may "
-#~ "help!"
-#~ msgstr ""
-#~ "El client no té una capacitat que necessita aquest servidor.\n"
-#~ "Versió del servidor: %d.%d.%d%s Versió del client: %d.%d.%d%s.  "
-#~ "Actualitzar pot ajudar!"
-
-#~ msgid "%s was rejected: Mismatched capabilities."
-#~ msgstr "%s s'ha refusat. Capacitats no coincidents."
-
-#~ msgid ""
-#~ "The server is missing a capability that the client needs.\n"
-#~ "Server version: %d.%d.%d%s Client version: %d.%d.%d%s.  Upgrading may "
-#~ "help!"
-#~ msgstr ""
-#~ "El servidor no té una capacitat que necessita el client.\n"
-#~ "Versió del servidor: %d.%d.%d%s Versió del client: %d.%d.%d%s.  "
-#~ "Actualitzar pot ajudar!"
-
-#~ msgid "Invalid username '%s'"
-#~ msgstr "Nom d'usuari invàlid '%s'"
-
-#~ msgid "%s was rejected: Invalid name [%s]."
-#~ msgstr "%s s'ha refusat. Nom invàlid [%s]."
-
-#~ msgid "'%s' already connected."
-#~ msgstr "'%s' ja està connectat."
-
-#~ msgid "%s was rejected: Duplicate login name [%s]."
-#~ msgstr "%s s'ha refusat. Nom de login duplicat [%s]."
-
-#~ msgid " *** Server set to edit mode by %s! *** "
-#~ msgstr " *** Servidor posat en mode d'edició per %s! ***"
-
-#~ msgid " *** Server is leaving edit mode. *** "
-#~ msgstr " *** El servidor surt del mode d'edició. ***"
-
-#~ msgid "Cannot create unit on enemy tile."
-#~ msgstr "No es pot crear una unitat en una casella enemiga."
-
-#~ msgid "Cannot create %s unit on this terrain."
-#~ msgstr "No es pot crear unitat de %s sobre aquest terreny."
-
-#~ msgid "Cannot build city on this tile."
-#~ msgstr "No es pot fundar una ciutat en aquesta casella."
-
-#~ msgid "Could not create city."
-#~ msgstr "No s'ha pogut crear la ciutat."
-
-#~ msgid "Could not change city size."
-#~ msgstr "No s'ha pogut canviar la mida de la ciutat."
-
-#~ msgid "Cannot remove knowledge about own city."
-#~ msgstr "No es pot anul·lar el coneixement d'una ciutat pròpia"
-
-#~ msgid "Cannot remove knowledge about own unit."
-#~ msgstr "No es pot anul·lar el coneixement d'una unitat pròpia"
-
-#~ msgid "No units placed for %s!"
-#~ msgstr "Cap unitat situada per %s!"
-
-#~ msgid "Your nation is thrust into civil war."
-#~ msgstr "La teva nació es veu abocada a una guerra civil."
-
-#~ msgid "%s is the rebellious leader of the %s."
-#~ msgstr "%s és el líder rebel dels %s."
-
-#~ msgid "%s declares allegiance to the %s."
-#~ msgstr "%s declara la seva lleialtat als %s."
-
-#~ msgid "Civil war partitions the %s; the %s now hold %d city."
-#~ msgid_plural "Civil war partitions the %s; the %s now hold %d cities."
-#~ msgstr[0] "La guerra civil divideix els %s; els %s controlen ara %d ciutat."
-#~ msgstr[1] ""
-#~ "La guerra civil divideix els %s; els %s controlen ara %d ciutats."
-
-#~ msgid "%s %s reports on the RICHEST Civilizations in the World."
-#~ msgstr ""
-#~ "L'informe de %2$s sobre les civilitzacions MÉS RIQUES del món el %1$s."
-
-#~ msgid "%s %s reports on the most ADVANCED Civilizations in the World."
-#~ msgstr ""
-#~ "L'informe de %2$s sobre les civilitzacions MÉS AVANÇADES del món el %1$s."
-
-#~ msgid "%s %s reports on the most MILITARIZED Civilizations in the World."
-#~ msgstr ""
-#~ "L'informe de %2$s sobre les civilitzacions MÉS MILITARITZADES del món el %"
-#~ "1$s."
-
-#~ msgid "%s %s reports on the HAPPIEST Civilizations in the World."
-#~ msgstr ""
-#~ "L'informe de %2$s sobre les civilitzacions MÉS FELICES del món el %1$s."
-
-#~ msgid "%s %s reports on the LARGEST Civilizations in the World."
-#~ msgstr ""
-#~ "L'informe de %2$s sobre les civilitzacions MÉS GRANS del món el %1$s."
-
-#~ msgid "Herodotus"
-#~ msgstr "Herodot"
-
-#~ msgid "Thucydides"
-#~ msgstr "Tucídides"
-
-#~ msgid "Pliny the Elder"
-#~ msgstr "Plini el Vell"
-
-#~ msgid "Livy"
-#~ msgstr "Livi"
-
-#~ msgid "Toynbee"
-#~ msgstr "Toynbee"
-
-#~ msgid "Gibbon"
-#~ msgstr "Gibbon"
-
-#~ msgid "Ssu-ma Ch'ien"
-#~ msgstr "Ssu-ma Ch'ien"
-
-#~ msgid "Pan Ku"
-#~ msgstr "Pan Ku"
-
-#~ msgid "%2d: The Supreme %s"
-#~ msgstr "%2d: Els Suprems %s"
-
-#~ msgid "%2d: The Magnificent %s"
-#~ msgstr "%2d: Els Magnífics %s"
-
-#~ msgid "%2d: The Great %s"
-#~ msgstr "%2d: Els Grans %s"
-
-#~ msgid "%2d: The Glorious %s"
-#~ msgstr "%2d: Els Gloriosos %s"
-
-#~ msgid "%2d: The Excellent %s"
-#~ msgstr "%2d: Els Excel·lents %s"
-
-#~ msgid "%2d: The Eminent %s"
-#~ msgstr "%2d: Els Eminents %s"
-
-#~ msgid "%2d: The Distinguished %s"
-#~ msgstr "%2d: Els Distingits %s"
-
-#~ msgid "%2d: The Average %s"
-#~ msgstr "%2d: Els Normalets %s"
-
-#~ msgid "%2d: The Mediocre %s"
-#~ msgstr "%2d: Els Mediocres %s"
-
-#~ msgid "%2d: The Ordinary %s"
-#~ msgstr "%2d: Els Ordinaris %s"
-
-#~ msgid "%2d: The Pathetic %s"
-#~ msgstr "%2d: Els Penosos %s"
-
-#~ msgid "%2d: The Useless %s"
-#~ msgstr "%2d: Els Inútils %s"
-
-#~ msgid "%2d: The Valueless %s"
-#~ msgstr "%2d: Els Invàlids %s"
-
-#~ msgid "%2d: The Worthless %s"
-#~ msgstr "%2d: Els Menyspreables %s"
-
-#~ msgid "%2d: The Wretched %s"
-#~ msgstr "%2d: Els Infames %s"
-
-#~ msgid "Limited number of AI players"
-#~ msgstr "Nombre limitat de jugadors IA"
-
-#~ msgid ""
-#~ "If set to a positive value, then AI players will be automatically created "
-#~ "or removed to keep the total number of players at this amount.  As more "
-#~ "players join, these AI players will be replaced.  When set to zero, all "
-#~ "AI players will be removed."
-#~ msgstr ""
-#~ "Si té un valor positiu, es crearan o destruiran automàticament jugadors "
-#~ "IA per mantenir el nombre total de jugadors en aquest valor. A mesura que "
-#~ "s'afegeixin més jugadors, aniran reemplaçant aquests IA. Si es deixa a "
-#~ "zero, es trauran tots els jugadors IA."
-
-#~ msgid ""
-#~ "If non-zero, saved games will be compressed using zlib (gzip format) or "
-#~ "bzip2. Larger values will give better compression but take longer."
-#~ msgstr ""
-#~ "Si no és zero, les partides que es desen es comprimeixen usant zlib "
-#~ "(format gzip) o bzip2. Com més gran sigui aquest valor, més es "
-#~ "comprimiran però trigaran més."
-
-#~ msgid "Savegame compression algorithm"
-#~ msgstr "Algorisme de compressió de les partides desades"
-
-#~ msgid ""
-#~ "Compression library to use for savegames.\n"
-#~ " 0 - none\n"
-#~ " 1 - zlib (gzip format)\n"
-#~ " 2 - bzip2\n"
-#~ "Not all servers support all compression methods."
-#~ msgstr ""
-#~ "Llibreria de compressió a fer servir per partides desades.\n"
-#~ " 0 - cap\n"
-#~ " 1 - zlib (format gzip)\n"
-#~ " 2 - bzip2\n"
-#~ "No tots els servidors suporten tots els mètodes de compressió."
-
-#~ msgid "restarting for lack of players"
-#~ msgstr "reiniciant per falta de jugadors"
-
-#~ msgid "Running"
-#~ msgstr "En execució"
-
-#~ msgid "Game over"
-#~ msgstr "Partida acabada"
-
-#~ msgid "Waiting"
-#~ msgstr "Esperant"
-
-#~ msgid "Unsupported compression type %d"
-#~ msgstr "Tipus de compressió no suportat %d"
-
-#~ msgid ""
-#~ "Your client is too old. To use this server, please upgrade your client to "
-#~ "a Freeciv 2.2 or later."
-#~ msgstr ""
-#~ "El teu client és massa antic. Per utilitzar aquest servidor actualitza si "
-#~ "us plau el teu client a Freeciv 2.2 o posterior."
-
-#~ msgid "Can't add more players, not enough nations."
-#~ msgstr "No es poden afegir més jugadors, no hi ha prou nacions."
-
-#~ msgid "%s replacing %s as an AI-controlled player."
-#~ msgstr "%s reemplaça %s com a jugador controlat per IA."
-
-#~ msgid ""
-#~ "Usage:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ús:\n"
-#~ "%s"
-
-#~ msgid "Option: %s  -  %s"
-#~ msgstr "Opció: %s  -  %s"
-
-#~ msgid "Option: %s"
-#~ msgstr "Opció: %s"
-
-#~ msgid ""
-#~ "Undefined argument.  Usage:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Argument no definit.  Ús:\n"
-#~ "%s"
-
-#~ msgid "players=%d cities=%d citizens=%d units=%d"
-#~ msgstr "jugadors=%d ciutats=%d ciutadans=%d unitats=%d"
-
-#~ msgid "Ferry system is no longer in debug mode."
-#~ msgstr "Ja no es depura el sistema de ferry."
-
-#~ msgid "Ferry system in debug mode."
-#~ msgstr "Depurant el sistema de ferry."
-
-#~ msgid ""
-#~ "String value too long.  Usage:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Valor de cadena massa llarg. Ús:\n"
-#~ "%s"
-
-#~ msgid "Only the player name form is allowed."
-#~ msgstr "Només es permet el format de nom de jugador."
-
-#~ msgid "Reassigned nation to %s by server console."
-#~ msgstr "Nació reassignada a %s per la consola del servidor."
-
-#~ msgid "Reassigned nation to %s by %s."
-#~ msgstr "Nació reassignada a %s per %s."
-
-#~ msgid "Command: %s  -  %s"
-#~ msgstr "Comanda: %s -  %s"
-
-#~ msgid "Command: %s"
-#~ msgstr "Comanda: %s"
-
-#~ msgid "%s cannot move that far from the coast line."
-#~ msgstr "%s no pot moure's tan lluny de la costa."
-
-#~ msgid "Unit cannot perform diplomatic action from %s."
-#~ msgstr "La unitat no pot dur a terme l'acció diplomàtica des de %s."
-
-#~ msgid ""
-#~ "The server appears to have gotten into an infinite loop in the allocation "
-#~ "of starting positions.\n"
-#~ "Maybe the number of players is too high for this map."
-#~ msgstr ""
-#~ "El servidor sembla que ha entrat en un bucle infinit mentre situava les "
-#~ "posicions inicials.\n"
-#~ "Potser hi ha massa jugadors per aquest mapa."
-
-#~ msgid "Proceeding with sound support disabled."
-#~ msgstr "Es continua amb el suport de so desactivat."
-
-#~ msgid "Perhaps there is some misconfiguration or bad permissions."
-#~ msgstr "Potser hi ha quelcom mal configurat o permisos incorrectes."
-
-#~ msgid "Now ... Go give 'em hell!"
-#~ msgstr "Ara.. Desperta ferro!!!"
-
-#~ msgid "Specialists: %s"
-#~ msgstr "Especialistes: %s"
-
-#~ msgid ""
-#~ "Requires the %s technology.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Requereix la tecnologia %s.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Requires the %s government.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Requereix el govern %s.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Requires the %s building.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Requereix l'edifici %s.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Requires the %s terrain special.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Requereix que el terreny tingui %s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Requires the %s terrain.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Requereix el terreny %s.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Requires the %s nation.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Requereix la nació %s.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Only applies to %s units.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Només s'aplica a unitats %s.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Only applies to \"%s\" units.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Només s'aplica a unitats \"%s\".\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Applies only to %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "S'aplica només a %s.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Requires a minimum size of %d.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Requereix una mida mínima de %d.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Requires AI player of level %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Requereix jugador IA de nivell %s.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Requires %s terrain.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Requereix el terreny %s.\n"
-#~ "\n"
-
-#~ msgid "* Belongs to %s units class.\n"
-#~ msgstr "* Pertany a la classe d'unitats %s.\n"
-
-#~ msgid "  * Can occupy empty enemy cities.\n"
-#~ msgstr "* Pot ocupar ciutats enemigues buides.\n"
-
-#~ msgid "  * Speed is not affected by terrain.\n"
-#~ msgstr "  * El terreny no afecta la seva velocitat.\n"
-
-#~ msgid "  * Slowed down while damaged\n"
-#~ msgstr "  * S'alenteix quan és ferida\n"
-
-#~ msgid "  * Gets used up in making an attack.\n"
-#~ msgstr "* Es consumeix en fer un atac.\n"
-
-#~ msgid "  * Is unreachable. Most units cannot attack this one.\n"
-#~ msgstr "  * És inabastable. La majoria d'unitats no la poden atacar.\n"
-
-#~ msgid "* Only barbarians may build this.\n"
-#~ msgstr "* Només els bàrbars ho poden construir.\n"
-
-#~ msgid "* Can carry and refuel %d unit from classes:\n"
-#~ msgid_plural "* Can carry and refuel up to %d units from classes:\n"
-#~ msgstr[0] ""
-#~ "* Pot transportar i carregar combustible a %d unitat de les següents "
-#~ "classes:\n"
-#~ msgstr[1] ""
-#~ "* Pot transportar i carregar combustible a %d unitats de les següents "
-#~ "classes:\n"
-
-#~ msgid "  * %s units\n"
-#~ msgstr "  * Unitats %s\n"
-
-#~ msgid ""
-#~ "* May be disbanded in a city to recover 50% of the production cost.\n"
-#~ msgstr ""
-#~ "* Pot ser desmantellat en una ciutat per recuperar el 50% del cost de "
-#~ "producció.\n"
-
-#~ msgid "* May fortify, granting a 50% defensive bonus.\n"
-#~ msgstr "* Pot fortificar-se, rebent una bonificació defensiva del 50%.\n"
-
-#~ msgid "* Can attack otherwise unreachable enemy units.\n"
-#~ msgstr ""
-#~ "* Pot atacar unitats enemigues que altrament serien inaccessibles.\n"
-
-#~ msgid "* Counts as 'helicopter' against certain attackers.\n"
-#~ msgstr "* Compta com a 'helicòpter' contra certs atacants.\n"
-
-#~ msgid "* Very good at attacking 'helicopter' units.\n"
-#~ msgstr "* Molt bo per atacar unitats 'helicòpter'.\n"
-
-#~ msgid "* Very bad at attacking AEGIS units.\n"
-#~ msgstr "* Molt dolent per atacar unitats AEGIS.\n"
-
-#~ msgid ""
-#~ "* Will be built as a veteran in cities with appropriate training "
-#~ "facilities (see Airport).\n"
-#~ msgstr ""
-#~ "* Es construirà com a veterà en ciutats que tinguin instal·lacions "
-#~ "apropiades (veure Aeroport).\n"
-
-#~ msgid "* May be promoted after defeating an enemy unit.\n"
-#~ msgstr "* Pot promocionar-se a veterà si guanya una unitat enemiga.\n"
-
-#~ msgid "* Will be built as a veteran under communist governments.\n"
-#~ msgstr "* Es construirà com a veterà sota governs comunistes.\n"
-
-#~ msgid "* May be promoted after a successful mission.\n"
-#~ msgstr "* Pot promocionar-se a veterà després d'una missió reeixida.\n"
-
-#~ msgid ""
-#~ "* Will be built as a veteran in cities with appropriate training "
-#~ "facilities (see Barracks).\n"
-#~ msgstr ""
-#~ "* Es construirà com a veterà en ciutats que tinguin instal·lacions "
-#~ "apropiades (veure Caserna).\n"
-
-#~ msgid ""
-#~ "* Will be built as a veteran in cities with appropriate training "
-#~ "facilities (see Port Facility).\n"
-#~ msgstr ""
-#~ "* Es construirà com a veterà en ciutats que tinguin instal·lacions "
-#~ "apropiades (veure Instal·lació de Port).\n"
-
-#~ msgid "* May be promoted after survival on the high seas.\n"
-#~ msgstr "* Pot promocionar-se si sobreviu en alta mar.\n"
-
-#~ msgid "* May be promoted through combat or training\n"
-#~ msgstr "* Pot guanyar experiència mitjançant combat o entrenament.\n"
-
-#~ msgid ""
-#~ "* Must end turn in a city or next to land, or has a 50% risk of being "
-#~ "lost at sea.\n"
-#~ msgstr ""
-#~ "* Ha d'acabar el torn en una ciutat o prop de la costa, o té el 50% de "
-#~ "possibilitats de perdre's al mar.\n"
-
-#~ msgid ""
-#~ "* Each of your cities will avoid paying %d %s upkeep for your units.\n"
-#~ msgstr ""
-#~ "* Cadascuna de les teves unitats evitarà de pagar %d d'%s per al "
-#~ "manteniment de la unitat.\n"
-
-#~ msgid "* Each of your cities will avoid paying %d upkeep for your units.\n"
-#~ msgstr ""
-#~ "* Cadascuna de les teves ciutats evitarà de pagar %d de manteniment per "
-#~ "lesunitats.\n"
-
-#~ msgid "* If you lose your capital, chance of civil war is %d%%.\n"
-#~ msgstr ""
-#~ "* Si perds la capital, la probabilitat de guerra civil és del %d%%.\n"
-
-#~ msgid ""
-#~ "* When you have %d cities, the first unhappy citizen will appear in each "
-#~ "city due to civilization size.\n"
-#~ msgstr ""
-#~ "* Quan tinguis %d ciutats, apareixerà el primer ciutadà descontent a cada "
-#~ "ciutat degut a la mida de la civilització.\n"
-
-#~ msgid ""
-#~ "* After the first unhappy citizen due to civilization size, for each %d "
-#~ "additional cities another unhappy citizen will appear.\n"
-#~ msgstr ""
-#~ "* Després del primer ciutadà descontent degut a la mida de la "
-#~ "civilització, per cada %d ciutats addicionals, n'apareixerà un altre.\n"
-
-#~ msgid ""
-#~ "* The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
-#~ msgstr ""
-#~ "* La taxa màxima que pots fixar per ciència, or o luxes és del %d%%.\n"
-
-#~ msgid "* Has unlimited science/gold/luxuries rates.\n"
-#~ msgstr "* No té cap límit per les taxes de ciència/or/luxes.\n"
-
-#~ msgid ""
-#~ "* You may grow your cities by means of celebrations. Your cities must be "
-#~ "at least size %d.\n"
-#~ msgstr ""
-#~ "* Pots fer que les teves ciutats creixin a base de festes. Les teves "
-#~ "ciutats han de ser almenys de mida %d.\n"
-
-#~ msgid ""
-#~ "* If any city is in disorder for more than two turns in a row, government "
-#~ "will fall into anarchy.\n"
-#~ msgstr ""
-#~ "* Si qualsevol ciutat roman en desordre durant meÅ› de dos torns seguits, "
-#~ "el govern caurà en l'anarquia.\n"
-
-#~ msgid ""
-#~ "* Each worked tile that gives more than %d %s will suffer a -1 penalty "
-#~ "unless celebrating.\n"
-#~ msgstr ""
-#~ "* Cada casella treballada que doni més de %d punts de %s tindrà una "
-#~ "penalització de -1 si la ciutat no està en festa.\n"
-
-#~ msgid ""
-#~ "* Each worked tile with at least 1 %s will yield %d more of it while "
-#~ "celebrating.\n"
-#~ msgstr ""
-#~ "* Cada casella treballada que tingui almenys 1 punt de %s en donarà %d de "
-#~ "més quan s'estigui en festa.\n"
-
-#~ msgid "Font"
-#~ msgstr "Font"
-
-#~ msgid "You were rejected from the game: %s"
-#~ msgstr "Has estat refusat de la partida: %s"
-
-#~ msgid "R.I.P."
-#~ msgstr "R.I.P."
-
-#~ msgid "?clistlast:, and %s"
-#~ msgstr ", i %s"
-
-#~ msgid "?clistlast: and %s"
-#~ msgstr " i %s"
-
-#~ msgid "Loading tileset \"%s\"."
-#~ msgstr "S'està carregant el joc de caselles \"%s\"."
-
-#~ msgid "Client does not support isometric tilesets."
-#~ msgstr "EL client no suporta jocs de caselles isomètrics."
-
-#~ msgid "Using default tileset instead."
-#~ msgstr "Es farà servir el joc de caselles per defecte."
-
-#~ msgid "Client does not support overhead view tilesets."
-#~ msgstr "EL client no suporta jocs de caselles zenitals."
-
-#~ msgid "Paths longer than 99 turns are not supported."
-#~ msgstr "No se suporten camins de més de 99 torns."
-
-#~ msgid "clear all"
-#~ msgstr "netejar tot"
-
-#~ msgid "Known"
-#~ msgstr "Conegut"
-
-#~ msgid "Toggle"
-#~ msgstr "Commutar"
-
-#~ msgid "Paint"
-#~ msgstr "Pintar"
-
-#~ msgid "Player"
-#~ msgstr "Jugador"
-
-#~ msgid "Activity"
-#~ msgstr "Activitat"
-
-#~ msgid "Activity Target"
-#~ msgstr "Objectiu d'activitat"
-
-#~ msgid "Activity Count"
-#~ msgstr "Nombre d'Activitats"
-
-#~ msgid "Owner"
-#~ msgstr "Amo"
-
-#~ msgid "Editing Tools"
-#~ msgstr "Eines d'Edició"
-
-#~ msgid "Select _all"
-#~ msgstr "Seleccionar tots"
-
-#~ msgid "Edit Nation"
-#~ msgstr "Editar Nació"
-
-#~ msgid "City Label"
-#~ msgstr "Nom de ciutat"
-
-#~ msgid "FIXME"
-#~ msgstr "ERROR"
-
-#~ msgid "Notify Label"
-#~ msgstr "Etiqueta de Notificació"
-
-#~ msgid "Spaceship Label"
-#~ msgstr "Etiqueta de Nau espacial"
-
-#~ msgid "Help Label"
-#~ msgstr "Etiqueta d'Ajuda"
-
-#~ msgid "Help Link"
-#~ msgstr "Enllaç d'Ajuda"
-
-#~ msgid "Help Text"
-#~ msgstr "Text d'Ajuda"
-
-#~ msgid "Chatline Area"
-#~ msgstr "Àrea de xat"
-
-#~ msgid "Beta Label"
-#~ msgstr "Etiqueta Beta"
-
-#~ msgid "Small Font"
-#~ msgstr "Tipus de lletra petita"
-
-#~ msgid "Comment Label"
-#~ msgstr "Etiqueta de Comentari"
-
-#~ msgid "<%s AI>"
-#~ msgstr "<IA %s>"
-
-#~ msgid "_Options"
-#~ msgstr "_Opcions"
-
-#~ msgid "_Local Client"
-#~ msgstr "Client _Local"
-
-#~ msgid "_Message"
-#~ msgstr "_Missatge"
-
-#~ msgid "_Remote Server"
-#~ msgstr "_Servidor Remot"
-
-#~ msgid "Save Options _Now"
-#~ msgstr "_Desar Opcions Ara"
-
-#~ msgid "_Edit"
-#~ msgstr "_Edita"
-
-#~ msgid "Editing _Mode"
-#~ msgstr "_Mode d'Edició"
-
-#~ msgid "Editing _Tools"
-#~ msgstr "_Eines d'Edició"
-
-#~ msgid "Recalculate _Borders"
-#~ msgstr "Recalcular _Fronteres"
-
-#~ msgid "Regenerate _Water"
-#~ msgstr "Regenerar _Aigua"
-
-#~ msgid "Select same type in tile"
-#~ msgstr "Triar el tipus igual dins la casella"
-
-#~ msgid "_Editor"
-#~ msgstr "_Editor"
-
-#~ msgid "_Edit Nation..."
-#~ msgstr "_Editar Nació..."
-
-#~ msgid "Unable to initialize SDL_ttf library: %s"
-#~ msgstr "No s'ha pogut inicialitzar la llibreria SDL_ttf: %s"
-
-#~ msgid "Making screenshot %s"
-#~ msgstr "Fent foto de pantalla %s"
-
-#~ msgid "Never"
-#~ msgstr "Mai"
-
-#~ msgid ""
-#~ "The SDL event buffer is full; you may see drawing errors as a result."
-#~ msgstr ""
-#~ "El búfer de successos SDL és ple; pot ser que vegis errors de dibuix per "
-#~ "això."
-
-#~ msgid "Loading theme \"%s\"."
-#~ msgstr "Carregant el tema \"%s\"."
-
-#~ msgid "Editing Mode"
-#~ msgstr "Mode d'Edició"
-
-#~ msgid "Tools"
-#~ msgstr "Eines"
-
-#~ msgid "Editor"
-#~ msgstr "Editor"
-
-#~ msgid ""
-#~ "If you find any bugs, then please send us a bug report.  This is best "
-#~ "done by visiting the Freeciv Bug Tracking System, at:"
-#~ msgstr ""
-#~ "Si trobes algun error, si us plau envia'ns-en un informe. La millor "
-#~ "manera de fer-ho és visitant el Sistema de Seguiment d'Errors de Freeciv, "
-#~ "a:"
-
-#~ msgid ""
-#~ "Freeciv supports several local languages.  See the Native Language "
-#~ "Support section of the README file for instructions on how to use one of "
-#~ "these languages.\n"
-#~ "\n"
-#~ "First, check whether a localization is already in progress for your "
-#~ "language:"
-#~ msgstr ""
-#~ "Freeciv suporta diverses llengües. Vegeu la secció de \"Suport de "
-#~ "Llenguatge Nadiu\" del fitxer README.ca per instruccions sobre com "
-#~ "utilitzar una d'aquestes llengües. \n"
-#~ "\n"
-#~ "Primer de tot, comprova si ja hi ha una localització en curs per la teva "
-#~ "llengua:"
-
-#~ msgid ""
-#~ "If you would like to add a localization (translation) for your language, "
-#~ "please see the instructions at:"
-#~ msgstr ""
-#~ "Si vols afegir una localització (traducció) per la teva llengua, llegeix "
-#~ "les instruccions a:"
-
-#~ msgid ""
-#~ "You are also welcome to send any questions to the translation mailing "
-#~ "list:"
-#~ msgstr ""
-#~ "També pots enviar qualsevol pregunta a la llista de correu dels "
-#~ "traductors:"
-
-#~ msgid ""
-#~ "The client can fetch this page, too: use the Metaserver button in the "
-#~ "connection dialog.  If it never shows any results, check whether your WWW "
-#~ "browser is using a HTTP proxy; to make civclient use the same proxy, "
-#~ "before starting civclient, set the $http_proxy environment variable to:"
-#~ msgstr ""
-#~ "El client també pot agafar aquesta pàgina: fes servir el botó Metaserver "
-#~ "del diàleg de connexió. Si no mostra mai cap resultat, comprova si el teu "
-#~ "navegador fa servir un proxy HTTP; per fer que civclient faci servir el "
-#~ "mateix proxy, cal fer que la variable d'entorn $http_proxy valgui:"
-
-#~ msgid ""
-#~ "Main Map (Keys):\n"
-#~ "================\n"
-#~ "    Shift-home: center on capital\n"
-#~ "  Shift-arrows: scroll map\n"
-#~ "        Ctrl-G: show grid lines on/off\n"
-#~ "        Ctrl-B: show national borders on/off\n"
-#~ "        Ctrl-N: show city names on/off\n"
-#~ "        Ctrl-R: show city growth on/off\n"
-#~ "        Ctrl-P: show city production on/off\n"
-#~ msgstr ""
-#~ "Mapa Principal (Tecles):\n"
-#~ "====================\n"
-#~ "      Maj-Inici: centrar a la capital\n"
-#~ "  Maj-fletxes: desplaçar mapa\n"
-#~ "         Ctrl-G: mostrar línies de graella o no\n"
-#~ "         Ctrl-B: mostrar fronteres nacionals o no\n"
-#~ "         Ctrl-N: mostrar noms de ciutats o no\n"
-#~ "         Ctrl-R: mostrar creixement de ciutat o no\n"
-#~ "         Ctrl-P: mostrar producció de ciutat o no\n"
-
-#~ msgid ""
-#~ "Main Map (Mouse):\n"
-#~ "=================\n"
-#~ "  Left-click on city:          Pop up city dialog\n"
-#~ "  Left-click on unit:          Activate unit\n"
-#~ "  Left-click-and-drag on unit: Goto command for unit\n"
-#~ "  Center-click:                Show tile info\n"
-#~ "  Right-click:                 Center tile in view\n"
-#~ "\n"
-#~ "  Shift-Left-click:            Copy production (GTK)\n"
-#~ "  Shift-Right-click on city:   Paste production into city (GTK)\n"
-#~ "\n"
-#~ "  Shift-Control-Left-click:    Adjust city workers\n"
-#~ "  Control-Center-click:        Wake up sentried units\n"
-#~ "  Shift-Control-Right-click:   Show city workers (mouse over or near "
-#~ "city)\n"
-#~ "\n"
-#~ "  Area Selection mode (GTK):\n"
-#~ "  ==========================\n"
-#~ "  Right-click-and-drag: Enter Area Selection mode\n"
-#~ "  Left-click:           Toggle tile highlighting\n"
-#~ "  Shift-Right-click:    Paste production into highlighted cities\n"
-#~ "  Right-click:          Cancel Area Selection mode\n"
-#~ "\n"
-#~ "  The cities that become highlighted on the map,\n"
-#~ "  will also be highlighted in the City Report."
-#~ msgstr ""
-#~ "Mapa Principal (Ratolí):\n"
-#~ "====================\n"
-#~ "  Clic esquerre a ciutat:         Obrir diàleg de ciutat\n"
-#~ "  Clic esquerre a unitat:         Activar unitat\n"
-#~ "  Clic esquerre i arrossegar a unitat: Desplaçar unitat\n"
-#~ "  Clic al mig:                           Mostrar informació de casella\n"
-#~ "  Clic dret:                              Centrar casella en vista\n"
-#~ "\n"
-#~ "  Maj-Clic esquerre:               Copiar producció (GTK)\n"
-#~ "  Maj-Clic dret a ciutat:          Enganxar producció en ciutat (GTK)\n"
-#~ "\n"
-#~ "  Maj-Ctrl-Clic esquerre:         Afinar treballadors de ciutat\n"
-#~ "  Ctrl-Clic al mig:                     Despertar unitats en sentinella\n"
-#~ "  Maj-Ctrl-Clic dret:                 Mostrar treballadors de ciutat "
-#~ "(ratolí sobre o vora ciutat)\n"
-#~ "\n"
-#~ "  Mode de Selecció d'àrea (GTK):\n"
-#~ "  ================================\n"
-#~ "  Clic dret i arrossegar: Entrar en mode de selecció d'àrea\n"
-#~ "  Clic esquerre:             Commutar la marcació de casella\n"
-#~ "  Maj-Clic dret:               Enganxar producció sobre ciutats marcades\n"
-#~ "  Clic-dret:                     Cancel·lar mode de selecció d'àrea\n"
-#~ "\n"
-#~ "  Les ciutats que es marquen sobre el mapa, també\n"
-#~ "  quedaran marcades a l'informe de Ciutats."
-
-#~ msgid ""
-#~ "Dialogs and Reports:\n"
-#~ "====================\n"
-#~ "     F1: show Map View\n"
-#~ "     F2: open Unit Report\n"
-#~ "     F3: open Nations Report\n"
-#~ "     F4: open City Report\n"
-#~ "     F5: open Economy Report\n"
-#~ "     F6: open Research Report\n"
-#~ "     F7: open World Wonders\n"
-#~ "     F8: open Top Five Cities\n"
-#~ "     F9: open Messages dialog\n"
-#~ "    F11: open Demographics\n"
-#~ "    F12: open Spaceship\n"
-#~ "\n"
-#~ "      T: open Tax/Lux/Sci Rates dialog\n"
-#~ "      F: open Find City dialog\n"
-#~ " Ctrl-L: open Worklists dialog\n"
-#~ "      R: open Revolution dialog\n"
-#~ "\n"
-#~ "Shift-Return: Turn done"
-#~ msgstr ""
-#~ "Diàlegs i Informes:\n"
-#~ "=====================\n"
-#~ "     F1: Mostrar Vista de Mapa\n"
-#~ "     F2: obrir Informe d'Unitats\n"
-#~ "     F3: obrir Informe de Nacions\n"
-#~ "     F4: obrir Informe de Ciutats\n"
-#~ "     F5: obrir Informe d'Economia\n"
-#~ "     F6: obrir Informe de Recerca\n"
-#~ "     F7: obrir Meravelles del Món\n"
-#~ "     F8: obrir Millors Cinc Ciutats\n"
-#~ "     F9: obrir diàleg de Missatges\n"
-#~ "    F11: obrir Demografia\n"
-#~ "    F12: obrir Nau Espacial\n"
-#~ "\n"
-#~ "      T: obrir diàleg Impostos/Luxe/Ciència\n"
-#~ "      F: obrir diàleg per trobar Ciutat\n"
-#~ " Ctrl-L: obrir diàleg de Llistes de Treball\n"
-#~ "      R: obrir diàleg de Revolució\n"
-#~ "\n"
-#~ "Maj-Retorn: Torn acabat"
-
-#~ msgid ""
-#~ " 9. Making your own strategy for the game.\n"
-#~ "\n"
-#~ "    These basic concepts will allow you to play the game pretty well, "
-#~ "especially in the beginning of the game.  But to improve, you need to "
-#~ "study the various units and advances, and PRACTICE, PRACTICE, PRACTICE!  "
-#~ "Freeciv has many twists, so if you haven't played a similar game before, "
-#~ "try consulting the Freeciv WWW pages at:"
-#~ msgstr ""
-#~ " 9. Decidir una estratègia de joc pròpia.\n"
-#~ "\n"
-#~ "    Aquests conceptes bàsics et permetran de jugar força bé, especialment "
-#~ "al començament de la partida. Però per millorar, has d'estudiar les "
-#~ "diferents unitats i avenços, i PRACTICAR, PRACTICAR, PRACTICAR!  Freeciv "
-#~ "té molts trucs, per tant, si no has jugat mai en un joc com aquest, prova "
-#~ "de consultar la web de Freeciv a:"
-
-#~ msgid ""
-#~ "You'll find more tips for playing, and details of how to contact other "
-#~ "players."
-#~ msgstr ""
-#~ "Hi trobaràs més consells per jugar, i detalls sobre com contactar amb "
-#~ "d'altres jugadors."
-
-#~ msgid ""
-#~ "     To have a diplomatic relationship with another player, you must "
-#~ "establish contact with that player. Contact occurs whenever one of your "
-#~ "units is within sight of a city or unit belonging to another player, or "
-#~ "vice versa. Unless you establish an embassy with that player, you may "
-#~ "again lose contact with them a set number of turns after most recent "
-#~ "contact."
-#~ msgstr ""
-#~ "     Per tenir una relació diplomàtica amb un altre jugador, primer has "
-#~ "d'establir contacte amb aquest jugador. Es considera que hi ha contacte "
-#~ "quan una de les teves unitats és al costat d'una ciutat o unitat que "
-#~ "pertanyi a un altre jugador, o viceversa. Si no estableixes una ambaixada "
-#~ "amb aquest jugador, pot ser que hi perdis el contacte al cap d'un nombre "
-#~ "donat de torns sense contacte físic directe."
-
-#~ msgid ""
-#~ "     The diplomatic state between players defaults to War. During War, "
-#~ "you can freely move your units inside enemy territory and attack their "
-#~ "units and cities at will."
-#~ msgstr ""
-#~ "     L'estat diplomàtic entre jugadors és, d'entrada, la Guerra. En estat "
-#~ "de Guerra, pots moure lliurement les teves unitats dins de territori "
-#~ "enemic i atacar les seves unitats i ciutats a voluntat."
-
-#~ msgid ""
-#~ "     At the moment two players enter into the diplomatic state of Peace, "
-#~ "all units belonging to either player that happen to be within the other's "
-#~ "borders will be automatically disbanded according to the treaty. After "
-#~ "this, you may not move units into the other's territory until you either "
-#~ "declare War, or forge an Alliance. Breaking a Peace treaty will drop you "
-#~ "directly back to War."
-#~ msgstr ""
-#~ "     En el moment que dos jugadors entren en l'estat diplomàtic de Pau, "
-#~ "totes les unitats de qualsevol dels dos jugadors que es trobin dins de "
-#~ "les fronteres de l'altre seran desmantellades automàticament segons el "
-#~ "tractat. Després d'això, no pots moure unitats cap al territori de "
-#~ "l'altre fins que o bé declaris la Guerra, o estableixis una Aliança. "
-#~ "Trencar un tractat de Pau et retornarà directament a la Guerra."
-
-#~ msgid ""
-#~ "     An Alliance is the ultimate diplomatic relationship between two "
-#~ "players. In this state, you may move units into each other's cities and "
-#~ "your units may share the same square. An allied AI player will freely "
-#~ "give you its world maps, shared vision, as well as seriously consider "
-#~ "trading technologies and cities. The only drawback with an alliance is "
-#~ "that it will draw you into any wars your ally enters against other "
-#~ "players. Breaking an Alliance will drop you to an Armistice treaty."
-#~ msgstr ""
-#~ "     Una Aliança és la relació diplomàtica més íntima entre dos jugadors. "
-#~ "En aquest estat, podeu moure unitats dins de les ciutats de l'altre, i "
-#~ "les vostres unitats poden compartir la mateixa casella. Un jugador IA "
-#~ "aliat et donarà sense problemes el seu mapa mundial, la visió compartida, "
-#~ "i a més considerarà seriosament intercanviar tecnologies i ciutats. "
-#~ "L'única pega d'una aliança és que t'arrossegarà a qualsevol guerra que el "
-#~ "teu aliat pugui començar amb altres jugadors. Trencar una aliança et "
-#~ "deixarà en un tractat d'Armistici."
-
-#~ msgid ""
-#~ "Gives one extra food resource on all Oceanic squares.  The city needs to "
-#~ "be coastal to build this improvement."
-#~ msgstr ""
-#~ "Augmenta en un el menjar produït per les caselles d'Oceà. La ciutat ha de "
-#~ "ser a la costa per poder construir aquest edifici."
-
-#~ msgid ""
-#~ "Reduces the amount of pollution generated by production in a city by "
-#~ "50%.  It also increases the shield production of a Factory or Mfg. Plant "
-#~ "in the city: a Factory and a Hydro Plant together give a 75% production "
-#~ "bonus, and a Factory, Mfg. Plant and Hydro Plant together give a 150% "
-#~ "production bonus.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant.  A city can only build a Hydro Plant if it is next to (or "
-#~ "on) a Mountain or River tile."
-#~ msgstr ""
-#~ "Redueix la quantitat de contaminació generada per la producció d'una "
-#~ "ciutat en un 50%. També augmenta la producció d'escuts d'una Fàbrica o "
-#~ "Planta de Fabricació que hi hagi a la ciutat: una Fàbrica i una Central "
-#~ "Hidroelèctrica juntes donen una bonificació de producció del 75%, i una "
-#~ "Fàbrica, Planta de Fabricació i Central Hidroelèctrica juntes donen una "
-#~ "bonificació de producció del 150%.\n"
-#~ "\n"
-#~ "Una ciutat només pot tenir una Central: Hidroelèctrica, Tèrmica, Nuclear "
-#~ "o Solar. Una ciutat només pot construir una Central Hidroelèctrica si és "
-#~ "al costat (o a sobre) d'una casella de Muntanya o Riu."
-
-#~ msgid ""
-#~ "Reduces the amount of pollution generated by production in a city by "
-#~ "50%.  It also increases the shield production of a Factory or Mfg. Plant "
-#~ "in the city: a Factory and a Nuclear Plant together give a 75% production "
-#~ "bonus, and a Factory, Mfg. Plant and Nuclear Plant together give a 150% "
-#~ "production bonus.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Redueix la quantitat de contaminació generada per la producció d'una "
-#~ "ciutat en un 50%. També augmenta la producció d'escuts d'una Fàbrica o "
-#~ "Planta de Fabricació de la ciutat: una Fàbrica i una Central Nuclear "
-#~ "juntes donen una bonificació de producció del 75%, i una Fàbrica, una "
-#~ "Planta de Fabricació i una Central Nuclear juntes donen una bonificació "
-#~ "de producció del 150%.\n"
-#~ "\n"
-#~ "Una ciutat només pot tenir una Central: Hidroelèctrica, Tèrmica, Nuclear "
-#~ "o Solar."
-
-#~ msgid ""
-#~ "Adds 1 extra shield resource on all Oceanic squares in a city.  The city "
-#~ "needs to be coastal to build this improvement."
-#~ msgstr ""
-#~ "Afegeix un escut extra a totes les caselles d'Oceà de la ciutat. La "
-#~ "ciutat ha de ser a la costa per poder construir aquesta millora."
-
-#~ msgid ""
-#~ "Increases the shield production of a Factory or Mfg. Plant in a city: a "
-#~ "Factory and a Power Plant together give a 75% production bonus, and a "
-#~ "Factory, Mfg. Plant and Power Plant together give a 150% production "
-#~ "bonus.  The extra production may lead to the city generating more "
-#~ "pollution.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Augmenta la producció d'una Fàbrica o Planta de Fabricació d'una ciutat: "
-#~ "una Fàbrica i una Central Tèrmica juntes donen una bonificació de "
-#~ "producció del 75%, i una Fàbrica, una Planta de Fabricació i Central "
-#~ "Tèrmica juntes donen una bonificació de producció del 150%. La producció "
-#~ "addicional pot fer que la ciutat generi més contaminació.\n"
-#~ "\n"
-#~ "Una ciutat només pot tenir una Central: Hidroelèctrica, Tèrmica, Nuclear "
-#~ "o Solar."
-
-#~ msgid ""
-#~ "Eliminates all pollution generated by production in a city. It also "
-#~ "increases the shield production of a Factory or Mfg. Plant in the city: a "
-#~ "Factory and a Solar Plant together give a 75% production bonus, and a "
-#~ "Factory, Mfg. Plant and Solar Plant together give a 150% production "
-#~ "bonus.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Elimina tota la contaminació generada per producció en una ciutat. També "
-#~ "augmenta la producció d'escuts d'una Fàbrica o Planta de Fabricació de la "
-#~ "ciutat: una Fàbrica i una Central Solar juntes donen una bonificació del "
-#~ "75% de producció, i una Fàbrica, Planta de Fabricació i Central Solar "
-#~ "juntes dóna una bonificació de producció del 150%.\n"
-#~ "\n"
-#~ "Una ciutat només pot tenir una Central: Solar, Hidroelèctrica, Tèrmica, o "
-#~ "Nuclear."
-
-#~ msgid ""
-#~ "Gives all your sea units 1 additional movement point. Makes all your new "
-#~ "sea units veterans (for all your cities)."
-#~ msgstr ""
-#~ "Dóna a totes les teves unitats marítimes 1 punt addicional de moviment. "
-#~ "Fa que totes les noves unitats marítimes siguin veteranes (per totes les "
-#~ "teves ciutats)."
-
-#~ msgid ""
-#~ "Reduces the amount of pollution generated by production in a city by "
-#~ "50%.  It also increases the shield production of a Factory or Mfg. Plant "
-#~ "in the city: a Factory and a Hydro Plant together give a 100% production "
-#~ "bonus, and a Factory, Mfg. Plant and Hydro Plant together give a 150% "
-#~ "production bonus.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant.  A city can only build a Hydro Plant if it is next to (or "
-#~ "on) a Mountain or River tile."
-#~ msgstr ""
-#~ "Redueix la quantitat de contaminació generada per la producció d'una "
-#~ "ciutat en un 50%. També augmenta la producció d'escuts d'una Fàbrica o "
-#~ "Planta de Fabricació de la ciutat: una Fàbrica i una Central "
-#~ "Hidroelèctrica juntes donen una bonificació del 100% de producció, i una "
-#~ "Fàbrica, Planta de Fabricació i Central Hidroelèctrica juntes donen una "
-#~ "bonificació de producció del 150%.\n"
-#~ "\n"
-#~ "Una ciutat només pot tenir una Central: Hidroelèctrica, Tèrmica, Nuclear "
-#~ "o Solar. Una ciutat només pot construir una Central Hidroelèctrica si és "
-#~ "al costat (o a sobre) d'una casella de Muntanya o Riu."
-
-#~ msgid ""
-#~ "Reduces the amount of pollution generated by production in a city by "
-#~ "50%.  It also increases the shield production of a Factory or Mfg. Plant "
-#~ "in the city: a Factory and a Nuclear Plant together give a 100% "
-#~ "production bonus, and a Factory, Mfg. Plant and Nuclear Plant together "
-#~ "give a 150% production bonus.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Redueix la quantitat de contaminació generada per la producció d'una "
-#~ "ciutat en un 50%. També augmenta la producció d'escuts d'una Fàbrica o "
-#~ "Planta de Fabricació de la ciutat: una Fàbrica i una Central Nuclear "
-#~ "juntes donen una bonificació del 100% de producció, i una Fàbrica, Planta "
-#~ "de Fabricació i Central Nuclear juntes donen una bonificació de producció "
-#~ "del 150%.\n"
-#~ "\n"
-#~ "Una ciutat només pot tenir una Central: Hidroelèctrica, Tèrmica, Nuclear "
-#~ "o Solar."
-
-#~ msgid ""
-#~ "Increases the shield production of a Factory or Mfg. Plant in a city: a "
-#~ "Factory and a Power Plant together give a 100% production bonus, and a "
-#~ "Factory, Mfg. Plant and Power Plant together give a 150% production "
-#~ "bonus.  The extra production may lead to the city generating more "
-#~ "pollution.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Augmenta la producció d'escuts d'una Fàbrica o Planta de Fabricació de la "
-#~ "ciutat: una Fàbrica i una Central Tèrmica juntes donen una bonificació "
-#~ "del 100% de producció, i una Fàbrica, Planta de Fabricació i Central "
-#~ "Hidroelèctrica juntes donen una bonificació de producció del 150%. La "
-#~ "producció addicional pot fer que la ciutat generi més contaminació.\n"
-#~ "\n"
-#~ "Una ciutat només pot tenir una Central: Hidroelèctrica, Tèrmica, Nuclear "
-#~ "o Solar."
-
-#~ msgid ""
-#~ "Eliminates all pollution generated by production in a city. It also "
-#~ "increases the shield production of a Factory or Mfg. Plant in the city: a "
-#~ "Factory and a Solar Plant together give a 100% production bonus, and a "
-#~ "Factory, Mfg. Plant and Solar Plant together give a 150% production "
-#~ "bonus.\n"
-#~ "\n"
-#~ "A city can only have one Power Plant, Hydro Plant, Nuclear Plant, or "
-#~ "Solar Plant."
-#~ msgstr ""
-#~ "Elimina tota la contaminació generada per producció en una ciutat. També "
-#~ "augmenta la producció d'escuts d'una Fàbrica o Planta de Fabricació de la "
-#~ "ciutat: una Fàbrica i una Central Solar juntes donen una bonificació del "
-#~ "100% de producció, i una Fàbrica, Planta de Fabricació i Central Solar "
-#~ "juntes donen una bonificació de producció del 150%.\n"
-#~ "\n"
-#~ "Una ciutat només pot tenir una Central: Solar, Hidroelèctrica, Tèrmica, o "
-#~ "Nuclear."
-
-#~ msgid ""
-#~ "Gives all your sea units 1 additional movement point. Makes all your new "
-#~ "sea units veterans (for all cities)."
-#~ msgstr ""
-#~ "Dóna a totes les teves unitats marítimes 1 punt addicional de moviment. "
-#~ "Fa que totes les noves unitats marítimes siguin veteranes (per totes les "
-#~ "ciutats)."
-
-#~ msgid ""
-#~ "Fundamentalism is a form of government organized around a central set of "
-#~ "beliefs. The beliefs, usually religious in nature, form a rigid guideline "
-#~ "for actions and reactions of both the rulers and the people.\n"
-#~ "\n"
-#~ "In a fundamentalist society, the people and the rulers are entirely "
-#~ "devoted to their beliefs, and are usually willing to die to preserve "
-#~ "them.\n"
-#~ "\n"
-#~ "Improvements that normally convert unhappy citizens to content citizens, "
-#~ "produce `tithes' (gold) equivalent to the number of people they would "
-#~ "convert, and require no maintenance."
-#~ msgstr ""
-#~ "El Fonamentalisme és una forma de govern organitzada al voltant d'un "
-#~ "conjunt central de creences. Les creences, normalment de natura "
-#~ "religiosa, formen una guia rígida per les accions i les reaccions tant "
-#~ "dels governants com de la gent.\n"
-#~ "\n"
-#~ "En una societat fonamentalista, la gent i els governants estan dedicats "
-#~ "en cos i ànima a les seves creences, i normalment estan disposats a morir "
-#~ "per conservar-los.\n"
-#~ "\n"
-#~ "Les millores que normalment converteixen ciutadans descontents en "
-#~ "contents, produeixen 'almoines'.(or) equivalents al nombre de gent que "
-#~ "convertirien normalment, i no requereixen manteniment."
-
-#~ msgid ""
-#~ "The %s have acquired %s from ancient scrolls of                      "
-#~ "wisdom."
-#~ msgstr "Els %s han adquirit %s d'antics pergamins."
-
-#~ msgid "Water"
-#~ msgstr "Aigua"
-
-#~ msgid "Lake"
-#~ msgstr "Llac"
-
-#~ msgid "?ocean:Shelf"
-#~ msgstr "Plataforma"
-
-#~ msgid "Briny Deep"
-#~ msgstr "Aigües Profundes"
-
-#~ msgid "?ocean:Abyss"
-#~ msgstr "Regió Abissal"
-
-#~ msgid "Oceanic Ridge"
-#~ msgstr "Serralada Submarina"
-
-#~ msgid "Oceanic Vent"
-#~ msgstr "Volcà submarí"
-
-#~ msgid "Glacial hills"
-#~ msgstr "Turons glaçats"
-
-#~ msgid "Desert hills"
-#~ msgstr "Turons desèrtics"
-
-#~ msgid "Alpine forest"
-#~ msgstr "Bosc Alpí"
-
-#~ msgid "Evergreen forest"
-#~ msgstr "Bosc perenne"
-
-#~ msgid "Deciduous forest"
-#~ msgstr "Bosc caducifoli"
-
-#~ msgid "Deciduous wetland"
-#~ msgstr "Aiguamolls caducifolis"
-
-#~ msgid "Wooded hills"
-#~ msgstr "Turons boscosos"
-
-#~ msgid "Forested hills"
-#~ msgstr "Turons boscosos"
-
-#~ msgid "Tropical rainforest hills"
-#~ msgstr "Turons de selva tropical"
-
-#~ msgid "Heather hills"
-#~ msgstr "Turrons de garriga"
-
-#~ msgid "Verdant hills"
-#~ msgstr "Turons verds"
-
-#~ msgid "Tropical rainforest"
-#~ msgstr "Selva tropical"
-
-#~ msgid "Temperate rainforest"
-#~ msgstr "Selva temperada"
-
-#~ msgid "Glacial peaks"
-#~ msgstr "Cims glacials"
-
-#~ msgid "Temperate rainforest hills"
-#~ msgstr "Turons selvàtics temperats"
-
-#~ msgid "Evergreen swamp"
-#~ msgstr "Aiguamoll Perenne"
-
-#~ msgid "Temperate swamp"
-#~ msgstr "Aiguamoll Temperat"
-
-#~ msgid "Tropical swamp"
-#~ msgstr "Aiguamoll Tropical"
-
-#~ msgid "Alpine tundra"
-#~ msgstr "Tundra Alpina"
-
-#~ msgid "Volcano"
-#~ msgstr "Volcà"
-
-#~ msgid "Volcanic peaks"
-#~ msgstr "Cims volcànics"
-
-#~ msgid ""
-#~ "This unit may be built from the start of the game.  It is the weakest "
-#~ "offensive unit."
-#~ msgstr ""
-#~ "Aquesta unitat es pot construir des de l'inici del joc. És la unitat "
-#~ "ofensiva més dèbil."
-
-#~ msgid ""
-#~ "Partisans are guerilla fighters who are experts at using the terrain to "
-#~ "their advantage.\n"
-#~ "\n"
-#~ "A number of Partisans are granted free when an enemy conquers your city, "
-#~ "but only under these conditions:\n"
-#~ "\n"
-#~ " - Guerilla Warfare must be known by at least 1 player.\n"
-#~ "\n"
-#~ " - You must be the player who originally built the city.\n"
-#~ "\n"
-#~ " - You must know about Communism and Gunpowder.\n"
-#~ "\n"
-#~ " - You must run either a Democracy or a Communist government."
-#~ msgstr ""
-#~ "Els Guerrillers són activistes que són experts en treure partit dels "
-#~ "avantatges del terreny.\n"
-#~ "\n"
-#~ "Se't dóna un nombre indeterminat de Guerrillers de franc quan un enemic "
-#~ "conquereix una ciutat teva, però només sota aquestes condicions:\n"
-#~ "\n"
-#~ " - Al menys un jugador ha de conèixer Guerra de Guerrilles.\n"
-#~ "\n"
-#~ " - Has de ser el jugador que havia fundat la ciutat.\n"
-#~ "\n"
-#~ " - Has de conèixer Comunisme i Pólvora.\n"
-#~ "\n"
-#~ " - Has de tenir un govern demòcrata o comunista."
-
-#~ msgid ""
-#~ "The Mechanized Infantry has the strongest defensive strength of any land "
-#~ "unit, but is only available near the end of the technology tree."
-#~ msgstr ""
-#~ "La Infanteria Mecanitzada és la unitat terrestre amb més força defensiva, "
-#~ "però només està disponible cap al final de l'arbre de tecnologies."
-
-#~ msgid ""
-#~ "An improved Ironclad, with better move rate and vision.\n"
-#~ "\n"
-#~ "TIP:  A very fast unit, which is very useful for hunting down enemy "
-#~ "Transports."
-#~ msgstr ""
-#~ "Una patrullera millorada, amb millors moviment i visió.\n"
-#~ "\n"
-#~ "CONSELL: Unitat molt ràpida, que és molt útil per liquidar els Transports "
-#~ "enemics."
-
-#~ msgid ""
-#~ "Traveling under the surface of the ocean, Submarines have a very high "
-#~ "strategic value, but a weak defense if caught off guard."
-#~ msgstr ""
-#~ "Com que viatgen per sota la superfície de l'oceà, els Submarins tenen un "
-#~ "valor estratègic molt alt, però una defensa molt dèbil si els enxampen "
-#~ "per sorpresa."
-
-#~ msgid ""
-#~ "The Carrier is a mobile airport and cannot attack other units on its "
-#~ "own.\n"
-#~ "\n"
-#~ "TIP:  Guard Carriers with a handful of fast-moving ships and a "
-#~ "battleship, as losing a fully-equipped Carrier is VERY painful and "
-#~ "expensive."
-#~ msgstr ""
-#~ "El Portaavions és un aeroport mòbil i no pot atacar d'altres unitats per "
-#~ "si sol.\n"
-#~ "\n"
-#~ "CONSELL:  Protegeix els teus portaavions amb uns quants vaixells ràpids i "
-#~ "un cuirassat, ja que perdre un portaavions ple és quelcom MOLT car i "
-#~ "dolorós."
-
-#~ msgid ""
-#~ "The Cruise Missile is a long-distance missile that can strike deep into "
-#~ "enemy territory.\n"
-#~ "\n"
-#~ "TIP:  A handful of these can successfully keep the waters around your "
-#~ "treasured homeland free of enemy ships."
-#~ msgstr ""
-#~ "El Míssil de Creuer és un míssil de llarga distància que pot colpejar "
-#~ "territori enemic endins.\n"
-#~ "\n"
-#~ "CONSELL:  Uns quants míssils et poden ajudar a mantenir les aigües "
-#~ "properes a la teva apreciada terra natal lliures de vaixells enemics."
-
-#~ msgid ""
-#~ "A Caravan carries goods or material for trading with foreign countries, "
-#~ "or to help building wonders in your cities.\n"
-#~ "\n"
-#~ "Every Caravan that is used to build a wonder will add 50 shields towards "
-#~ "the production of the wonder.\n"
-#~ "\n"
-#~ "TIP:  You can stockpile a stack of Caravans in advance and bring them all "
-#~ "into a city where you have started to build a wonder, and finish it in "
-#~ "only one turn!"
-#~ msgstr ""
-#~ "Una Caravana porta béns o material per comerciar amb països estrangers, o "
-#~ "per ajudar a construir meravelles a les teves ciutats.\n"
-#~ "\n"
-#~ "Cada caravana que s'usi per construir una meravella afegeix 50 escuts a "
-#~ "la producció de la meravella.\n"
-#~ "\n"
-#~ "CONSELL:  Pots emmagatzemar moltes Caravanes i portar-les totes de cop a "
-#~ "la ciutat on hagis començat a construir una meravella i així acabar-la en "
-#~ "només un torn!"
-
-#~ msgid ""
-#~ "Explorers are brave individuals that are very useful for mapping unknown "
-#~ "territory."
-#~ msgstr ""
-#~ "Els exploradors són individus valents que són molt útils per descobrir el "
-#~ "territori."
-
-#~ msgid ""
-#~ "One Barbarian Leader appears every time there is a barbarian uprising "
-#~ "somewhere in the world.\n"
-#~ "\n"
-#~ "When a Barbarian Leader is killed on a tile without any defending units, "
-#~ "the 100 gold ransom is paid, but only to land units and helicopters."
-#~ msgstr ""
-#~ "Sempre que hi ha un aixecament bàrbar en algun lloc del món, apareix un "
-#~ "Líder Bàrbar.\n"
-#~ "\n"
-#~ "Quan el líder bàrbar es mata en una casella sense unitats defensives, es "
-#~ "paga un rescat de 100 peces d'or, però només a les unitats terrestres i "
-#~ "helicòpters."
-
-#~ msgid ""
-#~ "Fanatics are warriors extremely devoted to a higher cause.\n"
-#~ "\n"
-#~ "Fundamentalist nations can maintain Fanatic units without having to pay "
-#~ "any shields for upkeep."
-#~ msgstr ""
-#~ "Els Fanàtics són guerrers extremadament devots d'una causa superior.\n"
-#~ "\n"
-#~ "Les nacions fonamentalistes poden mantenir unitats de Fanàtics sense "
-#~ "haver de pagar cap escut de manteniment."
-
-#~ msgid ""
-#~ "One Barbarian Leader appears every time there is a barbarian uprising "
-#~ "somewhere in the world.\n"
-#~ "\n"
-#~ "When barbarian leader is killed on a tile without any defending units, "
-#~ "the 100 gold ransom is paid, but only to land units and helicopters."
-#~ msgstr ""
-#~ "Cada vegada que hi ha un aixecament bàrbar en algun lloc del món, apareix "
-#~ "un Líder Bàrbar.\n"
-#~ "\n"
-#~ "Quan el líder bàrbar es mata en una casella sense unitats defensives, es "
-#~ "paga un rescat de 100 peces d'or, però només a les unitats terrestres i "
-#~ "helicòpters."
-
-#~ msgid ""
-#~ "One Barbarian Leader appears every time there is a barbarian uprising "
-#~ "somewhere in the world.\n"
-#~ "\n"
-#~ "When barbarian leader is killed on a tile without any defending units, "
-#~ "the 100 gold ransom is paid, but only to land units."
-#~ msgstr ""
-#~ "Sempre que hi ha un aixecament bàrbar en algun lloc del món, apareix un "
-#~ "Líder Bàrbar.\n"
-#~ "\n"
-#~ "Quan es mata el líder bàrbar en una casella que no tingui unitats "
-#~ "defensives, es paga un rescat de 100 peces d'or, però només a unitats "
-#~ "terrestres."
-
-#~ msgid "?female:Prime Minister"
-#~ msgstr "Primera ministra"
-
-#~ msgid "Ainu"
-#~ msgstr "Ainu"
-
-#~ msgid "?plural:Ainu"
-#~ msgstr "Ainus"
-
-#~ msgid ""
-#~ "The Ainu are the indigenous people of northern Japan, the Kuril islands, "
-#~ "Sakhalin, and the southern part of the Kamchatka peninsula."
-#~ msgstr ""
-#~ "Els ainus són el poble indígena del nord del Japó, les illes Kurils, "
-#~ "Sakhalin i la part meridional de la península de Kamtxatka."
-
-#~ msgid "Nipa"
-#~ msgstr "Nipa"
-
-#~ msgid "Nipsa"
-#~ msgstr "Nipsa"
-
-#~ msgid "Akwe"
-#~ msgstr "Akwe"
-
-#~ msgid "?plural:Akwe"
-#~ msgstr "Akwes"
-
-#~ msgid ""
-#~ "The Akwe are also known by three different tribal names in Portuguese, "
-#~ "Xavante, Xakriaba and Xerente. They have a patrilineal clan system and "
-#~ "live in Mato Grosso and Tocantins states of Brazil, though they have been "
-#~ "forced to move by Brazilians several times through their history. "
-#~ "Traditionally, they are ruled by councils of elders who elect a chief and "
-#~ "have likely lived in large ring villages since about the 9th century CE. "
-#~ "They are Ge speakers who farm maize, manioc, sweet potatoes and yams."
-#~ msgstr ""
-#~ "Els akwe es coneixen també per tres diferents noms de tribu en portuguès, "
-#~ "Xavante, Xakriaba i Xerente. Tenen un sistema de clans patrilineal i "
-#~ "viuen als estats brasilers del Mato Grosso i Tocantins, encara que els "
-#~ "brasilers els han forçat a traslladar-se diverses vegades al llarg de la "
-#~ "seva història. Tradicionalment, són dirigits per consells d'ancians que "
-#~ "trien un cap i probablement han viscut en grans pobles en forma d'anell "
-#~ "des del segle IX d.C., aproximadament. Parlen Ge i conreen blat de moro, "
-#~ "iuca, moniatos i nyams."
-
-#~ msgid "He'a"
-#~ msgstr "He'a"
-
-#~ msgid "Senapati"
-#~ msgstr "Senapati"
-
-#~ msgid "?female:Speaker"
-#~ msgstr "Portaveu"
-
-#~ msgid "?female:Reverend"
-#~ msgstr "Reverenda"
-
-#~ msgid ""
-#~ "Australia was founded as a British penal colony in 1788AD. Originally "
-#~ "comprising of several colonies (New South Wales, Victoria, Queensland, "
-#~ "South Australia, Western Australia and Tasmania) it became a single "
-#~ "country in 1902. It is the only country on earth to occupy an entire "
-#~ "continent."
-#~ msgstr ""
-#~ "Austràlia va ser fundada com a colònia penal britànica l'any 1788. "
-#~ "Originalment comprenia diferents colònies (Nova Gal·les del Sud, "
-#~ "Victòria, Queensland, Austràlia del Sud, Austràlia Occidental i "
-#~ "Tasmània), que es van unificar en un sol país l'any 1902. És l'únic país "
-#~ "del món que ocupa un continent sencer."
-
-#~ msgid "Aymara"
-#~ msgstr "Aymara"
-
-#~ msgid "?plural:Aymaras"
-#~ msgstr "Aymaras"
-
-#~ msgid ""
-#~ "After the collapse of the Tiwanaku civilization in the Andes, their heirs "
-#~ "reorganized into a set of culturally close Aymara kingdoms that thrived "
-#~ "around the Titicaca lake until they were conquered by the Incas."
-#~ msgstr ""
-#~ "Després del col·lapse de la civilització Tiwanaku als Andes, els seus "
-#~ "hereus es van reorganitzar en un estol de regnes Aymara culturalment "
-#~ "pròxims que van desenvolupar-se al voltant del llac Titicaca fins que van "
-#~ "ser conquerits pels Inques."
-
-#~ msgid "Jiliri"
-#~ msgstr "Jiliri"
-
-#~ msgid "Mallku"
-#~ msgstr "Mallku"
-
-#~ msgid "Ttalla"
-#~ msgstr "Ttalla"
-
-#~ msgid "Willka"
-#~ msgstr "Willka"
-
-#~ msgid "Tata"
-#~ msgstr "Tata"
-
-#~ msgid "Mama"
-#~ msgstr "Mama"
-
-#~ msgid "Markachiri"
-#~ msgstr "Markachiri"
-
-#~ msgid "Azeri"
-#~ msgstr "Àzeri"
-
-#~ msgid "?plural:Azeris"
-#~ msgstr "Àzeris"
-
-#~ msgid ""
-#~ "The Azeris are the people of Azerbaijan. The territory of modern "
-#~ "Azerbaijan was the scene of rises and falls of different ancient states "
-#~ "of the Caucasus region. In 1813 Azerbaijan became part of the Russian "
-#~ "Empire, which was followed by a short period of independence in 1918-1920 "
-#~ "- as the first Islamic republic in history. Then Azerbaijan became part "
-#~ "of the Soviet Union until its dissolution in 1991."
-#~ msgstr ""
-#~ "Els àzeris són el poble de l'Azerbaidjan. El territori de l'Azerbaidjan "
-#~ "modern va ser l'escenari dels apogeus i caigudes de diferents estats "
-#~ "antics de la regió caucàsica. El 1813, l'Azerbaidjan va passar a l'Imperi "
-#~ "Rus, cosa que va ser seguida per un període curt d'independència entre "
-#~ "els anys 1918 i 1920 - com a primera república islàmica de la història. "
-#~ "Llavors, l'Azerbaidjan va passar a ser part de la Unió Soviètica fins la "
-#~ "seva dissolució el 1991."
-
-#~ msgid "Khatan"
-#~ msgstr "Khatan"
-
-#~ msgid "Basque"
-#~ msgstr "Basc"
-
-#~ msgid "?plural:Basques"
-#~ msgstr "Bascos"
-
-#~ msgid ""
-#~ "The Basques have lived since times immemorial by the western foothills of "
-#~ "the Pyrenees. By maintaining their age-old cultural traditions, and "
-#~ "keeping their historic identity alive, the Basques provide a link with "
-#~ "man's distant past. Euskara, the language spoken by the Basque people, is "
-#~ "probably the oldest living language in Europe."
-#~ msgstr ""
-#~ "Els Bascos han viscut des de temps immemorials a les estribacions "
-#~ "occidentals dels Pirineus. Mantenint les seves tradicions culturals "
-#~ "ancestrals, i mantenint viva la seva identitat històrica, els bascos "
-#~ "proporcionen un enllaç amb el passat més antic de la humanitat. "
-#~ "L'euskara, la llengua que parlen els bascos, és probablement el "
-#~ "llenguatge viu més antic d'Europa."
-
-#~ msgid "Buruzagi"
-#~ msgstr "Buruzagi"
-
-#~ msgid "?female:Buruzagi"
-#~ msgstr "?female:Buruzagi"
-
-#~ msgid "Apaiz nagusi"
-#~ msgstr "Apaiz nagusi"
-
-#~ msgid "Emakume Apaiz nagusi"
-#~ msgstr "Emakume Apaiz nagusi"
-
-#~ msgid "Errege"
-#~ msgstr "Errege"
-
-#~ msgid "Erregina"
-#~ msgstr "Erregina"
-
-#~ msgid "Lehendakari"
-#~ msgstr "Lehendakari"
-
-#~ msgid "?female:Lehendakari"
-#~ msgstr "?female:Lehendakari"
-
-#~ msgid "Belarusian"
-#~ msgstr "Bielorús"
-
-#~ msgid "?plural:Belarusians"
-#~ msgstr "Bielorussos"
-
-#~ msgid ""
-#~ "Belarus was part of the ancient Slavic state of Kievan Rus', then "
-#~ "subsequently Lithuania, Rzeczpospolita, the Russian Empire and the Soviet "
-#~ "Union. Belarus became independent in 1991 with the dissolution of the "
-#~ "Soviet Union."
-#~ msgstr ""
-#~ "Bielorússia era part de l'antic estat eslau de Kievan Rus, i més endavant "
-#~ "Lituània, Rzeczpospolita, l'Imperi Rus i la Unió Soviètica. Bielorússia "
-#~ "va obtenir la independència el 1991 amb la dissolució de la Unió "
-#~ "Soviètica."
-
-#~ msgid "?female:Nabob"
-#~ msgstr "?female:Nabob"
-
-#~ msgid "?female:Major"
-#~ msgstr "?female:Major"
-
-#~ msgid "Bosnian-Herzegovinian"
-#~ msgstr "Bosnià"
-
-#~ msgid ""
-#~ "Brazil was founded as a colony of Portugal but became independent in 1822 "
-#~ "as a result of Portugal's occupation by Napoleonic France. The country "
-#~ "was first established as an empire under the exiled Portuguese royal "
-#~ "family. The empire lasted until the establishment of a republican "
-#~ "government in 1889."
-#~ msgstr ""
-#~ "El Brasil va ser fundat com a colònia de Portugal, però va obtenir la "
-#~ "independència el 1822 com a resultat de l'ocupació de Napoleó per la "
-#~ "França napoleònica. El país va començar com a imperi dirigit per la "
-#~ "família reial portuguesa a l'exili. L'imperi va durar fins l'establiment "
-#~ "d'un govern republicà el 1889."
-
-#~ msgid "?female:Director-President"
-#~ msgstr "Directora-President"
-
-#~ msgid "Breton"
-#~ msgstr "Bretó"
-
-#~ msgid "?plural:Bretons"
-#~ msgstr "Bretons"
-
-#~ msgid ""
-#~ "Known to the Romans as Amorica, Brittany has been Celtic speaking for "
-#~ "many centuries before Britons arrive in the peninsula a mercenaries, "
-#~ "colonists and refugees in response to the chaos in Gaul and the invasion "
-#~ "of Britain by Germanic tribes in the fifth century CE. Over the "
-#~ "centuries, use of the Breton language has been pushed towards the west of "
-#~ "the peninsula, with people speaking French instead. The Dukedom of "
-#~ "Brittany itself was formally annexed to France in 1491."
-#~ msgstr ""
-#~ "Coneguda pels romans com Armòrica, a Bretanya s'havia parlat un idioma "
-#~ "cèltic durant molts segles abans que els bretons arribessin a la "
-#~ "península com a mercenaris, colonitzadors i refugiats en resposta al caos "
-#~ "de la Gàl·lia i la invasió de Gran Bretanya per tribus germàniques al "
-#~ "segle V d.C. Amb el pas dels segles, l'ús de la llengua bretona ha "
-#~ "retrocedit cap a l'oest de la península, sent substituïda pel francès. El "
-#~ "Ducat de Bretanya es va annexionar formalment a França el 1491."
-
-#~ msgid "Dug"
-#~ msgstr "Dug"
-
-#~ msgid "Dugez"
-#~ msgstr "Dugez"
-
-#~ msgid "Roue"
-#~ msgstr "Roue"
-
-#~ msgid "Rouanez"
-#~ msgstr "Rouanez"
-
-#~ msgid "Burgundian"
-#~ msgstr "Borgonyó"
-
-#~ msgid "?plural:Burgundians"
-#~ msgstr "Borgonyons"
-
-#~ msgid ""
-#~ "After the fall of the Western Roman Empire, a Germanic people known as "
-#~ "the Burgundians settled in the Rhine Valley, lending their name to the "
-#~ "region. Centuries later, the Duchy of Burgundy was a prosperous country "
-#~ "with the court in Dijon outshining that of Paris. It is today one of the "
-#~ "regions of France."
-#~ msgstr ""
-#~ "Després de la caiguda de l'Imperi Romà d'Occident, un poble germànic "
-#~ "anomenat burgundis va establir-se a la vall del Rin, donant el seu nom a "
-#~ "la regió. Segles més tard, el Ducat de Borgonya era un país pròsper on la "
-#~ "cort de Dijon eclipsava la de París. Avui en dia és una regió de França."
-
-#~ msgid "Margrave"
-#~ msgstr "Margrave"
-
-#~ msgid "Margravine"
-#~ msgstr "Margravine"
-
-#~ msgid "?female:Bohmugyi"
-#~ msgstr "?female:Bohmugyi"
-
-#~ msgid "Burundi"
-#~ msgstr "Burundès"
-
-#~ msgid "?plural:Burundi"
-#~ msgstr "Burundesos"
-
-#~ msgid ""
-#~ "Lasting from 16th century, through European colonial administration, "
-#~ "until finally overthrown in 1966, the Kingdom of Burundi was an East "
-#~ "African state in which the King and aristocracy extracted taxes from the "
-#~ "nation's peasantry. The last King, Ntare V Ndizeye, was killed in 1972 in "
-#~ "a bid to restore the monarchy."
-#~ msgstr ""
-#~ "El regne de Burundi, que va durar des del segle XVI fins a "
-#~ "l'administració colonial europea que es va enderrocar el 1966, era un "
-#~ "estat de l'Àfrica Oriental on el rei i l'aristocràcia cobraven tributs de "
-#~ "la pagesia de la nació. L'últim rei, Ntare V Ndizeye, va ser mort el 1972 "
-#~ "en un intent de restauració monàrquica."
-
-#~ msgid "Mwami"
-#~ msgstr "Mwami"
-
-#~ msgid "Mwamikazi"
-#~ msgstr "Mwamikazi"
-
-#~ msgid ""
-#~ "At the time of the decline of the old Roman empire, the Emperor "
-#~ "Constantine moved the empire's capital to Byzantium and formed a new "
-#~ "empire mostly known as the Eastern Roman empire or the Byzantine empire. "
-#~ "This empire lasted until 1453 when its capital fell to the Ottomans. At "
-#~ "the time of Justinian I, the Byzantines controlled nearly all of the "
-#~ "Middle East, northern Africa, Italy, and parts of Spain."
-#~ msgstr ""
-#~ "A l'època del declivi de l'antic imperi romà, l'Emperador Constantí va "
-#~ "canviar la capital de l'imperi cap a Bizanci i va formar-hi un nou imperi "
-#~ "conegut principalment com a Imperi Romà d'Orient o Imperi Bizantí. Aquest "
-#~ "imperi va durar fins el 1453, quan la seva capital va caure en mans dels "
-#~ "otomans. A l'època de Justinià I, els bizantins controlaven gairebé tot "
-#~ "l'Orient Mitjà, el nord d'Àfrica, Itàlia i parts d'Espanya."
-
-#~ msgid "?female:Basileus"
-#~ msgstr "?female:Basileus"
-
-#~ msgid "Cambodian"
-#~ msgstr "Cambodjà"
-
-#~ msgid "?plural:Cambodians"
-#~ msgstr "Cambodjans"
-
-#~ msgid ""
-#~ "Kampuchea (known in English as Cambodia) is the modern successor state of "
-#~ "the mighty Khmer Empire, which ruled most of the Indochinese Peninsula "
-#~ "between the 11th and 14th centuries."
-#~ msgstr ""
-#~ "Cambodja (també coneguda com a Kamputxea) és l'estat modern que ha "
-#~ "succeït el poderós Imperi Khmer, que va dominar la major part de la "
-#~ "península d'Indoxina entre els segles XI i XIV."
-
-#~ msgid ""
-#~ "During the Middle Ages, Catalan kings conquered and presided over several "
-#~ "kingdoms on the shores of the Mediterranean Sea, from the Iberian "
-#~ "peninsula to parts of Italy and Greece. This confederation/empire became "
-#~ "a major naval and trading power in the Mediterranean area. Catalans kept "
-#~ "their self-rule after a dynastic union with the neighboring kingdom of "
-#~ "Castile, and sided with England and Austria against France and Castile in "
-#~ "the Spanish Succession War. In 1713, England signed the Treaty of Utrecht "
-#~ "and dropped out of the alliance, and the Catalans were finally defeated "
-#~ "in 1714, losing their national rights as a result."
-#~ msgstr ""
-#~ "Durant l'Edat Mitjana, reis catalans van conquerir i dirigir un estol de "
-#~ "regnes a la vora de la mar Mediterrània, des de la península Ibèrica fins "
-#~ "a parts d'Itàlia i Grècia. Aquesta confederació/imperi es va convertir en "
-#~ "una potència naval i comercial de l'àrea mediterrània. Els catalans van "
-#~ "mantenir un govern propi després d'una unió dinàstica amb el regne veí de "
-#~ "Castella, i van aliar-se amb Anglaterra i Àustria contra França i "
-#~ "Castella durant la Guerra de Successió. El 1713, Anglaterra va signar el "
-#~ "tractat d'Utrecht i va abandonar l'aliança, i els catalans van ser "
-#~ "derrotats finalment el 1714, perdent els seus drets nacionals."
-
-#~ msgid "Cherokee"
-#~ msgstr "Cherokee"
-
-#~ msgid "?plural:Cherokees"
-#~ msgstr "?plural:Cherokees"
-
-#~ msgid ""
-#~ "The Cherokee nation is the largest Native American nation in North "
-#~ "America today."
-#~ msgstr ""
-#~ "La nació Cherokee és la nació indígena més gran de Nordamèrica avui en "
-#~ "dia."
-
-#~ msgid "?female:Great Chief"
-#~ msgstr "Gran Cap"
-
-#~ msgid "Principal Chief"
-#~ msgstr "Cap Principal"
-
-#~ msgid "?female:Principal Chief"
-#~ msgstr "Gran Cap"
-
-#~ msgid "Chola"
-#~ msgstr "Xola"
-
-#~ msgid "?plural:Cholas"
-#~ msgstr "Xola"
-
-#~ msgid ""
-#~ "The Cholas were a Tamil dynasty in centered in southern India and were "
-#~ "rare in their level of influence in northern India. They began as a "
-#~ "tributary state to the Pallavas, but in the 9th century their power began "
-#~ "to grow. During the 11th century, they lead expeditions against other "
-#~ "Indian states as far north as Bengal, as well as against the Maldives, "
-#~ "Sri Lanka and even the Indonesian kingdom of Sri Vijaya. They collapsed, "
-#~ "however, in the 1250s as other southern Indian states rose up."
-#~ msgstr ""
-#~ "Els Xola eren una dinastia tàmil centrada al sud de l'Índia, i van tenir "
-#~ "poca influència al nord. Van començar com un estat tributari dels "
-#~ "Pallava, però al segle IX el seu poder va començar a créixer. Durant el "
-#~ "segle XI, van dirigir expedicions contra altres estats indis tan al nord "
-#~ "com Bengala, així com les Maldives, Sri Lanka, i fins i tot el regne "
-#~ "indonesi de Sri Vijaia. Van enfonsar-se, no obstant, cap al 1250, per "
-#~ "l'ascens d'altres estats indis del sud."
-
-#~ msgid ""
-#~ "Colombia is a country in northern South America. The region was an "
-#~ "Amerindian cultural center in pre-European time. The Spanish began "
-#~ "settling Colombia's north coast around 1500. In 1819 the Republic of "
-#~ "Colombia gained independence."
-#~ msgstr ""
-#~ "Colòmbia és un país del nord de Sudamèrica. La regió era un centre "
-#~ "cultural amerindi durant l'època pre-europea. Els espanyols van començar "
-#~ "a colonitzar la costa nord de Colòmbia al voltant del 1500. El 1819, la "
-#~ "República de Colòmbia va obtenir la independència."
-
-#~ msgid "?female:Chieftain"
-#~ msgstr "Cabdill"
-
-#~ msgid "Cree"
-#~ msgstr "Cree"
-
-#~ msgid "?plural:Cree"
-#~ msgstr "?plural:Cree"
-
-#~ msgid ""
-#~ "The Cree are the largest native group in Canada with over 200,000 members "
-#~ "who speak an Algonquian language and often call themselves \"Iiyiyuu\" or "
-#~ "\"Iinuu,\" meaning \"people.\" They originally inhabited much of Quebec, "
-#~ "Labrador, Alberta, Saskatchewan, Ontario and Manitoba."
-#~ msgstr ""
-#~ "Els Cree són el grup nadiu més gran del Canadà, amb més de 200.000 "
-#~ "membres que parlen una llengua algonquina i sovint s'autoanomenen "
-#~ "\"liyiyuu\" o \"linuu\", que vol dir \"gent\". Originalment poblaven bona "
-#~ "part del Quebec, Labrador, Alberta, Saskatchewan, Ontario i Manitoba."
-
-#~ msgid "Uchimaahkaan"
-#~ msgstr "Uchimaahkaan"
-
-#~ msgid "Uchimaahkaaniskweu"
-#~ msgstr "Uchimaahkaaniskweu"
-
-#~ msgid "Chihchiuchimaau"
-#~ msgstr "Chihchiuchimaau"
-
-#~ msgid "Chihchiuchimaaskweu"
-#~ msgstr "Chihchiuchimaaskweu"
-
-#~ msgid "Dominican"
-#~ msgstr "Dominiquès"
-
-#~ msgid "?plural:Dominicans"
-#~ msgstr "Dominiquesos"
-
-#~ msgid ""
-#~ "The island of Dominica was first sighted by Europeans, including "
-#~ "Christopher Columbus, in 1493. Legend has it that the island was named so "
-#~ "since the day of its first sighting was a Sunday. Officially the "
-#~ "\"Commonwealth of Dominica\", the country should not be confused with the "
-#~ "Dominican Republic, another Caribbean nation."
-#~ msgstr ""
-#~ "L'illa de Dominica va ser vista per primera vegada per europeus, entre "
-#~ "ells Cristòfor Colom, el 1493. La llegenda diu que l'illa es va anomenar "
-#~ "així perquè el dia en què la van veure per primer cop era diumenge. "
-#~ "S'anomena oficialment \"Commonwealth of Dominica\" i cal no confondre-la "
-#~ "amb la República Dominicana, una altra nació caribenya."
-
-#~ msgid "?female:Pharaoh"
-#~ msgstr "Faraona"
-
-#~ msgid "?female:Great Pharaoh"
-#~ msgstr "Gran Faraona"
-
-#~ msgid "Emirati"
-#~ msgstr "dels Emirats"
-
-#~ msgid "?plural:Emiratis"
-#~ msgstr "dels Emirats"
-
-#~ msgid ""
-#~ "The history of the United Arab Emirates goes back to the 7th century. In "
-#~ "the 19th century the Emirates became a dependency of the United Kingdom. "
-#~ "In 1971 six emirates joined in a federative state as the United Arab "
-#~ "Emirates. The following year, the seventh member emirate joined them."
-#~ msgstr ""
-#~ "La història dels Emirats Àrabs Units es remunta al segle VII. El segle "
-#~ "XIX, els Emirats van passar a dependre del Regne Unit. El 1971, sis "
-#~ "emirats es van unir en un estat federal formant els Emirats Àrabs Units. "
-#~ "L'any següent, el setè emirat s'hi va afegir."
-
-#~ msgid "Sheikh"
-#~ msgstr "Sheikh"
-
-#~ msgid "Sheikhah"
-#~ msgstr "Sheikhah"
-
-#~ msgid "Esperant"
-#~ msgstr "Esperantista"
-
-#~ msgid "?plural:Esperants"
-#~ msgstr "Esperantistes"
-
-#~ msgid ""
-#~ "The Esperants are a world community united by the Esperanto language."
-#~ msgstr ""
-#~ "Els Esperantistes són una comunitat mundial unida per la llengua "
-#~ "esperanto."
-
-#~ msgid "European"
-#~ msgstr "Europeu"
-
-#~ msgid "?plural:Europeans"
-#~ msgstr "Europeus"
-
-#~ msgid ""
-#~ "The foundation for the European Union was laid in 1957 with the Treaty of "
-#~ "Rome. The EU project has developed since then and is beginning to "
-#~ "resemble a fledgeling super state. But the question remains: Does such a "
-#~ "thing as a common European identity and nation actually exist?"
-#~ msgstr ""
-#~ "La fundació de la Unió Europea va començar el 1957 amb el Tractat de "
-#~ "Roma. El projecte de la UE s'ha desenvolupat des de llavors, i comença a "
-#~ "assemblar-se a un super estat. Però la qüestió continua oberta: "
-#~ "existeixen una nació i identitat europees comunes?"
-
-#~ msgid "Popess"
-#~ msgstr "Papessa"
-
-#~ msgid "President of the Commission"
-#~ msgstr "President de la Comissió"
-
-#~ msgid ""
-#~ "France has long been a major power in Europe. French conquerors like "
-#~ "Emperor Napoleon and King Charlemagne united large parts of Europe under "
-#~ "the French flag."
-#~ msgstr ""
-#~ "França ha estat durant molt de temps una de les potències principals "
-#~ "d'Europa. Els reis conqueridors francesos com l'Emperador Napoleó i el "
-#~ "Rei Carlemany van reunir grans parts d'Europa sota la bandera francesa."
-
-#~ msgid "?female:Premier"
-#~ msgstr "?female:Premier"
-
-#~ msgid "?female:Archbishop"
-#~ msgstr "Arquebisbessa"
-
-#~ msgid "Don"
-#~ msgstr "Don"
-
-#~ msgid "Dona"
-#~ msgstr "Dona"
-
-#~ msgid ""
-#~ "The Gauls were a Celtic people occupying what is now France and Belgium.  "
-#~ "They lived in chiefdom-level societies that grew increasingly centralized "
-#~ "and stratified under the influence of the Greek and Roman merchants and "
-#~ "soldiers who came to Gaul.  Julius Caesar launched his eight year "
-#~ "invasion of Gaul in 59 BCE.  He claimed to have killed one million people "
-#~ "and enslaved another million out of an original population of three "
-#~ "million.  The Gauls united and rallied under Vercingetorix, who defeated "
-#~ "Caesar at the battle of Gergovia, but was later crushed by him at the "
-#~ "battle of Alesia."
-#~ msgstr ""
-#~ "Els Gals eren un poble cèltic que ocupava el que ara és França i Bèlgica. "
-#~ "Vivien en societats dirigides per cabdills que cada vegada van ser més "
-#~ "centralitzades i estratificades sota la influència dels comerciants grecs "
-#~ "i romans, i dels soldats que van traslladar-se a la Gàl·lia. Juli Cèsar "
-#~ "va engegar la invasió de la Gàl·lia, que va durar 8 anys, el 59 a.C. "
-#~ "Segons ell, va matar un milió de persones i en va esclavitzar un altre "
-#~ "milió, de la població original de tres milions. Els gals es van unir i "
-#~ "van contraatacar sota Vercingetòrix, que va guanyar Cèsar a la batalla de "
-#~ "Gergòvia, però després van patir la desfeta d'Alèsia."
-
-#~ msgid "?female:Druid"
-#~ msgstr "Druida"
-
-#~ msgid "?female:Chancellor"
-#~ msgstr "Cancellera"
-
-#~ msgid "?female:First Secretary"
-#~ msgstr "Primera Secretària"
-
-#~ msgid "?female:Despot"
-#~ msgstr "Dèspota"
-
-#~ msgid "Gupta"
-#~ msgstr "Gupta"
-
-#~ msgid "?plural:Gupta"
-#~ msgstr "?plural:Gupta"
-
-#~ msgid ""
-#~ "The Gupta Empire was one of the great classical empires. It ruled "
-#~ "northern India from around 240 to 550 CE."
-#~ msgstr ""
-#~ "L'Imperi Gupta va ser un dels grans imperis clàssics. Va dominar el nord "
-#~ "de l'Índia des dels voltants de l'any 240 fins el 550 d.C."
-
-#~ msgid "Maharajadhiraja"
-#~ msgstr "Maharajadhiraja"
-
-#~ msgid "Hacker"
-#~ msgstr "Hacker"
-
-#~ msgid "?plural:Hackers"
-#~ msgstr "Hackers"
-
-#~ msgid "h4xx0r r0xx0rz!"
-#~ msgstr "v1$(4 3£$ h4(k3r$!"
-
-#~ msgid "?title:Hacker"
-#~ msgstr "?title:Hacker"
-
-#~ msgid "?female:Hacker"
-#~ msgstr "?female:Hacker"
-
-#~ msgid "Hawaiian"
-#~ msgstr "Hawaià"
-
-#~ msgid "?plural:Hawaiians"
-#~ msgstr "Hawaians"
-
-#~ msgid ""
-#~ "The Kingdom of Hawaii was established in 1810 by King Kamehameha the "
-#~ "Great. Abolished in 1893, and subsequently annexed to the United States, "
-#~ "the former kingdom became the 50th state of the United States on August "
-#~ "21, 1959."
-#~ msgstr ""
-#~ "El Regne de Hawaii va ser establert el 1810 pel Rei Kamehameha el Gran. "
-#~ "Abolit el 1893, i annexat després als Estats Units, l'antic regne es va "
-#~ "convertir en el cinquantè estat dels Estats Units el 21 d'agost de 1959."
-
-#~ msgid "Himyarite"
-#~ msgstr "Himiarita"
-
-#~ msgid "?plural:Himyar"
-#~ msgstr "Himiarites"
-
-#~ msgid ""
-#~ "The Himyar were originally a mountain tribe in what is now Yemen that "
-#~ "conquered the other South Arabian kingdoms, including Sabaea in 115BCE, "
-#~ "which were rich from the incense trade. The Himyar were castle-builders, "
-#~ "finding it necessary to erect citadels to protect against Bedouin raids. "
-#~ "The Axumite kingdom from Ethiopia ruled Sabaea from 340 to 378 CE, but "
-#~ "the area was reconquered by Himyar forces in 525. The fall of the nation "
-#~ "was a slow process involving the Christian states of Axum and the "
-#~ "Byzantine Empire on one side, the Mandean Sassanid Empire of Persia on "
-#~ "the other, and various South Arabian factions split between. The country "
-#~ "switched from Axumite rule to Sassanid in 575 and in 628, the fifth "
-#~ "Sassanid satrap of \"al-Yaman\" converted to Islam and Southern Arabia "
-#~ "was incorporated into the new, expanding Muslim empire."
-#~ msgstr ""
-#~ "Els himiarites eren originalment una tribu de muntanya del Iemen actual "
-#~ "que va conquerir els altres regnes del sud d'Aràbia- fins i tot el regne "
-#~ "de Saba el 115 a.C.- que eren rics gràcies al comerç de l'incens. Els "
-#~ "himiarites construïen castells, en trobar necessàries les ciutadelles per "
-#~ "protegir-se dels atacs beduïns. El regne Axumita d'Etiòpia va dominar "
-#~ "Saba des del 340 al 378 d.C., però la zona va ser reconquerida per forces "
-#~ "himiarites el 525. La caiguda de la nació va ser un procés lent que va "
-#~ "implicar els estats cristians d'Axum i l'Imperi Bizantí per una banda, "
-#~ "l'Imperi Sassànida de Pèrsia per l'altra, i diverses faccions del sud "
-#~ "d'Aràbia dividides entremig. El país va canviar de la dominació axumita a "
-#~ "la sassànida el 575 i, el 628, el cinquè sàtrapa sassànida d'\"al-Yaman\" "
-#~ "es va convertir a l'Islam i el sud d'Aràbia es va incorporar al nou i "
-#~ "puixant imperi musulmà."
-
-#~ msgid "Hopi"
-#~ msgstr "Hopi"
-
-#~ msgid "?plural:Hopis"
-#~ msgstr "?plural:Hopis"
-
-#~ msgid ""
-#~ "A matrilineal culture in North America, who claim descent from the "
-#~ "Hisatsinom. The Hopi live today on the Hopi Reservation in northeastern "
-#~ "Arizona."
-#~ msgstr ""
-#~ "Una cultura matrilineal de Nordamèrica, que asseguren provenir dels "
-#~ "Hisatsinom. Els Hopi viuen avui a la reserva Hopi, al nordest d'Arizona."
-
-#~ msgid "Kikmongwi"
-#~ msgstr "Kikmongwi"
-
-#~ msgid ""
-#~ "The Inca were an Amerind people of the Northern Andes who conquered an "
-#~ "empire stretching along the west coast of South America from what is now "
-#~ "southern Chile nearly to the Equator. They had the bad timing to do it "
-#~ "just a few decades before the Spanish conquistadors arrived in their part "
-#~ "of the world in the 1530s CE. In that short time frame, the Inca were "
-#~ "able to build over 15,000km of roads throughout their realm. Their state "
-#~ "was the largest in the Americas prior to the Spanish conquest and was "
-#~ "maintained through a complex, hierarchical and pragmatic administrative "
-#~ "system. They were, however, wracked as many kingdoms have been by crises "
-#~ "of succession. When the Spanish arrived, the Inca were in the middle of "
-#~ "one such crisis-- the war between Atawallpa and Waskhar. They were the "
-#~ "sons of the late ruler Wayna Qhapaq, who had died from disease - likely "
-#~ "smallpox - that was sweeping through the land."
-#~ msgstr ""
-#~ "Els Inques eren un poble amerindi del nord dels Andes que va conquerir un "
-#~ "imperi que s'estenia al llarg de la costa oest de Sudamèrica des del que "
-#~ "ara és el sud de Xile fins gairebé l'Equador. Van tenir la poca "
-#~ "oportunitat de fer-ho només algunes dècades abans que no arribessin els "
-#~ "conqueridors espanyols a la seva part de món, a la dècada dels 1530. En "
-#~ "aquest curt període de temps, els inques van aconseguir de construir més "
-#~ "de 15.000 km de carreteres per tot el seu reialme. El seu estat era el "
-#~ "més gran del continent americà abans de la conquesta espanyola, i es "
-#~ "mantenia per mitjà d'un sistema administratiu complex, jeràrquic i "
-#~ "pragmàtic. Van ser, però, arruïnats, com molts d'altres regnes, per "
-#~ "crisis de successió. Quan van arribar els espanyols, els inques estaven "
-#~ "enmig d'una d'aquestes crisis - la guerra entre Atahualpa i Huàscar. Eren "
-#~ "els fills del difunt rei Huayna Cápac, que havia mort d'una malaltia - "
-#~ "probablement verola - que estava arrasant el país."
-
-#~ msgid "Inka"
-#~ msgstr "Inca"
-
-#~ msgid "Sapa Inka"
-#~ msgstr "Sapa Inca"
-
-#~ msgid "Willaq Umu"
-#~ msgstr "Willaq Umu"
-
-#~ msgid "?female:Raja"
-#~ msgstr "Rajà"
-
-#~ msgid "?female:Maharaja"
-#~ msgstr "Maharajà"
-
-#~ msgid "?female:Mahatma"
-#~ msgstr "?female:Mahatma"
-
-#~ msgid ""
-#~ "The Inuit people inhabit northern Canada and Greenland. Legend says that "
-#~ "the Great Shaman Qitdlarssuaq lead his people to Thule (Qaanaaq) on the "
-#~ "west coast of Greenland in the 10th century. All Inuit of today are "
-#~ "descendents of the Thule culture."
-#~ msgstr ""
-#~ "El poble inuit habita el nord del Canadà i Groenlàndia. La llegenda diu "
-#~ "que el Gran Xaman Qitdlarssuaq va guiar el seu poble cap a Thule "
-#~ "(Qaanaaq) a la costa oest de Groenlàndia el segle X. Tots els inuits "
-#~ "d'avui en dia són descendents de la cultura Thule."
-
-#~ msgid "?female:Shaman"
-#~ msgstr "Xaman"
-
-#~ msgid "?female:Great Shaman"
-#~ msgstr "Gran Xaman"
-
-#~ msgid "Iranian"
-#~ msgstr "Iranià"
-
-#~ msgid "?plural:Iranians"
-#~ msgstr "?plural:Iranians"
-
-#~ msgid ""
-#~ "Iran means \"Land of the Aryans\" - long known as Persia in the Western "
-#~ "world. The country is today an Islamic Republic and a major power in the "
-#~ "Middle East."
-#~ msgstr ""
-#~ "Iran significa \"Terra dels aris\" - coneguda des de fa molt temps com a "
-#~ "Pèrsia al món Occidental. El país és avui en dia una república islàmica i "
-#~ "una potència de primer ordre a l'Orient Mitjà."
-
-#~ msgid "Raiis Jomhoor"
-#~ msgstr "Raiis Jomhoor"
-
-#~ msgid "Dictatress"
-#~ msgstr "Dictadora"
-
-#~ msgid "?female:Taoiseach"
-#~ msgstr "?female:Taoiseach"
-
-#~ msgid "Kanem-Bornu"
-#~ msgstr "Kanem-Bornu"
-
-#~ msgid "?plural:Kanem-Bornu"
-#~ msgstr "?plural:Kanem-Bornu"
-
-#~ msgid ""
-#~ "This empire lasted in some form from the 9th-century until 1893 in modern "
-#~ "Chad and Nigeria and controlled much of the trans-Saharan trade."
-#~ msgstr ""
-#~ "Aquest imperi va persistir en diverses formes des del segle IX fins el "
-#~ "1893 als moderns estats de Txad i Nigèria, i controlava bona part del "
-#~ "comerç trans-saharià."
-
-#~ msgid "Mai"
-#~ msgstr "Mai"
-
-#~ msgid "Kazakh"
-#~ msgstr "Kazakh"
-
-#~ msgid "?plural:Kazakhs"
-#~ msgstr "?plural:Kazakhs"
-
-#~ msgid ""
-#~ "Kazakhs are descendants of Turkic and Mongolian nomadic tribes. Conquered "
-#~ "by Russia in the 18th century, Kazahstan became independent in 1991 with "
-#~ "the dissolution of the Soviet Union. It is one of ten largest states in "
-#~ "the world by area."
-#~ msgstr ""
-#~ "Els kazakhs són descendents de tribus nòmades turques i mongols. "
-#~ "Conquerit per Rússia el segle XVIII, el Kazakhstan va obtenir la "
-#~ "independència el 1991 amb la dissolució de la Unió Soviètica. És un dels "
-#~ "deu estats més grans del món en superfície."
-
-#~ msgid "Khwarezmian"
-#~ msgstr "Khwarèsmid"
-
-#~ msgid "?plural:Khwarezmians"
-#~ msgstr "Khwarèsmids"
-
-#~ msgid ""
-#~ "Known by the Greeks as Chorasmia, Khwarezm was an urbanized, centralized, "
-#~ "and militarized state south of the Aral sea in Central Asia, controlling "
-#~ "portions of the Silk Road. It was loosely controlled as a satrapy under "
-#~ "the Achaemenid and Sassanid Persian dynasties and was mythic homeland of "
-#~ "Zarathustra, the founder of Zoroastrianism. Following the introduction of "
-#~ "Islam, Khwarezm tended to be devided into two seperate kingdoms, but was "
-#~ "united under the Turkic Anushtegihidy dynasty, which lasted from 1097 "
-#~ "until Chinggis Khan conquered it in 1231."
-#~ msgstr ""
-#~ "Coneguda pels grecs com a Chorasmia, Khwarezm era un estat urbanitzat, "
-#~ "centralitzat i militaritzat al sud del mar d'Aral a l'Àsia Central, que "
-#~ "controlava porcions de la Ruta de la Seda. Estava controlat laxament com "
-#~ "a satrapia sota les dinasties perses aquemènida i sassànida i era el "
-#~ "mític lloc natal de Zaratustra, el fundador del Zoroastrisme. Després de "
-#~ "la introducció de l'Islam, Khwarezm va tendir a la divisió en dos regnes "
-#~ "separats, però va ser unificat sota la dinastia turca dels Anushtigínids, "
-#~ "que va durar des de 1097 fins que Genghis Khan els va conquerir el 1231."
-
-#~ msgid "Khorezmshah"
-#~ msgstr "Khorezmshah"
-
-#~ msgid "Kongo"
-#~ msgstr "Kongo"
-
-#~ msgid "?plural:Kongo"
-#~ msgstr "?plural:Kongo"
-
-#~ msgid ""
-#~ "This Kingdom, lasting from roughly 1400 CE until the late 19th century, "
-#~ "existed in the present-day countries of Angola and the Democratic "
-#~ "Republic of the Congo. Soon after its formation, Portuguese explorers, "
-#~ "missionaries and slavers began to arrive and exerted considerable "
-#~ "influence in the Kingdom."
-#~ msgstr ""
-#~ "Aquest regne, que va durar des d'aproximadament l'any 1400 d.C. fins a "
-#~ "finals del segle XIX, va existir als països actuals d'Angola i la "
-#~ "República Democràtica del Congo. Poc després de la seva formació, "
-#~ "exploradors, missioners i tractants d'esclaus portuguesos van començar a "
-#~ "arribar i van exercir una influència considerable al regne."
-
-#~ msgid "Manikongo"
-#~ msgstr "Manikongo"
-
-#~ msgid ""
-#~ "According to legend, the first Korean kingdom was founded in prehistory "
-#~ "by the ancestral Tangun in southern Manchuria. The Korean kingdoms were "
-#~ "united in 668 by king Munmu. Today the Korean peninsula is divided into "
-#~ "two states, North and South Korea as a result of the stalemate after the "
-#~ "Korean war in 1953."
-#~ msgstr ""
-#~ "Segons la llegenda, el primer regne coreà va ser fundat durant la "
-#~ "prehistòria pels Tangun ancestrals a Manxúria del sud. Els regnes coreans "
-#~ "van ser unificats el 668 pel rei Munmu. Avui en dia, la península coreana "
-#~ "està dividida en dos estats, Corea del Nord i del Sud, com a resultat de "
-#~ "l'armistici posterior a la guerra de Corea el 1953."
-
-#~ msgid "Kurdish"
-#~ msgstr "Kurd"
-
-#~ msgid "?plural:Kurds"
-#~ msgstr "Kurds"
-
-#~ msgid "Asian"
-#~ msgstr "Asiàtic"
-
-#~ msgid "Medieval"
-#~ msgstr "Medieval"
-
-#~ msgid ""
-#~ "The Kurds are a distinct ethno-linguistic group speaking an Indo-Aryan "
-#~ "language. Their traditional homeland Kurdistan is situated in northern "
-#~ "Middle East and partitioned between Iraq, Turkey, Syria, and Iran. The "
-#~ "medieval era saw the rise of several principalities ruled by Kurdish "
-#~ "dynasties, including Shaddadid, Rawadid, Hasanwayhid, Annazid, and "
-#~ "Marwanid. Subsequently subdued by the Ottomans, the Kurds' struggle for "
-#~ "self-rule and independence took off again after the fall of the Ottoman "
-#~ "Empire and the end of the colonial era. Today, Iraq's Kurdistan "
-#~ "Autonomous Region is the only Kurd-dominated politial entity in the world."
-#~ msgstr ""
-#~ "Els kurds són un grup etno-lingüístic distint, que parlen una llengua "
-#~ "indoària. El seu territori tradicional, el Kurdistan, està situat al nord "
-#~ "de l'Orient Mitjà i està repartit entre Iraq, Turquia, Síria i Iran. "
-#~ "L'era medieval va veure l'ascens de diversos principats regits per "
-#~ "dinasties kurdes, inclosos Shaddadid, Rawadid, Hasanwayhid, Annazid, i "
-#~ "Marwanid. Dominats més endavant pels otomans, la lluita dels kurds per "
-#~ "l'autodeterminació i la independència va remuntar després de la caiguda "
-#~ "de l'Imperi Otomà i el final de l'era colonial. Avui en dia, la regió "
-#~ "autònoma del Kurdistan a Iraq és l'única entitat política del món "
-#~ "dominada per kurds."
-
-#~ msgid "Kyrgyz"
-#~ msgstr "Kirguís"
-
-#~ msgid "?plural:Kyrgyzs"
-#~ msgstr "Kirguissos"
-
-#~ msgid ""
-#~ "Nation in Central Asia. Conquered by the Russian Empire in 19th century, "
-#~ "Kyrgyzstan got independence from the Soviet Union in 1991."
-#~ msgstr ""
-#~ "Nació de l'Àsia Central. Conquerida per l'Imperi Rus al segle XIX. "
-#~ "Kirguizistan va aconseguir la independència de la Unió Soviètica el 1991."
-
-#~ msgid "?female:Governor"
-#~ msgstr "Governadora"
-
-#~ msgid "?female:Supreme Commander"
-#~ msgstr "Comandant suprema"
-
-#~ msgid "Laotian"
-#~ msgstr "Laosià"
-
-#~ msgid "?plural:Laotians"
-#~ msgstr "Laosians"
-
-#~ msgid ""
-#~ "The history of Laos starts with the Lan Xang kingdom created in the 14th "
-#~ "century and ended in late 18th century with invasion of Siam (Thailand). "
-#~ "In the end of the 19th century, Laos became part of French Indochina. "
-#~ "French rule ended with independence in 1946 followed by 30 years of civil "
-#~ "war. In 1975 the communist Pathet Lao established strict solicalist "
-#~ "regime. However, in 1986 the liberalization and a gradual return to "
-#~ "private enterpise started."
-#~ msgstr ""
-#~ "La història de Laos comença amb el regne de Lan Xang, creat el segle XIV "
-#~ "i acabat a finals del segle XVIII amb la invasió de Siam (Tailàndia). A "
-#~ "finals del segle XIX, Laos va passar a ser part de la Indoxina francesa. "
-#~ "El domini francès va acabar amb la independència el 1946, seguida per 30 "
-#~ "anys de guerra civil. El 1975, el comunista Pathet Lao va establir un "
-#~ "règim socialista estricte. No obstant, el 1986 va començar la "
-#~ "liberalització i un retorn gradual a l'empresa privada."
-
-#~ msgid "Lojbanistani"
-#~ msgstr "Lojbanistanès"
-
-#~ msgid "?plural:Lojbanistanis"
-#~ msgstr "Lojbanistanesos"
-
-#~ msgid ""
-#~ "Lojbanistan is a fictional place where people speak Lojban. Lojban is a "
-#~ "constructed language meant for human communication. Lojban is "
-#~ "syntactically unambiguous (\"Time flies like an arrow. Fruit flies like a "
-#~ "banana.\"), culturally neutral and simple to learn."
-#~ msgstr ""
-#~ "Lojbanistan és un lloc fictici on la gent parla lojban. El lojban és una "
-#~ "llengua inventada pensada per la comunicació humana. El lojban no té "
-#~ "ambigüitats sintàctiques (\"Time flies like an arrow, Fruit flies like a "
-#~ "banana.\", els exemples clàssics en anglès), és culturalment neutre i "
-#~ "fàcil d'entendre."
-
-#~ msgid "Majapahit"
-#~ msgstr "Majapahit"
-
-#~ msgid "?plural:Majapahit"
-#~ msgstr "?plural:Majapahit"
-
-#~ msgid ""
-#~ "This empire began in 1293 CE when a local prince used invading Yuan "
-#~ "dynasty troops to his own advantage by having them defeat his enemies and "
-#~ "then expelling them. The Majapahit, centered in eastern Java, was heavily "
-#~ "influenced by Buddhism and Hinduism and was a major regional power in the "
-#~ "insular Southeast Asian world, a position which allowed them to control "
-#~ "much of the trade between China, India and the Middle East. They lasted "
-#~ "until 1500 when they were eclipsed by the Sultanate of Malacca and the "
-#~ "rise of Islam in the Indonesian world."
-#~ msgstr ""
-#~ "Aquest imperi va començar el 1293 d.C quan un príncep local va utilitzar "
-#~ "les tropes invasores de la dinastia Yuan en benefici propi fent que "
-#~ "derrotessin els seus enemics, i foragitant-les després. Els Majapahit, "
-#~ "amb centre a l'est de Java, van ser influïts fortament pel budisme i "
-#~ "l'hinduisme i van ser una potència regional de primer ordre al món de les "
-#~ "illes del sudest asiàtic, posició que els permetia de controlar bona part "
-#~ "del comerç entre la Xina, l'Índia i l'Orient Mitjà. Va durar fins el "
-#~ "1500, quan van ser eclipsats pel sultanat de Malaca i l'ascens de l'Islam "
-#~ "al món indonesi."
-
-#~ msgid "Mahapatih"
-#~ msgstr "Mahapatih"
-
-#~ msgid "?female:High Commissioner"
-#~ msgstr "Alta comissionada"
-
-#~ msgid ""
-#~ "Sub-Saharan Africa has been a cultural and ethnical melting pot for "
-#~ "millennia. In medieval times, the region was home to a succession of "
-#~ "empires called the Sahelian kingdoms. Of these, the Islamic Mali Empire "
-#~ "with its capital in Timbuktu was the most influential. This empire "
-#~ "reigned from the 14th to the 17th century and was famed for its wealth "
-#~ "and benevolent kings. The modern Republic of Mali derives its name from "
-#~ "this empire."
-#~ msgstr ""
-#~ "L'Àfrica subsahariana ha estat un gresol cultural i ètnic durant "
-#~ "mil·lennis. Durant l'època medieval, la regió va ser el centre d'una "
-#~ "successió d'imperis anomenats regnes sahelians. D'aquests, l'imperi "
-#~ "islàmic de Mali, amb la seva capital a Tombuctú, va ser el més influent. "
-#~ "Aquest imperi va regnar dels segles XIV fins al XVII i va ser famós per "
-#~ "la seva riquesa i els seus reis benevolents. La República de Mali moderna "
-#~ "deriva el seu nom d'aquest imperi."
-
-#~ msgid "Mapuche"
-#~ msgstr "Maputxe"
-
-#~ msgid "?plural:Mapuche"
-#~ msgstr "Maputxes"
-
-#~ msgid ""
-#~ "The Mapuche people successfully resisted the expansion of the Inka "
-#~ "empire, halting them at the Maule river in what is now central Chile. "
-#~ "They proved to be stubborn opponents of the Spanish, too, who, along with "
-#~ "their Chilean successors, took 300 years to conquer them."
-#~ msgstr ""
-#~ "El poble maputxe va aconseguir de resistir l'expansió de l'imperi Inca, "
-#~ "aturant-los al riu Maule al que ara és Xile central. Van continuar sent "
-#~ "irreductibles davant dels espanyols que, juntament amb els seus "
-#~ "successors xilens, van trigar 300 anys a conquerir-los."
-
-#~ msgid "Toqui"
-#~ msgstr "Toqui"
-
-#~ msgid "Lonko"
-#~ msgstr "Lonko"
-
-#~ msgid "Machi"
-#~ msgstr "Machi"
-
-#~ msgid "?female:Ajaw"
-#~ msgstr "?female:Ajaw"
-
-#~ msgid "Ah kin"
-#~ msgstr "Ah kin"
-
-#~ msgid "?female:Ah kin"
-#~ msgstr "?female:Ah kin"
-
-#~ msgid "Moldovan"
-#~ msgstr "Moldau"
-
-#~ msgid "?plural:Moldovans"
-#~ msgstr "Moldaus"
-
-#~ msgid ""
-#~ "Moldova was conquered by the Ottomans in the 16th century. Then in 1812 "
-#~ "Moldova became part of the Russian Empire. From 1918 Moldova was part of "
-#~ "Romania until inclusion  in the Soviet Union in 1940. The modern Republic "
-#~ "of Moldova  gained independence from the Soviet Union in 1991."
-#~ msgstr ""
-#~ "Moldàvia va ser conquerida pels otomans el segle XVI. A partir de 1812, "
-#~ "Moldàvia va passar a ser part de l'Imperi Rus. Des del 1918, Moldàvia va "
-#~ "ser part de Romania fins que es va incloure a la Unió Soviètica el 1940. "
-#~ "La moderna República de Moldàvia va obtenir la independència de la Unió "
-#~ "Soviètica el 1991."
-
-#~ msgid "Gospodar"
-#~ msgstr "Gospodar"
-
-#~ msgid "Gospodarynya"
-#~ msgstr "Gospodarynya"
-
-#~ msgid "?female:Khan"
-#~ msgstr "?female:Khan"
-
-#~ msgid "?female:Khagan"
-#~ msgstr "?female:Khagan"
-
-#~ msgid "Muskogee"
-#~ msgstr "Muskogee"
-
-#~ msgid "?plural:Muskogee"
-#~ msgstr "?plural:Muskogee"
-
-#~ msgid ""
-#~ "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 and Seminole "
-#~ "tribes briefly formed a sovereign state known as the \"State of Muskogee"
-#~ "\" during the early 1800s."
-#~ msgstr ""
-#~ "Els Muskogee eren una confederació de tribus nordamericanes, que incloïen "
-#~ "els Creek, Seminole, Choctaw, i Chicasaw. Vivien a la zona on ara es "
-#~ "troben els estats americans de Geòrgia i Alabama. Les tribus Creek i "
-#~ "Seminole van formar breument un estat sobirà conegut com a \"Estat de "
-#~ "Muskogee\" a principis del segle XIX."
-
-#~ msgid "Norman"
-#~ msgstr "Normand"
-
-#~ msgid "?plural:Normans"
-#~ msgstr "Normands"
-
-#~ msgid ""
-#~ "After several devastating Viking raids on what is today northern France "
-#~ "and a siege of Paris, the Frankish king Charles the Simple granted the "
-#~ "Viking leader Rollo a fiefdom in the area. This fief evolved into the "
-#~ "Duchy of Normandy, of which the most famous duke is William II \"the "
-#~ "Conqueror\" who invaded England in 1066."
-#~ msgstr ""
-#~ "Després de diversos atacs víkings devastadors contra el que és avui en "
-#~ "dia el nord de França i d'un setge a París, el rei franc Carles el Simple "
-#~ "va concedir al líder víking Rolló un feu en aquella zona. Aquest feu va "
-#~ "evolucionar cap al Ducat de Normandia. El duc més famós és Guillem II "
-#~ "\"el Conqueridor\", que va envair Anglaterra el 1066."
-
-#~ msgid "Jarl"
-#~ msgstr "Jarl"
-
-#~ msgid "?female:Jarl"
-#~ msgstr "?female:Jarl"
-
-#~ msgid "North Korean"
-#~ msgstr "Nordcoreà"
-
-#~ msgid "?plural:North Koreans"
-#~ msgstr "Nordcoreans"
-
-#~ msgid ""
-#~ "In 1945 Korea was split by the Soviet Union and the United States into "
-#~ "two states along 38th parallel forming North Korea and South Korea. Even "
-#~ "60 years since then, North Korea remains a communist state of Stalinist "
-#~ "type."
-#~ msgstr ""
-#~ "El 1945, la Unió Soviètica i els Estats Units van dividir Corea en dos "
-#~ "estats pel paral·lel 38, formant Corea del Nord i Corea del Sud. Fins i "
-#~ "tot 60 anys després, Corea del Nord continua sent un estat comunista "
-#~ "estalinista."
-
-#~ msgid "Widaehan suryong"
-#~ msgstr "Widaehan suryong"
-
-#~ msgid "Nubian"
-#~ msgstr "Nubià"
-
-#~ msgid "?plural:Nubians"
-#~ msgstr "?plural:Nubians"
-
-#~ msgid ""
-#~ "A succession of kingdoms stretching roughly from the 1st to the 6th "
-#~ "cataracts of Nile river in modern Sudan and Egypt, Nubia was ancient "
-#~ "Egypt's perennial neighbor, competitor, trading partner, enemy, and "
-#~ "source of gold, slaves and soldiers to the south. The border between the "
-#~ "two nations fluctated time and time again. Lower Nubia was at times ruled "
-#~ "by Egypt. The 25th Dynasty of Egypt, however, was a Nubian dynasty, and "
-#~ "one that saw conflict with Assyria, which eventually wrested Egypt from "
-#~ "Nubia. Brief conflict occurred with Rome in 24 BCE when Nubian armies "
-#~ "routed the Roman garrison with it's famed archers. Nubia was a nation "
-#~ "shaped by its position between the Mediterranean world and the African "
-#~ "interior. Large Nubian states centered on Napata and later Meroe broke "
-#~ "into smaller Christian kingdoms which persisted into medieval times "
-#~ "before being conquered by Muslim Arabs."
-#~ msgstr ""
-#~ "Núbia, una successió de regnes que s'estenia aproximadament entre les "
-#~ "cascades primera i sisena del riu Nil al que ara són Sudan i Egipte, va "
-#~ "representar per l'antic Egipte el veí, competidor, soci comercial, "
-#~ "enemic, i font d'or, esclaus i soldats. La frontera entre les dues "
-#~ "nacions va fluctuar contínuament. La Núbia inferior va ser dominada de "
-#~ "vegades per Egipte. La XXVena dinastia d'Egipte, però, era nubiana, i va "
-#~ "tenir conflictes amb Assíria, que al final va arravatar Egipte de Núbia. "
-#~ "Va haver-hi un conflicte breu amb Roma el 24 a.C. quan els exèrcits "
-#~ "nubians van anorrear la guarnició romana amb els seus famosos arquers. "
-#~ "Núbia era una nació marcada per la seva posició entre el món de la "
-#~ "Mediterrània i l'interior africà. Grans estats nubis centrats a Napata i "
-#~ "més endavant Meroe es van trencar en regnes cristians més petits que van "
-#~ "durar fins l'Edat Mitjana abans de ser conquerits pels àrabs musulmans."
-
-#~ msgid "Numidian"
-#~ msgstr "Númida"
-
-#~ msgid "?plural:Numidians"
-#~ msgstr "Númides"
-
-#~ msgid ""
-#~ "The Numidians were an ancient Berber people renowned for their "
-#~ "horsemanship who were composed of two main tribes in modern Algeria and "
-#~ "Tunisia: the Massyli in the east and the Massaesyli in the west. They "
-#~ "were united under King Massinissa, whose position was guaranteed by his "
-#~ "Roman allies after the 2nd Punic War in which he aided the Romans in "
-#~ "their defeat of the Carthaginians. His unified kingdom was short-lived, "
-#~ "however, as the west was given to the Mauretanian king by the Romans "
-#~ "following the death of King Jugurtha. Eventually all of Numidia and "
-#~ "Mauretania were added to the Roman realm."
-#~ msgstr ""
-#~ "Els númides eren un antic poble berber, de molt renom per la seva "
-#~ "habilitat en l'art de muntar a cavall, que estaven composats per dues "
-#~ "tribus principals de la zona on ara hi ha Algèria i Tunísia: els Massyli "
-#~ "cap a l'est i els Massaesyli cap a l'oest. Les va unir el rei Massinissa, "
-#~ "que tenia la posició garantida pels seus aliats romans després de la "
-#~ "segona guerra Púnica, en la qual va ajudar els romans a derrotar els "
-#~ "cartaginesos. El seu regne unificat va durar poc, però, ja que els romans "
-#~ "van donar la part de l'oest al rei maurità després de la mort del rei "
-#~ "Jugurtha. Al final, tant Numídia com Mauritània es van afegir al domini "
-#~ "romà."
-
-#~ msgid "Nuu-chah-nulth"
-#~ msgstr "Nuu-chah-nulth"
-
-#~ msgid "?plural:Nuu-chah-nulth"
-#~ msgstr "?plural:Nuu-chah-nulth"
-
-#~ msgid ""
-#~ "The Nuu-chah-nulth are a Pacific Northwest people, one of the few Native "
-#~ "American peoples to travel in the open ocean and hunt whales. They "
-#~ "inhabited most of what is now western Vancouver Island and now number "
-#~ "over 8,000 individuals. Like other people of the Pacific Northwest, they "
-#~ "built large wooden canoes and houses and lived in clan systems."
-#~ msgstr ""
-#~ "Els Nuu-chah-nulth són un poble del Nordoest americà, un dels pocs pobles "
-#~ "nadius americans que viatjaven a l'oceà obert i caçaven balenes. Ocupaven "
-#~ "la major part del que ara és l'oest de l'illa de Vancouver. Ara en queden "
-#~ "més de 8.000 individus. Com d'altres pobles de la costa del Pacífic al "
-#~ "Nordoest d'Amèrica, construïen grans canoes de fusta i vivien en sistemes "
-#~ "de clan."
-
-#~ msgid "Chaabat"
-#~ msgstr "Chaabat"
-
-#~ msgid "Ha'wiih"
-#~ msgstr "Ha'wiih"
-
-#~ msgid ""
-#~ "In the beginning of the 14th century Osman, a leader of a minor Turkish "
-#~ "tribe in western Anatolia, conquered all his neighboring tribes. A "
-#~ "century later the Byzantine capital fell to Turkish rule which gave the "
-#~ "Ottoman empire access to Europe. The Ottomans subsequently conquered "
-#~ "large parts of south-eastern Europe, the Islamic Arab world as well as "
-#~ "Egypt and much of North Africa, making it a regional superpower until its "
-#~ "dissolution in the aftermath of WWI."
-#~ msgstr ""
-#~ "A principis del segle XIV Osman,un líder d'una tribu turca menor de "
-#~ "l'oest d'Anatòlia, va conquerir totes les tribus veïnes. Un segle després "
-#~ "la capital de Bizanci va caure sota el domini turc, cosa que va donar a "
-#~ "l'imperi otomà accés a Europa. Els otomans van conquerir més endavant "
-#~ "grans parts del sudest europeu, el món àrab islàmic així com Egipte i "
-#~ "bona part del Nord d'Àfrica, convertint-se en una superpotència regional "
-#~ "fins a la seva dissolució després de la Primera Guerra Mundial."
-
-#~ msgid "Pakistani"
-#~ msgstr "Pakistanès"
-
-#~ msgid "?plural:Pakistanis"
-#~ msgstr "Pakistanesos"
-
-#~ msgid ""
-#~ "The Federation of Pakistan was formed from the predominantly Muslim "
-#~ "regions of British India in 1947."
-#~ msgstr ""
-#~ "La Federació del Pakistan va ser formada a partir de les regions "
-#~ "predominantment musulmanes de l'Índia britànica el 1947"
-
-#~ msgid "Peruvian"
-#~ msgstr "Peruà"
-
-#~ msgid "?plural:Peruvians"
-#~ msgstr "Peruans"
-
-#~ msgid ""
-#~ "Peru was the cradle of the Inca Empire and civilization. It is still "
-#~ "today a major center of indigenous South American culture."
-#~ msgstr ""
-#~ "El Perú va ser el bressol de l'Imperi i la civilització inques. Encara és "
-#~ "avui en dia un centre principal de cultura indígena sudamericana."
-
-#~ msgid "Protector"
-#~ msgstr "Protector"
-
-#~ msgid ""
-#~ "Phoenicia was an ancient civilization, based in what is now the coastal "
-#~ "regions of Lebanon and Syria.  They spoke a Canaanite language related to "
-#~ "Hebrew and were famed mariners.  Their alphabet served as the source of "
-#~ "the Greek alphabet, and from there evolved into the Etruscan and Latin "
-#~ "alphabets as well.  The Greeks and Romans new them for their manufacture "
-#~ "of purple dye from the myrex shell, which gave them their Greek and Latin "
-#~ "names.  They refered to themselves a Kan'ani and thier Punic "
-#~ "(Carthaginian) descendents in St. Augustine's day called themselves "
-#~ "Chanani."
-#~ msgstr ""
-#~ "Fenícia era una civilització antiga, amb el centre al que ara són les "
-#~ "regions costaneres del Líban i Síria. Parlaven una llengua canaanita "
-#~ "emparentada amb l'hebreu i eren reconeguts mariners. El seu alfabet va "
-#~ "servir com a font per l'alfabet grec, i a partir d'allà van evolucionar "
-#~ "els alfabets etrusc i llatí. Els grecs i els romans els coneixien per la "
-#~ "seva manufactura de tints violeta a partir d'una petxina, cosa que els va "
-#~ "donar els seus noms grec i llatí. S'autoanomenaven Kan'ani i els seus "
-#~ "descendents púnics (cartaginesos) de l'època de Sant Agustí, "
-#~ "s'autoanomenaven Chanani"
-
-#~ msgid "Milk"
-#~ msgstr "Milk"
-
-#~ msgid "Milkot"
-#~ msgstr "Milkot"
-
-#~ msgid "Suffet"
-#~ msgstr "Suffet"
-
-#~ msgid "Pirate"
-#~ msgstr "Pirata"
-
-#~ msgid "?plural:Pirates"
-#~ msgstr "Pirates"
-
-#~ msgid ""
-#~ "As long as honest men have sailed the seas, pirates have been a scourge "
-#~ "of them and of all coastal dwelling peoples."
-#~ msgstr ""
-#~ "D'ençà que els homes honrats han viatjat pels mars, els pirates han estat "
-#~ "un flagell per ells i per tota la gent que viu a la costa."
-
-#~ msgid "?female:Prymas"
-#~ msgstr "?female:Prymas"
-
-#~ msgid "?female:Pierwszy Sekretarz"
-#~ msgstr "?female:Pierwszy Sekretarz"
-
-#~ msgid "Polynesian"
-#~ msgstr "Polinesi"
-
-#~ msgid "?plural:Polynesian"
-#~ msgstr "Polinesis"
-
-#~ msgid ""
-#~ "Polynesian culture stretches from Hawaii to New Zealand to Easter Island "
-#~ "and covers all the islands in between."
-#~ msgstr ""
-#~ "La cultura polinèsia s'estén des de Hawaii fins a Nova Zelanda i fins a "
-#~ "l'Illa de Pasqua i totes les illes que hi ha entremig."
-
-#~ msgid "Prussian"
-#~ msgstr "Prussià"
-
-#~ msgid "?plural:Prussians"
-#~ msgstr "Prussians"
-
-#~ msgid ""
-#~ "Prussia was originally the name of a pagan Baltic people, who in the 13th "
-#~ "century were conquered by the German Teutonic Knight order. The knights "
-#~ "established an independent state in this land, and in 1561 Grand Master "
-#~ "Albrecht I proclaimed himself hereditary Duke of Prussia. Evolving into a "
-#~ "regional military powerhouse, Prussia played an important role in uniting "
-#~ "the German nation in 1871 and solidified its power during the Franco-"
-#~ "Prussian war of the same year."
-#~ msgstr ""
-#~ "Prússia era originalment el nom d'un poble bàltic pagà, que el segle XIII "
-#~ "van ser conquerits per l'orde alemanya dels Cavallers Teutònics. Els "
-#~ "cavallers van establir un estat independent en aquella terra, i el 1561 "
-#~ "el Gran Mestre Albrecht I es va autoproclamar Duc hereditari de Prússia. "
-#~ "Convertint-se en una potència militar regional, Prússia va jugar un paper "
-#~ "important en la unificació de la nació alemanya el 1871 i va solidificar "
-#~ "el seu poder durant la guerra franco-prussiana del mateix any."
-
-#~ msgid "Grand Master"
-#~ msgstr "Gran Mestre"
-
-#~ msgid "Elector"
-#~ msgstr "Elector"
-
-#~ msgid "P'urhepecha"
-#~ msgstr "P'urhepecha"
-
-#~ msgid "?plural:P'urhepecha"
-#~ msgstr "?plural:P'urhepecha"
-
-#~ msgid ""
-#~ "The P'urhepecha are a people native to the modern Mexican state of "
-#~ "Michoacan, the heart of a former empire known to them as Irechecua "
-#~ "Tzintzuntzani, meaning the \"lands of Tzintzuntzan,\" their capital city. "
-#~ "Their kings were the perennial enemy of the Aztec empire, who attempted "
-#~ "an unsuccessful invasion of the P'urhepecha lands. When the Spanish "
-#~ "arrived began their conquest of Mexico in 1519, the Aztecs sent an "
-#~ "embassy seeking the support of the P'urhepecha, but was refused. The "
-#~ "conquistadores' reputation preceded them and the P'urhepecha offered to "
-#~ "become a subject state of the King of Spain rather than meet the same "
-#~ "fate as their former enemies, the Aztecs. Nevertheless, the transition to "
-#~ "Spanish rule was not smooth and devolved into violence. The empire, "
-#~ "founded around 1450 CE, collapsed in 1521."
-#~ msgstr ""
-#~ "Els P'urhepecha són un poble nadiu del que ara és l'estat mexicà de "
-#~ "Michoacán, que era el centre d'un antic imperi que coneixien com a "
-#~ "Irechecua Tzintzuntzani, que vol dir les \"terres de Tzintzuntzan\", la "
-#~ "seva capital. Els seus reis van ser els enemics permanents de l'imperi "
-#~ "asteca, que va intentar envair sense èxit les terres dels P'urhepecha. "
-#~ "Quan els espanyols van començar la seva conquesta de Mèxic el 1519, els "
-#~ "asteques van enviar una ambaixada demanant el suport dels P'urhepecha, "
-#~ "però van refusar. La reputació dels 'conquistadores' els precedia i els "
-#~ "P'urhepecha van oferir de convertir-se en un estat vassall del rei "
-#~ "d'Espanya abans de patir el mateix destí que els seus vells enemics, els "
-#~ "asteques. No obstant, la transició a la dominació espanyola no va ser "
-#~ "fàcil i va degenerar en violència. L'imperi, fundat al voltant del 1450 d."
-#~ "C., va acabar-se el 1521."
-
-#~ msgid "Caconzi"
-#~ msgstr "Caconzi"
-
-#~ msgid ""
-#~ "Romania as a nation was formed at the beginning of the 20th century, when "
-#~ "the states of Transylvania, Wallachia, and Moldavia merged. It is a "
-#~ "country inhabited by people speaking a language reminiscent from the time "
-#~ "of ancient Rome. Its history is convoluted as it was always at the "
-#~ "borders of great empires: Roman, Ottoman, Austro-Hungarian, and Russian."
-#~ msgstr ""
-#~ "La nació romanesa va ser formada al començament del segle XX, quan els "
-#~ "estats de Transsilvània, Valàquia i Moldàvia es van fusionar. La llengua "
-#~ "que s'hi parla recorda la de l'antiga Roma. La seva història és "
-#~ "tumultuosa ja que sempre ha estat al costat de grans imperis: el Romà, "
-#~ "l'Otomà, l'Austro-hongarès i el Rus."
-
-#~ msgid "Rwandan"
-#~ msgstr "Rwandès"
-
-#~ msgid "?plural:Rwandans"
-#~ msgstr "Rwandesos"
-
-#~ msgid ""
-#~ "Rwanda is a hilly and very fertile country in the Great Lakes region of "
-#~ "eastern Africa. It supports the densest population of the continent."
-#~ msgstr ""
-#~ "Rwanda és un país de turons molt fèrtils a la regió dels Grans Llacs de "
-#~ "l'Àfrica oriental. Te la densitat de població més alta de tot el "
-#~ "continent."
-
-#~ msgid ""
-#~ "The Sami are a people of northern Scandinavia. Their nation spans over "
-#~ "the northernmost regions of the Scandinavian countries and northwestern "
-#~ "Russia."
-#~ msgstr ""
-#~ "Els Sami són un poble del nord d'Escandinàvia. La seva nació s'estén per "
-#~ "les regions més septentrionals dels països escandinaus i el nordoest de "
-#~ "Rússia."
-
-#~ msgid "?female:Noaydde"
-#~ msgstr "?female:Noaydde"
-
-#~ msgid "Samogitian"
-#~ msgstr "Samogiti"
-
-#~ msgid "?plural:Samogitians"
-#~ msgstr "Samogitis"
-
-#~ msgid ""
-#~ "Samogitia - historical country near the Baltic Sea - home to the last "
-#~ "pagans in Europe (official until 1413). Today, Samogitia is a region of "
-#~ "Lithuania"
-#~ msgstr ""
-#~ "Samogítia - país històric a prop del mar Bàltic - va ser la llar dels "
-#~ "últims pagans d'Europa (oficialment fins el 1413). Avui en dia, Samogítia "
-#~ "és una regió de Lituània."
-
-#~ msgid "?female:First Minister"
-#~ msgstr "Primera ministra"
-
-#~ msgid "?female:Encik"
-#~ msgstr "?female:Encik"
-
-#~ msgid "?female:Leader"
-#~ msgstr "Líder"
-
-#~ msgid "?female:General Secretary"
-#~ msgstr "Secretària General"
-
-#~ msgid "South Korean"
-#~ msgstr "Sudcoreà"
-
-#~ msgid "?plural:South Koreans"
-#~ msgstr "Sudcoreans"
-
-#~ msgid ""
-#~ "Formerly the site of a unified Korean state, the Korean peninsula is "
-#~ "today divided into two states - North and South Korea - as a result of "
-#~ "the stalemate after the Korean War in 1953. The South Korean government "
-#~ "was formed from the nationalist and anti-communist \"Provisional "
-#~ "Government of the Republic of Korea\" in 1948."
-#~ msgstr ""
-#~ "La península de Corea, que havia constituït un estat coreà unificat, es "
-#~ "troba avui en dia dividida en dos estats - Corea del Nord i Corea del Sud "
-#~ "- com a resultat de la situació d'estancament que es va produir després "
-#~ "de la guerra de Corea de 1953. El govern sudcoreà es va formar a partir "
-#~ "del \"Govern Provisional de la República de Corea\", nacionalista i "
-#~ "anticomunista, el 1948."
-
-#~ msgid "?female:Great Leader"
-#~ msgstr "?female:Great Leader"
-
-#~ msgid "?female:Cardinal"
-#~ msgstr "Cardenal"
-
-#~ msgid "Sri Vijaya"
-#~ msgstr "Srivijaia"
-
-#~ msgid "?plural:Sri Vijaya"
-#~ msgstr "Srivijaia"
-
-#~ msgid ""
-#~ "Sri Vijaya was an empire centered on Palembang in eastern Sumatra and "
-#~ "extended its control through much of the coastal regions of Sumatra, "
-#~ "Java, Borneo and the Malay peninsula. It was founded sometime in the 3rd "
-#~ "century CE and lasted until roughly 1400, falling first to Jambi, then to "
-#~ "Singhasari and other regional powers, including the South Indian Chola "
-#~ "dynasty."
-#~ msgstr ""
-#~ "Sri Vijaia va ser un imperi amb centre a Palembang, a l'est de Sumatra, "
-#~ "que va estendre el seu control per bona part de les regions costaneres de "
-#~ "Sumatra, Java, Borneu i la península malaia. Es va fundar en algun moment "
-#~ "del segle III d.C. i va durar fins al voltant del 1400, caient primer en "
-#~ "mans dels Jambi, després dels Singhasari i altres potències regionals, "
-#~ "inclosa la dinastia Xola del sud de l'Índia."
-
-#~ msgid "Datu"
-#~ msgstr "Datu"
-
-#~ msgid "Nin"
-#~ msgstr "Nin"
-
-#~ msgid "Sanga"
-#~ msgstr "Sanga"
-
-#~ msgid "?female:General"
-#~ msgstr "General"
-
-#~ msgid "?female:Bailiff"
-#~ msgstr "Prebost"
-
-#~ msgid "?female:Federal Chancellor"
-#~ msgstr "Cancellera Federal"
-
-#~ msgid "Syrian"
-#~ msgstr "Siri"
-
-#~ msgid "?plural:Syrians"
-#~ msgstr "Siris"
-
-#~ msgid ""
-#~ "The modern Syrian Arab Republic was formed from a French mandate and "
-#~ "gradually gained independence during the 1940s."
-#~ msgstr ""
-#~ "La República Àrab Síria moderna va ser formada per un mandat francès i va "
-#~ "guanyar la independència gradualment durant la dècada dels 1940."
-
-#~ msgid "Taino"
-#~ msgstr "Taïno"
-
-#~ msgid "?plural:Taino"
-#~ msgstr "Taïnos"
-
-#~ msgid ""
-#~ "Native inhabitants of the Bahamas, Cuba, Hispaniola, Puerto Rico, "
-#~ "Jamaica, and other Caribbean islands who gave us the root words for "
-#~ "hurricane, tobacco, potato, canoe, barbeque, hammock, and yucca. They "
-#~ "were a matrilineal people, and the first that Columbus came into contact "
-#~ "with in 1492. Though numbering the hundreds of thousands, if not "
-#~ "millions, throughout the Caribbean, the Taino fell victim to slavery and "
-#~ "disease, and their population declined rapidly as a result. Spanish "
-#~ "accounts paint them as a peaceful people compared to their Carib "
-#~ "neighbors to the south. Their dugout canoes, which were often nearly as "
-#~ "long as Columbus' ships, ferried traders between islands. Recent genetic "
-#~ "studies show that roughly half of Puerto Ricans have Taino maternal "
-#~ "descent."
-#~ msgstr ""
-#~ "Són els habitants nadius de les Bahames, Cuba, la Hispaniola, Puerto "
-#~ "Rico, Jamaica i d'altres illes del Carib, que ens van donar les paraules "
-#~ "originals d'huracà, tabac, patata, canoa, barbacoa, hamaca i iuca. Eren "
-#~ "un poble matrilineal, i van ser els primers amb qui va contactar Colom el "
-#~ "1492. Malgrat tenir una població de centenars de milers, o possiblement "
-#~ "milions, per tot el Carib, els taïno van caure víctimes de l'esclavatge i "
-#~ "les malalties, i la seva població va decaure ràpidament. Les cròniques "
-#~ "espanyoles els descriuen com un poble pacífic, comparat amb els seus "
-#~ "veïns caribs del sud. Les seves canoes a base de troncs buidats, que "
-#~ "sovint eren gairebé tan llargues com els vaixells d'en Colom, "
-#~ "traslladaven comerciants d'illa en illa. Estudis genètics recents mostren "
-#~ "que al voltant de la meitat dels porto-riquenys tenen ascendència taïno "
-#~ "per via materna."
-
-#~ msgid "Cacike"
-#~ msgstr "Cacike"
-
-#~ msgid "Bohike"
-#~ msgstr "Bohike"
-
-#~ msgid "Tairona"
-#~ msgstr "Tairona"
-
-#~ msgid "?plural:Tairona"
-#~ msgstr "?plural:Tairona"
-
-#~ msgid ""
-#~ "A Chibchan-speaking people related to the Kuna of Panama and the Muisca "
-#~ "of central Colombia, the Tairona inhabit the modern Magdalena and La "
-#~ "Guajira Departments of northern Colombia. Their city of Teyuna was "
-#~ "founded sometime around 500BCE. The Tairona, living a mountainous area, "
-#~ "built stone steps and terraces on steep hillsides in order to farm the "
-#~ "region. Though they fought against the Spanish for 75 years, eventually "
-#~ "they succumb to the various pressures that all Native American peoples "
-#~ "were subject to at the period."
-#~ msgstr ""
-#~ "Els Tairona, poble relacionat amb els Kuna de Panamà i els Muisca de "
-#~ "Colòmbia central que parla xibxa, viuen al nord de Colòmbia, als "
-#~ "departaments de Magdalena i La Guajira. La seva ciutat de Teyuna es va "
-#~ "fundar al voltant de l'any 500 a.C. Els Tairona, que vivien en una zona "
-#~ "de muntanya, van construir escales i feixes de pedra en pendents "
-#~ "pronunciats per poder llaurar a la regió. Encara que van lluitar contra "
-#~ "els espanyols durant 75 anys, al final van cedir a les diferents "
-#~ "pressions a les quals estaven subjectes tots els pobles nadius americans "
-#~ "de l'època."
-
-#~ msgid "Hankwa"
-#~ msgstr "Hankwa"
-
-#~ msgid "Guacanaoma"
-#~ msgstr "Guacanaoma"
-
-#~ msgid "Tajik"
-#~ msgstr "Tadjik"
-
-#~ msgid "?plural:Tajiks"
-#~ msgstr "?plural:Tadjiks"
-
-#~ msgid ""
-#~ "Nation in Central Asia. Conquered by the Russian Empire in 19th century, "
-#~ "Tajikistan got independence from the Soviet Union in 1991."
-#~ msgstr ""
-#~ "Nació de l'Àsia Central. Conquerida per l'Imperi Rus el segle XIX. "
-#~ "Tadjikistan va aconseguir la independència de la Unió Soviètica el 1991."
-
-#~ msgid "Knights Templar"
-#~ msgstr "Cavaller Templer"
-
-#~ msgid "?plural:Templars"
-#~ msgstr "Templers"
-
-#~ msgid ""
-#~ "The Knights Templar were formed after the first Crusade in order to "
-#~ "protect Pilgrims on their journeys in the Holy Land. The organization "
-#~ "grew to immense power and wealth in the next 200 years, and were the "
-#~ "innovators of many modern concepts such as Banking."
-#~ msgstr ""
-#~ "L'Orde del Temple va ser formada després de la primera Croada per tal de "
-#~ "protegir els pelegrins als seus viatges a Terra Santa. L'organització va "
-#~ "arribar a tenir un poder i una riquesa immensos durant els següents 200 "
-#~ "anys, i van ser els creadors de molts conceptes moderns com la Banca."
-
-#~ msgid "Grand Mistress"
-#~ msgstr "Gran Mestressa"
-
-#~ msgid ""
-#~ "Texas is second largest and second most populous state of the USA, famous "
-#~ "for its \"larger than life\" cowboy mentality."
-#~ msgstr ""
-#~ "Texas és el segon estat més gran i populós  dels EUA, famós per la seva "
-#~ "mentalitat exagerada de cowboy."
-
-#~ msgid "Thracian"
-#~ msgstr "Traci"
-
-#~ msgid "?plural:Thracians"
-#~ msgstr "Tracis"
-
-#~ msgid "The second most numerous people in the ancient western world."
-#~ msgstr "El segon poble més nombrós del món antic a Occident."
-
-#~ msgid "Rhesos"
-#~ msgstr "Rhesos"
-
-#~ msgid "Dharma King"
-#~ msgstr "Rei Dharma"
-
-#~ msgid "Tocharian"
-#~ msgstr "Tokhari"
-
-#~ msgid "?plural:Tocharians"
-#~ msgstr "Tokharis"
-
-#~ msgid ""
-#~ "The Tocharians were an Indo-European people living what is now Xinjiang "
-#~ "in western China. Because of their unique geopolitical position, their "
-#~ "kingdoms of Shanshan, Kucha, and Khotan (as well as other, smaller ones) "
-#~ "were influenced by Chinese, Persian, Indian, Sogdian, Scythian, and "
-#~ "Tibetan cultures. Their religion, dress, writing, and art all reflect "
-#~ "these varied influences. They lived in oasis towns and cities along the "
-#~ "Silk Road, along which Buddhism was carried into China. The area was at "
-#~ "various times a military protectorate of China, such as during the Han "
-#~ "and Tang dynasties. During the decline of the latter dynasty, the Turkic "
-#~ "Uighur tribe moved into the Tarim basin, settling in and expanding their "
-#~ "khanate through the Tocharian lands. The Uighur intermarried with the "
-#~ "Tocharians and supplanted their language for all but liturgical purposes. "
-#~ "Even this use fell when Islam spread and took the place of Buddhism as "
-#~ "the predominant religion in the region."
-#~ msgstr ""
-#~ "Els tokharis van ser uns indoeuropeus que vivien al que ara és Xinjiang a "
-#~ "la Xina occidental. Degut a la seva posició geopolítica singular, els "
-#~ "seus regnes de Shanshan, Kucha i Khotan (així com d'altres més petits) "
-#~ "van ser influïts per les cultures xinesa, persa, índia, sogdiana, escita "
-#~ "i tibetana. La seva religió, vestimenta, escriptura i art reflecteixen "
-#~ "aquestes influències variades. Van viure en vil·les i ciutats oasi al "
-#~ "llarg de la Ruta de la Seda, per la qual el budisme va expandir-se fins a "
-#~ "la Xina. La zona va ser en diferents èpoques un protectorat militar de "
-#~ "Xina, com ara durant les dinasties Han i Tang. Durant el declivi "
-#~ "d'aquesta última dinastia, la tribu turca uigur va dirigir-se cap a la "
-#~ "conca del Tarim, quedant-s'hi i expandint el seu khanat per les terres "
-#~ "dels tokharis. Els uigur van barrejar-se amb els tokharis i va suplantar "
-#~ "la seva llengua en tots els àmbits, excepte el litúrgic. Fins i tot "
-#~ "aquest ús va decaure quan l'Islam es va estendre i va prendre el lloc del "
-#~ "Budisme com a religió predominant de la regió."
-
-#~ msgid "Kakmartik"
-#~ msgstr "Kakmartik"
-
-#~ msgid "Lant"
-#~ msgstr "Lant"
-
-#~ msgid "Lantsa"
-#~ msgstr "Lantsa"
-
-#~ msgid "Tupi"
-#~ msgstr "Tupí"
-
-#~ msgid "?plural:Tupi"
-#~ msgstr "Tupí"
-
-#~ msgid ""
-#~ "The Tupi are a native Brazilian people related to the Guarani who "
-#~ "inhabited the modern Brazilian states of Paraiba, Pernambuco, Ceara, Rio "
-#~ "Grande do Norte, Alagoas, Sergipe and others as well. Their chiefdoms "
-#~ "were destroyed through Portuguese slave-raids, the creation of mission-"
-#~ "villages, and disease. The Tupi intermarried with African slaves and "
-#~ "Europeans alike and a great many Brazilian place names are derived from "
-#~ "Tupi words. "
-#~ msgstr ""
-#~ "Els Tupí són un poble indígena del Brasil, relacionat amb els guaranís, "
-#~ "que vivien als estats brasilers actuals de Paraiba, Pernambuco, Ceara, "
-#~ "Rio Grande do Norte, Alagoas, Sergipe, i d'altres. Els seus dominis van "
-#~ "ser destruïts arran de la captura d'esclaus per part dels portuguesos, la "
-#~ "creació de pobles-missió, i les malaties. Els Tupí es van barrejar tant "
-#~ "amb esclaus africans com amb europeus. Molts topònims brasilers són "
-#~ "derivats de paraules tupí."
-
-#~ msgid "Morubixaba"
-#~ msgstr "Morubixaba"
-
-#~ msgid "Paje"
-#~ msgstr "Paje"
-
-#~ msgid "Turkmen"
-#~ msgstr "Turcman"
-
-#~ msgid "?plural:Turkmens"
-#~ msgstr "Turcmans"
-
-#~ msgid ""
-#~ "Nation in Central Asia. Conquered by the Russian Empire in 19th century, "
-#~ "Turkmenistan got independence from the Soviet Union in 1991."
-#~ msgstr ""
-#~ "Nació de l'Àsia Central. Conquerida per l'Imperi Rus el segle XIX, el "
-#~ "Turkmenistan va obtenir la independència de la Unió Soviètica el 1991."
-
-#~ msgid "Turkish"
-#~ msgstr "Turc"
-
-#~ msgid "UN"
-#~ msgstr "NU"
-
-#~ msgid "?plural:UN"
-#~ msgstr "NU"
-
-#~ msgid ""
-#~ "The United Nations believe in human rights and the protection of the weak."
-#~ msgstr ""
-#~ "Les Nacions Unides creuen en els drets humans i la protecció dels dèbils."
-
-#~ msgid "?female:Chairperson"
-#~ msgstr "Presidenta"
-
-#~ msgid "Secretary-General"
-#~ msgstr "Secretari General"
-
-#~ msgid "?female:Secretary-General"
-#~ msgstr "Secretària General"
-
-#~ msgid "Representative"
-#~ msgstr "Representant"
-
-#~ msgid "?female:Representative"
-#~ msgstr "Representant"
-
-#~ msgid "Uruguayan"
-#~ msgstr "Uruguaià"
-
-#~ msgid "?plural:Uruguayans"
-#~ msgstr "Uruguaians"
-
-#~ msgid ""
-#~ "Uruguay, a small South American country sometimes referred to as "
-#~ "\"Switzerland of the Americas\" due to its once highly developed social "
-#~ "welfare system."
-#~ msgstr ""
-#~ "Uruguai és un petit país sudamericà, a vegades anomenat \"La Suïssa de "
-#~ "les Amèriques\" degut al seu sistema de benestar social que havia estat "
-#~ "molt desenvolupat."
-
-#~ msgid "Uzbek"
-#~ msgstr "Uzbek"
-
-#~ msgid "?plural:Uzbeks"
-#~ msgstr "Uzbeks"
-
-#~ msgid ""
-#~ "Nation in Central Asia. Uzbekistan was the center of ancient states such "
-#~ "as Khoresm, Khanate of Bukhara, Khanate of Kokand and others. Conquered "
-#~ "by the Russian Empire in 19th century, Uzbekistan got independence from "
-#~ "the Soviet Union in 1991."
-#~ msgstr ""
-#~ "Nació de l'Àsia Central. L'Uzbekistan va ser el centre d'estats antics "
-#~ "com ara Khoresm, el Khanat de Bukhara, el khanat de Kokand i d'altres. "
-#~ "Conquerida per l'imperi rus el segle XIX, l'Uzbekistan va obtenir la "
-#~ "independència de la Unió Soviètica el 1991."
-
-#~ msgid "Venezuelan"
-#~ msgstr "Veneçolà"
-
-#~ msgid "Terratenienta"
-#~ msgstr "Terratinent"
-
-#~ msgid ""
-#~ "Westphalia, before becoming a Prussian province, was the western region "
-#~ "of the Duchy of Saxony. Today it makes up the northern part of the "
-#~ "largest German federal state, North Rhine-Westphalia."
-#~ msgstr ""
-#~ "Westfàlia, abans de convertir-se en una província de Prússia, era la "
-#~ "regió occidental del ducat de Saxònia. Avui en dia forma la part "
-#~ "septentrional de l'estat federal alemany més gran, Rin del Nord-Westfàlia."
-
-#~ msgid ""
-#~ "Another city!  You are really getting the hang of this.  You\n"
-#~ "probably have a pretty good idea what to do with new cities by\n"
-#~ "now.  Take a moment to look at the bar below the city on the map\n"
-#~ "view.  This display shows some useful information about the city.\n"
-#~ "The flag and background color indicate what civilization the city\n"
-#~ "belongs to (this will be useful when you meet other civilizations).\n"
-#~ "The top row of the bar also shows the name and size of the city, and\n"
-#~ "will show one or more stars to indicate if there are units in the\n"
-#~ "city.  The bottom row shows what the city is building, and how long it\n"
-#~ "will take; it also shows how long the city will take to grow to the\n"
-#~ "next largest size."
-#~ msgstr ""
-#~ "Una altra ciutat! Ja ho comences a dominar. Segur que ara mateix\n"
-#~ "ja saps què fer amb les ciutats creades de nou. Fixa't un moment \n"
-#~ "en la barra que hi ha a sota de la ciutat en el mapa. Mostra \n"
-#~ "informació força útil de la ciutat. La bandera i el color de fons \n"
-#~ "assenyalen a quina civilització pertany (et serà útil quan contactis\n"
-#~ "amb altres civilitzacions). La primera línia de la barra mostra el nom\n"
-#~ "i la mida de la ciutat, i hi haurà estrelles indicant la presència\n"
-#~ "d'unitats dins de la ciutat. La segona línia mostra què s'està "
-#~ "construint\n"
-#~ " a la ciutat, quant trigarà a construir-ho i quant trigarà la ciutat a "
-#~ "créixer."
-
-#~ msgid ""
-#~ "As the number of cities in your empire grows, it becomes harder to\n"
-#~ "manage individual cities.  This is where the city report becomes\n"
-#~ "useful.  Press F4 to bring it up.  This report shows a list of cities\n"
-#~ "with various statistics about each.  Play around with it a bit if you\n"
-#~ "like (return to the map view by clicking on the Map tab).  With a bit\n"
-#~ "of practice it is possible to control almost every aspect of the cities\n"
-#~ "from this report.  The full power of the city report is beyond the\n"
-#~ "scope of this tutorial, however."
-#~ msgstr ""
-#~ "A mesura que el nombre de ciutats del teu imperi creix, cada cop es fa "
-#~ "més\n"
-#~ "difícil gestionar cadascuna de les ciutats. És ara que l'informe de "
-#~ "ciutats\n"
-#~ "comença a ser útil. Prem F4 per a obrir-lo. Aquest informe mostra\n"
-#~ "una llista de ciutats amb algunes estadístiques de cadascuna. Si vols\n"
-#~ "pots entretenir-t'hi una mica, per a tornar al mapa clica la pestanya\n"
-#~ "Mapa. Amb una mica de pràctica es poden controlar gairebé tots els \n"
-#~ "aspectes d'una ciutat des d'aquest informe. Però l'objectiu d'aquesta\n"
-#~ "guia no és mostrar tota la potència del informe de ciutats."
-
-#~ msgid ""
-#~ "Your second Settlers should also be used to build a new city.\n"
-#~ "Notice how when you move the Settlers away from your existing cities\n"
-#~ "an outline is drawn around them.  This shows the area that would be\n"
-#~ "covered by a city built at this location; it fits in with the outline\n"
-#~ "already on the map view that shows which tiles are covered by your\n"
-#~ "existing cities.  Generally when building new cities you want to make\n"
-#~ "sure that all tiles are covered by at least one city, but after that\n"
-#~ "it is best that your cities overlap as little as possible.  Spreading\n"
-#~ "out cities properly gives each city access to more resources, allowing\n"
-#~ "them to grow to larger sizes."
-#~ msgstr ""
-#~ "Pots fer servir els teus segons Colons per fundar una nova ciutat.\n"
-#~ "Fixa't que quan mous els Colons lluny de les teves ciutats es\n"
-#~ "dibuixa un contorn al seu voltant. Això marca el tros de territori\n"
-#~ "que agafaria la ciutat si la fundessis en aquesta posició; concorda\n"
-#~ "amb el contorn que ja està dibuixat al mapa i que mostra quines\n"
-#~ "caselles estan cobertes per les ciutats que ja tens. Normalment,\n"
-#~ "quan fundes noves ciutats, vols assegurar-te que totes les\n"
-#~ "caselles estiguin cobertes per almenys una ciutat, però després\n"
-#~ "d'això, el millor és que les teves ciutats es cavalquin tan poc com\n"
-#~ "sigui possible. Si s'escampen les ciutats de manera apropiada, cada\n"
-#~ "ciutat tindrà accés a més recursos, permetent que creixin més."
-
-#~ msgid ""
-#~ "You have built your first military unit!  Military units have two\n"
-#~ "basic purposes: attack and defense.  Each unit has an attack strength\n"
-#~ "and a defense strength.  While a Warriors is a measly 1/1, a Phalanx\n"
-#~ "is a much stronger defender with 2 defense (1/2).  A Catapult is a good\n"
-#~ "attacking unit because it has 6 attack (6/1).\n"
-#~ "\n"
-#~ "Usually it is a good idea to keep one or two defenders in each city.\n"
-#~ "Important cities like your capital may deserve extra protection.  Units\n"
-#~ "built in one city may be sent to another city to defend (press the G\n"
-#~ "key to enter goto mode to move units easily over distances).  If you\n"
-#~ "are at war, however, you may wish to move your unit toward an enemy\n"
-#~ "city to attack.  Be careful not to lose it though!"
-#~ msgstr ""
-#~ "Has construït la teva primera unitat militar! Les unitats militars\n"
-#~ "tenen dues utilitats bàsiques: l'atac i la defensa. Cada unitat té una\n"
-#~ "força d'atac i una de defensa. Mentre que els Guerrers només tenen 1/1,\n"
-#~ "una Falange és molt millor defensor amb 2 de defensa (1/2). La Catapulta\n"
-#~ "és una bona unitat atacant ja que té 6 punts d'atac (6/1).\n"
-#~ "\n"
-#~ "Normalment és una bona idea deixar una o dues unitats defensores a\n"
-#~ "cada ciutat. Les ciutats importants, com la capital, poden merèixer\n"
-#~ "protecció extra. Unitats construïdes en una ciutat es poden enviar a una\n"
-#~ "altra ciutat per defensar-la (prem la tecla G per entrar al mode \"anar a"
-#~ "\"\n"
-#~ "que permet moure les unitats més fàcilment a distàncies llargues). Si "
-#~ "estàs\n"
-#~ "en guerra, de totes maneres, pots voler moure la unitat cap a una ciutat\n"
-#~ "enemiga per atacar-la. Però vés amb compte de no perdre-la!"
-
-#~ msgid ""
-#~ "You have successfully completed research into The Republic.  This\n"
-#~ "technology is particularly useful because it allows a new form of\n"
-#~ "government.  The government your civilization follows is very\n"
-#~ "important in determining your development.  In the beginning you\n"
-#~ "started as a Despotism, a very inefficient form of government.  Later\n"
-#~ "government options will give you some choice of whether your\n"
-#~ "civilization is to be a peaceful trading nation or a conquering\n"
-#~ "juggernaut.  Each has advantages.\n"
-#~ "\n"
-#~ "For now, you probably want to switch straight into Republic.  In the\n"
-#~ "Government menu, go to the Change Government submenu and choose\n"
-#~ "Republic.  Yes you want a revolution!  Changing governments means\n"
-#~ "going through a few turns of anarchy, so it is not without cost.\n"
-#~ "However Republic is a substantially better form of government\n"
-#~ "than Despotism so the investment will soon pay off."
-#~ msgstr ""
-#~ "Has aconseguit de completar la teva recerca fins a la República.\n"
-#~ "Aquesta tecnologia és especialment útil perquè permet una nova\n"
-#~ "forma de govern. El govern que segueix la teva civilització és molt\n"
-#~ "important a l'hora de determinar el teu desenvolupament. Al principi\n"
-#~ "havies començat amb Despotisme, una forma de govern molt\n"
-#~ "ineficient. Les opcions de govern posteriors et deixaran cert marge\n"
-#~ "per decidir si la teva civilització ha de ser una nació comercial i\n"
-#~ "pacífica, o una potència conqueridora. Tot té els seus avantatges.\n"
-#~ "\n"
-#~ "Per ara, val més que canviïs directament a la República. Al menú de\n"
-#~ "Govern, vés al submenú de Canvi de Govern, i tria República. Sí, vols\n"
-#~ "una revolució! Canviar de govern implica passar per alguns torns\n"
-#~ "d'anarquia; per tant, no és de franc. Però la República és una forma\n"
-#~ "de govern notablement millor que el Despotisme; per tant, la inversió\n"
-#~ "valdrà la pena en poc temps."
-
-#~ msgid ""
-#~ "Your unit has found a Hut.  These are small villages scattered across\n"
-#~ "the landscape.  When a unit enters one, several things may happen.  The\n"
-#~ "most likely outcome is that you will find resources worth a small\n"
-#~ "amount of gold.  However it is also possible to find technologies or\n"
-#~ "mercenary units inside a hut.  Some huts contain native settlers\n"
-#~ "that will join your civilization and bring a new city into your\n"
-#~ "empire.  Finally, some huts contain barbarians which will kill your\n"
-#~ "unit instantly.  On average, it is beneficial to search out and enter\n"
-#~ "any huts you find as soon as possible."
-#~ msgstr ""
-#~ "La teva unitat ha trobat una cabana. Les cabanes són petites viles\n"
-#~ "escampades pel territori. Quan una unitat entra en una, poden passar\n"
-#~ "diferents coses. La més probable és que hi trobis algunes monedes d'or.\n"
-#~ "També és possible que en una cabana hi trobis avenços tecnològics o\n"
-#~ "unitats mercenàries. Algunes cabanes contenen colons nadius que\n"
-#~ "s'uniran a la teva civilització i que donaran lloc a una nova ciutat per\n"
-#~ "al teu imperi. Finalment, algunes cabanes contenen bàrbars que \n"
-#~ "mataran la teva unitat instantàniament. En general, és beneficiós\n"
-#~ "cercar-les i entrar-hi tan aviat com puguis. "
diff --git a/po/cs.gmo b/po/cs.gmo
index 2a1ada5..239537e 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index e33d02a..66cb71f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\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"
@@ -53,22 +53,22 @@ msgstr "Luxus"
 msgid "Science"
 msgstr "Věda, výzkum"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:S"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:ds"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:Z"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:S"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:ds"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -539,82 +539,82 @@ msgstr "Probíhá připojování."
 msgid "AI Debug messages"
 msgstr ""
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:Genocidní"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:Útočný"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:Nepřátelský"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:Nespolupracující"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:Nesnadný"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?attitude:Neutrální"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:Zdvořilý"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:Prospěšný"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:Nadšený"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:Obdivující"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:Ctihodný"
 
-#: common/player.c:759
+#: common/player.c:764
 #, fuzzy
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Aliance"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Válka"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Příměří"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Mír"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Aliance"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Žádné setkání"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Tým"
 
@@ -660,13 +660,13 @@ msgstr "%s jednotek"
 msgid "Size %d"
 msgstr "Velikost %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Tech. budoucnosti %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -678,65 +678,65 @@ msgstr "Tech. budoucnosti %d"
 msgid "None"
 msgstr "Žádné"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Tech. budoucnosti"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Neznámý)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Cesta"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Zavlažování"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Železnice"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Důl"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Znečištění"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Chatrč"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Pevnost"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Řeka"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Farma"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Letiště"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Spad"
 
@@ -842,11 +842,11 @@ msgstr "Jaderná střela"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " a "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?and:, "
 
@@ -1004,80 +1004,80 @@ msgstr[0] " (celkem %d opakování)"
 msgstr[1] " (celkem %d opakování)"
 msgstr[2] " (celkem %d opakování)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Prázdný argument pro \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Chybějící argument pro \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d pÅ™.n.l."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d n.l."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "Proměnná FREECIV_PATH je nastavena, ale je prázdná; použita výchozí cesta."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Nelze přečíst datový adresář %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "Datovou cestu lze nastavit pomocí proměnné prostředí FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Současná datová cesta je: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Je potřeba soubor \"%s\" ... končím!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Kritická chyba: snažíte se spustit program jako superuživatel!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Použijte neprivilegovaný uživatelský účet.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "přesná shoda"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "jediná shoda"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "nejednoznačné"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "prázdné"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "příliš dlouhé"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "neshoda"
 
@@ -1106,92 +1106,92 @@ msgstr "%s zahájili stavbu %s ve městě %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s prodal %s (nepotřebuje) za %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, fuzzy, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (PO)* V pryč módu nemůže podepsat smlouvu"
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, fuzzy, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (Řízený počítačem)* První zruš alianci s %s, %s"
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, fuzzy, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (Řízený počítačem)* Ukončeme první nepřátelství, %s"
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr "*%s (PO)* Tak lehce to nepůjde, %s. Současné smlouvy zůstávají."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, fuzzy, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (Řízený počítačem)* První zruš alianci s %s, %s"
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr ""
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 "*%s (Řízený počítačem)* Promiň, ale sdílet s tebou vidění není bezpečné."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (Řízený počítačem)* Vítej v alianci %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, fuzzy, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (Řízený počítačem)* Jasně, zůstaňme spojenci navždy, %s"
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (Řízený počítačem)* Mír. Dobrý nápad!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, fuzzy, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (Řízený počítačem)* Souhlasím. Žádné nepřátelství, %s"
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (PO)* Vesmír nebude nikdy tvůj."
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, fuzzy, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (řízen počítačem)* Mír .... hm, někdy jindy"
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1200,17 +1200,17 @@ msgstr ""
 "*%s (řízen počítačem)* Ha, konečně jsme Vás prokoukli! Si myslíte, že Vás "
 "necháme na pokoji s Vašimi zločiny?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (PO)* Vaše agrese proti %s byl váš poslední omyl!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1222,14 +1222,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1243,7 +1243,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1255,13 +1255,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1273,12 +1273,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1290,7 +1290,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1302,7 +1302,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1311,14 +1311,14 @@ msgstr ""
 "*%s (řízen počítačem)* Snažíte se obsadit vesmír pro sebe zrazujíce naše "
 "skutečné cíle. Už nejsme spojenci!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr "*%s (řízen počítačem)* Vaše snaha dobýt vesmír je velmi nepěkná."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1327,13 +1327,13 @@ msgstr ""
 "*%s (řízen počítačem)* Jestli okamžitě nepřestanete stavět tu vesmírnou loď, "
 "budeme nuceni přijmout patřičná opatření!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 "*%s (řízen počítačem)* Lituji, ale sdílené vidění s Vámi už není bezpečné."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1342,7 +1342,7 @@ msgstr ""
 "*%s (řízen počítačem)* Buďte zdrávi, naši nejlepší spojenci. Voláme Vás, aby "
 "jste zničili naše nepřátele, %s"
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1351,7 +1351,7 @@ msgstr ""
 "*%s (řízen počítačem)* Nazdar spojenče, vidím, že jsi ještě nevyhlásil válku "
 "našim nepřátelům, %s. Proč Ti to musím připomínat?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1362,7 +1362,7 @@ msgstr ""
 "klidně vegetuješ v míru s naším smrtelným protivníkem, %s! To nepřipustíme, "
 "rušíme alianci!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1371,12 +1371,12 @@ msgstr ""
 "*%s (řízen počítačem)* Nazdar příteli, mohl bych navrhnout spojení sil proti "
 "%s?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, fuzzy, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr "*%s (PO)* Zdravíme sousede, můžeme navrhnout společné tažení proti %s?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1385,7 +1385,7 @@ msgstr ""
 "*%s (řízen počítačem)* %s je nebezpečný pro nás oba, nevyhlásíme mu "
 "nepřátelství společně?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1393,59 +1393,64 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Všechny možnosti"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (veterán)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Toto jméno není povoleno."
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Nelze nalézt zvukový soubor %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 "Upozornění: jméno hosta '%s' je obsazené, přejmenování na uživatele '%s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Hosté nejsou povoleni na tomto serveru. Lituji."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, fuzzy, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s byl(a) odmítnut(a): Nesouhlasící vlastnosti."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1454,7 +1459,7 @@ msgstr ""
 "Objevila se chyba při čtení databáze uživatelů, přihlášení jako připojení "
 "hosta '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1462,39 +1467,39 @@ msgstr ""
 "Objevila se chyba při čtení z databáze uživatelů a přihlášení hostů není "
 "povoleno. Lituji"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Zadejte heslo pro %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Zadejte nové heslo (a zapamatujte si ho)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Tento server umožňuje jen předregistrované uživatele. Lituji."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, fuzzy, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "Tento server umožňuje jen předregistrované uživatele. Lituji."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Lituji, příliš mnoho špatných pokusů..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1502,32 +1507,32 @@ msgstr ""
 "Upozornění: Vyskytla se chyba při ukládání do databáze. Pokračujeme, ale "
 "vaše statistisky nebudou uloženy."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, fuzzy, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s byl(a) odmítnut(a): Nesouhlasící vlastnosti."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Vaše heslo je nesprávné. Zkuste to znovu."
 
-#: server/auth.c:549
+#: server/auth.c:569
 #, fuzzy
 msgid "Sorry, your connection timed out..."
 msgstr "Lituji, propojení letectvem není ještě implementováno."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 "Vaše heslo je příliš krátké, minimální délka je %d znaků. Zkuste to znovu."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2318,16 +2323,14 @@ msgid "Cast a vote."
 msgstr "Hlasovat."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Hráč s přístupovou úrovní info může použít příkazy pro hlasování.  Příkaz /"
 "vote následovaný \"yes\" nebo \"no\" a volitelně číslem hlasování provede "
@@ -2337,18 +2340,18 @@ msgstr ""
 "pokud více jak polovina hráčů hlasuje proti.  Pokud proběhne jedno celé "
 "kolo, hlasování projde, i když proti němu někdo hlasuje."
 
-#: server/commands.c:122
+#: server/commands.c:121
 #, fuzzy
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr "debug [ player <hráč> | city <x> <y> | units <x> <y> | unit <id> ]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Zapnutí nebo vypnutí ladění dané počítačově ovládané entity."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2356,23 +2359,23 @@ msgstr ""
 "Psát ladící informace o počítačem řízeném hráči a přepnutí plynulého ladění "
 "dané entity do režimu zap nebo vyp."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <jméno-volby> <hodnota>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Nastavena možnost serveru."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <hráč> [tým]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Mění, přidává nebo odebíra příslušnost hráče k alianci."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2385,15 +2388,15 @@ msgstr ""
 "viděním, ambasádami a bojujícími společně za dosažení vítězství týmu. "
 "Jednotlivá skore jsou pak průměrována."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <adresář>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Vyberte nový adresář s pravidly nebo modpack."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2402,15 +2405,15 @@ msgstr ""
 "zobrazí současný adresář s pravidly."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <meta-řádek>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Nastaví text s infornací pro metaserver."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2419,19 +2422,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <meta-řádek>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Nastaví text s patchy pro metaserver."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Ovládá spojení s metaserverem."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2442,33 +2445,33 @@ msgstr ""
 "'metaconnection up' or 'metac u' naváže spojení s metaserverem."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <adresa>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Nastaví adresu (URL) metaserveru, na který budou odesílány informace."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <jméno-hráče>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Přepne druh hráče"
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [název-spojení ] <jméno-hráče>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Převzít hráčovo místo ve hře."
 
-#: server/commands.c:185
+#: server/commands.c:184
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2483,15 +2486,15 @@ msgstr ""
 "nepoužije argumenty, pak je spojení napojeno na globálního pozorovatele."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [název-spojení] [jméno-hráče]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Pozorovat hráče nebo celou hru."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2505,15 +2508,15 @@ msgstr ""
 "nepoužije argumenty, pak je spojení napojeno na globálního pozorovatele."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <jméno-spojení>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "odpojit od hráče."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2522,20 +2525,20 @@ msgstr ""
 "odpojit od hráče."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <jméno-hráče>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Vytvoří počítačového hráče s uvedeným jménem."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "Příkaz 'create' je dostupný pouze před startem hry."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2543,16 +2546,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Nastavíte se do pryč módu. Počítač na vás počká."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "Počítač bude řídit váš národ, ale s minimálními změnami."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2560,11 +2563,11 @@ msgstr ""
 "novice\n"
 "novice <jméno-hráče>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Úroveň jednoho nebo všech počítačových hráčů bude 'nováček'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2575,7 +2578,7 @@ msgstr ""
 "'nováček'.  S argumentem nastaví úroveň pouze uvedeného hráče."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2583,11 +2586,11 @@ msgstr ""
 "easy\n"
 "easy <jméno-hráče>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Úroveň jednoho nebo všech počítačových hráčů bude 'easy'."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2598,7 +2601,7 @@ msgstr ""
 "argumentem nastaví úroveň pouze uvedeného hráče."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2606,11 +2609,11 @@ msgstr ""
 "normal\n"
 "normal <jméno hráče>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Úroveň jednoho nebo všech počítačových hráčů bude 'normal'."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2621,7 +2624,7 @@ msgstr ""
 "argumentem nastaví úroveň pouze uvedeného hráče."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2629,11 +2632,11 @@ msgstr ""
 "hard\n"
 "hard <jméno-hráče>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Úroveň jednoho nebo všech počítačových hráčů bude 'hard'."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2644,7 +2647,7 @@ msgstr ""
 "argumentem nastaví úroveň pouze uvedeného hráče."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2652,11 +2655,11 @@ msgstr ""
 "experimental\n"
 "experimental <jméno-hráče>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Nastaví jednoho nebo všechny počítačové hráče na 'experimentalní'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2669,7 +2672,7 @@ msgstr ""
 "VLASTNOSTÍ! Na normální servery tato možnost nemá vliv."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2683,11 +2686,11 @@ msgstr ""
 "cmdlevel <úroveň> first\n"
 "cmdlevel <úroveň> <jméno-spojení>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Zobrazí nebo nastaví oprávnění k provádění příkazů."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2727,20 +2730,20 @@ msgstr ""
 "neboť někdo jiný by se mohl znovu připojit se stejným jménem.  Všiměte si, "
 "že příkaz očekává jméno spojení a nikoliv jméno hráče."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <tah> <turninc> <hodnota> <valuemult>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Viz \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2751,42 +2754,42 @@ msgstr ""
 "tento příkaz společně s volbou \"timeout\". Výchozí hodnoty jsou 0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 #, fuzzy
 msgid "endgame"
 msgstr "Přejmenovat"
 
-#: server/commands.c:311
+#: server/commands.c:310
 #, fuzzy
 msgid "End the game immediately in a draw."
 msgstr "Hra skončila remízou"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "kapitulace"
 
-#: server/commands.c:316
+#: server/commands.c:315
 #, fuzzy
 msgid "Concede the game."
 msgstr "Nelze nahrát uloženou hru"
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <jméno-hráče>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Odstraní hráče ze hry."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2795,7 +2798,7 @@ msgstr ""
 "jednotek atd.  Používejte opatrně!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2803,11 +2806,11 @@ msgstr ""
 "save\n"
 "save <jméno-souboru>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Uloží hru do souboru."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2823,7 +2826,7 @@ msgstr ""
 "počkejte až se všichni hráči znovu připojí a použijte příkaz 'start'."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2831,11 +2834,11 @@ msgstr ""
 "load\n"
 "load <název-souboru>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Nahrát hru ze souboru."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2844,28 +2847,28 @@ msgstr ""
 "voleb serveru budou ztracena.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <jméno-souboru>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Zpracování serverových příkazů ze souboru."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <jméno-souboru>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Uloží současná nastavení jako serverové příkazy do souboru."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Přepne výstup serveru mezi 'RFC-stylem' a normálním stylem."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Jednoduše vrátí id serveru."
 
@@ -3377,28 +3380,37 @@ msgstr "Způsobil jste incident při pokusu vyvolat povstání ve městě %s."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s způsobil incident při pokusu vyvolat povstání ve městě %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "Námořní jednotky přidělované na začátku hry nejsou podporovány. Nikdo "
 "nedostal jednotku %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Rok: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Čas na jedno kolo překročil maximální hodnotu, upraveno na maximální hodnotu"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Čas na jedno kolo je menší než nula, upraveno na nulu."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3441,25 +3453,25 @@ msgstr "Neexistuje žádné spojení se jménem %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Neexistuje žádný hráč ani spojení se jménem %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Došlo ke globálnímu oteplení!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr "Pobřeží bylo zaplaveno vodou a suché okraje pastvin se staly pouštěmi."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Nastala nukleární zima!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr "Bažiny zamrzly a z mnoha pastvin se stala tundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3468,7 +3480,7 @@ msgstr ""
 "Nové nadšení prolétlo krajem po té, co byl ohlášen objev železnice.\n"
 "      Pracovníci spontánně vybudovali železnici ve všech městech."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3478,12 +3490,12 @@ msgstr ""
 "funguje.\n"
 "      Pracovníci spontánně vybudovali železnici ve všech městech."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Přesunuta naše %s kvůli změně moře na pobřeží."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Rozpuštěna naše %s kvůli změně moře na pobřeží."
@@ -3544,56 +3556,56 @@ msgid "You should choose a new government from the government menu."
 msgstr ""
 "Můžete si zvolit nové státní zřízení z menu Státní zřízení -> Změna zřízení."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr ""
 "Úroveň pro daně přesahuje maximální hodnotu povolenou pro %s; upraveno."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr ""
 "Úroveň pro vědu přesahuje maximální hodnotu povolenou pro %s; upraveno."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr ""
 "Úroveň pro luxus přesahuje maximální hodnotu povolenou pro %s; upraveno."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s nám již neposkytuje sdílené vidění!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 "Senát souhlasil s vaším návrhem kvůli neustálým provokacím ze strany %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Diplomatický stav mezi %s a %s je nyní %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3601,13 +3613,13 @@ msgid ""
 msgstr ""
 " %s zrušili diplomatické dohody! Diplomatický stav mezi %s a %s je nyní %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr "%s zaútočili na na naše spojence %s! Zrušili jsme alianci s agresorem."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3615,54 +3627,54 @@ msgid ""
 msgstr ""
 "Váš týmový spoluhráč %s vyhlásil válku %s. Jsme povinni zrušit alianci s %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Odstraňuji hráče %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Byl jste odstraněn ze hry."
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s byl(a) odstraněn(a) ze hry."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Učinil(a) jste kontakt s %s, kterým vládne %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, fuzzy, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr "%s zaútočili na na naše spojence %s! Zrušili jsme alianci s agresorem."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Nelze uvrhnout %s do občanské války - příliš mnoho hráčů"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Nelze uvrhnout %s do občanské války - příliš mnoho hráčů"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr "Váš národ byl strhnut do občanské války,  %s je nyní vůdce rebelů."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "Město %s vyhlásilo věrnost %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3901,20 +3913,20 @@ msgstr "."
 msgid "th"
 msgstr "."
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Řetězec Demografie obsahuje neplatné znaky. Zkuste \"help demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Demografický přehled"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Lituji, ale demografický přehled není k dispozici."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%s %s (%s)"
@@ -3925,11 +3937,11 @@ msgstr "%s %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Nemohu najít čitelný soubor pravidel \"%s\"."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Nahrávám pravidla"
 
@@ -3944,7 +3956,7 @@ msgstr ""
 "Uložená hra obsahuje neúplná data mapy. Může se jednat o starší verzi "
 "souboru nebo o neplatný soubor. Pokračujte na vlastní nebezpečí."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Uložená hra je příliš stará. Nutná je alespoň verze 1.9.0."
@@ -3967,13 +3979,13 @@ msgstr ""
 "podporovány. Použito '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4008,7 +4020,7 @@ msgstr "Interní"
 msgid "Networking"
 msgstr "Síťové"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "VÅ¡echny"
@@ -4029,7 +4041,7 @@ msgstr "Řídký"
 msgid "Changed"
 msgstr "Změněno"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4037,7 +4049,7 @@ msgstr ""
 "Řetězec allowed take obsahuje neplatné\n"
 "znaky. Zkuste \"help allowtable\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4045,7 +4057,7 @@ msgstr ""
 "Řetězec počátečních jednotek obsahuje neplatné\n"
 "znaky.  Zkuste \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4055,26 +4067,31 @@ msgstr ""
 "alespoň jednoho zakladatele města.  Zkuste \n"
 "\"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr "Počet hráčů je vyšší než požadovaná hodnota, zůstává původní hodnota"
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Nemáte povoleno měnit tuto volbu."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Velikost mapy (v tisících dlaždic)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4084,12 +4101,12 @@ msgstr ""
 "  velikost = 4 je normální mapa s 4,000 dlaždicemi (výchozí)\n"
 "  velikost = 20 je obrovská mapa s 20,000 dlaždicemi"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Index topologie mapy"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4157,11 +4174,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Metoda použitá pro generování mapy"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4181,11 +4198,11 @@ msgstr ""
 "je použita výchozí hodnota počtu startovních pozic, bude použita hodnota "
 "generátoru.  Viz. nastavení \"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Metoda použitá pro výběr počátečních pozic"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4207,35 +4224,35 @@ msgstr ""
 "Pozn.: generátor se snaží vytvořit správný počet kontinentů pro počet "
 "startovních pozic a hráčů"
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Existence 1x1 ostrovů"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = bez 1x1 ostrovů; 1 = s 1x1 ostrovy"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Jsou póly samostatné kontinenty"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr "0 = kontinenty mohou být spojeny s póly; 1 = póly jsou oddělené"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Celá mapa je s mírným podmebím"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = normální Zemi podobná planeta; 1 = celá planeta s mírným podnebím "
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Průměrná teplota na planetě"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4267,22 +4284,22 @@ msgstr ""
 "Při hodotě 0 bude planeta studená s rozsáhlými polárními oblastmi a bez "
 "tropů."
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Procento pevniny na mapÄ›"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 "Toto nastavení udává přibližné procentuální zastoupení pevniny na mapě."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Množství kopců/hor"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4290,11 +4307,11 @@ msgstr ""
 "Malé hodnoty dají ploché mapy, vyšší hodnoty dají nerovnější mapy s více "
 "kopci a pohořími."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Množství vody na pevnině"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4302,11 +4319,11 @@ msgstr ""
 "Nízké hodnoty znamenají suché pouštní země, kdežto vysoké zajistí svět s "
 "množstvím bažin džunglí a řek."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Inicializační hodnota generátoru map"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4317,11 +4334,11 @@ msgstr ""
 "zvolena náhodně. Toto nastavení má smysl měnit zřejmě jen při laďění kódu "
 "hry."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Náhodná inicializační hodnota"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4329,11 +4346,11 @@ msgstr ""
 "Pokud je ponecháno na 0 (výchozí nastavení), bude generátor startován "
 "náhodně. Toto nastavení má smysl měnit zřejmě jen při laďění kódu hry."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Množství polí se \"speciálními\" zdroji"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4341,11 +4358,11 @@ msgstr ""
 "Pole se speciálními zdroji zvýší základní vlastnosti terénu, na kterém jsou "
 "umístěny. Měřítko: množství na 1000 normálních políček."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Počet chýší (vesnic drobných kmenů)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4353,23 +4370,24 @@ msgstr ""
 "Toto nastavení říká, kolik chýší se má na mapě nacházet. Chýše jsou palé "
 "vesnice domorodců, jež mohou být nalezeny Vašimi jednotkami."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Minimální počet hráčů"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Ve hře mus být alespoň toto množství hráčů (ať již lidí nebo řízených "
 "počítačem), než bude možné spustit hru."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Maximální počet hráčů"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4379,11 +4397,11 @@ msgstr ""
 "již počet háčů ve hře dosáhl tohoto počtu, nebudou spojení od nových hráčů "
 "přijímána."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Celkový počet hráčů (včetně počítačem ovládaných)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 #, fuzzy
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
@@ -4392,11 +4410,11 @@ msgstr ""
 "Pokud je ve hře připojeno méně hráčů, budou při startu hry vygenerováni "
 "další, řízení počítačem (aby dolnili počet hráčů až na tuto hodnotu)."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Seznam jednotek hráče na začátku hry"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4423,27 +4441,27 @@ msgstr ""
 "    a   = Rychlá útočná jednotka (např., Jízda)\n"
 "    A   = Silná útočná jednotka (např., Katapult)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Počáteční rozptýlení jednotek"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "Toto je poloměr ve kterém jsou na počátku jednotky rozptýleny."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Zlato na začátku hry"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Toto množství zlata bude mít každý hráč na začátku hry."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Počet technologií na začátku hry"
 
-#: server/settings.c:481
+#: server/settings.c:472
 #, fuzzy
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
@@ -4454,11 +4472,11 @@ msgstr ""
 "Na začátku hry dostane každý hráč toto množství technologií. Ty jsou zvoleny "
 "náhodně."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 #, fuzzy
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
@@ -4468,11 +4486,11 @@ msgstr ""
 "Tato volba určuje jak rychle mohou hráči získat nový objev. Dvojnásobek této "
 "hodnoty zapříčiní dvakrát tak dlouho dobu zkoumání."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Procentuální penále při změně technologie"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4482,12 +4500,12 @@ msgstr ""
 "nich určité procento. Penalizace se nepočítá, pokud jste tento tah "
 "technologii dokončili."
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Penále za zisk technologie díky dohodě"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4499,11 +4517,11 @@ msgstr ""
 "při výzkumu nové technologie. Pokud tato hodnota není nulová, můžete skončit "
 "i se zápornou hodnotou bodů na výzkum."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Penále za zisk technologie dobytím města"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4513,11 +4531,11 @@ msgstr ""
 "výzkumu nové technologie. Pokud tento parametr není nulový, můžete skončit i "
 "se zápornou hodnotou bodů na výzkum."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Penále za bezplatné získání technologie"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4530,11 +4548,11 @@ msgstr ""
 "procenta při výzkumu nové technologie. Pokud tato hodnota není nulová, "
 "můžete skončit i se zápornou hodnotou bodů na výzkum."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Jídlo potřebné pro růst města"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4544,12 +4562,12 @@ msgstr ""
 "násobena další proměnnou, která je nastavena v závislosti na pravidlech a "
 "její velikost se mění s velikostí města."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Ztráta jídla při neexistenci akvaduktu"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4559,21 +4577,21 @@ msgstr ""
 "(nebo kanalizaci), ztratí určité množství (v procentech) zásob jídla (nebo "
 "polovinu tohoto množství, pokud je ve městě sýpka)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Minimální velikost města s plným obchodem"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4585,11 +4603,11 @@ msgstr ""
 "NOTRADESIZE a snižuje se postupně k nule (žádná penalizace kromě běžné "
 "korupce) pro mesta s velikostí FULLTRADESIZE. Viz též NOTRADESIZE."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Maximální velikost města bez obchodu"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4600,11 +4618,11 @@ msgstr ""
 "dosáhne při velikosti města FULLTRADESIZE. K fulltradesize je nápověda "
 "podobná, můžete tam nahlédnout."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Poslední šťastný ve městě"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4612,11 +4630,11 @@ msgstr ""
 "Bez dalších úprav bude při této velikosti ještě každý občan spokojený. Každý "
 "další už bude nespokojený. Viz. též proměnná cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Počet měst zvyšující nespokojenost"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4627,11 +4645,11 @@ msgstr ""
 "občan města bude nespokojený. (sníží se hodnota unhappysize). Toto "
 "předpokládá demokracii. Pro ostatní typy vlády je číslo nižší."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Minimální vzdálenost mezi městy"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4644,11 +4662,11 @@ msgstr ""
 "citymindist 3, musí být mezi novým a původním městem alespoň 2 prázdn "
 "políčka. Pokud je použita hodnota 0, bere se údaj z pravidel."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Počet tahů mezi efektem \"rapture\". (oslavy ve městě)"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4656,22 +4674,22 @@ msgstr ""
 "Nastaví počet kol mezi rustem města vlivem efektu \"rapture\". Pokud je "
 "nastaveno na \"n\", město se rozroste každých n+1 tahů."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Šance na zničení budov při dobývání"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr ""
 "Pokud hráč dobyde město,každé vylepšení města má tuto šanci na zničení."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Šance na obsazení pole po útoku"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4684,21 +4702,21 @@ msgstr ""
 "místo, na které útočí, když vyhraje (a nezbydou tam žádní neřátelé). Hodnota "
 "mezi 0 a 100 je použita jako procentuální šance na \"obsazení\" místa."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Snížit počet obyvatel po útoku"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4714,11 +4732,11 @@ msgstr ""
 "  4 = helikoptéry\n"
 "  8 = letectvo"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Poloměr státních hranic"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4729,11 +4747,11 @@ msgstr ""
 "uplatňují v ppřípadě moře a políček, které jsou v této vzdálenosti u více "
 "měst různých národů."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Jednoty ve vnitrozemí nezpůsobí nespokojenost"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4741,11 +4759,11 @@ msgstr ""
 "Pokd je toto nastaveno, jednotky nebudou působit nespokojenost, pokud jsou "
 "uvnitř vlastních hranic."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Možnosti diplomacie s ostatními hráči"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4759,11 +4777,11 @@ msgstr ""
 "3 = diplomacie je omezena na týmy.\n"
 "4 = diplomacie je pro všechny zakázána."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Povolená jména měst"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4788,11 +4806,11 @@ msgstr ""
 "3 = Jako nastavení 2, ale hráči není dovoleno používat výchozí jména měst "
 "jiných národů, pokud toto není výchozí i pro jeho národ."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Četnost barbarských nájezdů"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4806,19 +4824,19 @@ msgstr ""
 "3 = častá barbarská povstání \n"
 "4 = zuřící hordy, mnoho barbarů"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "První rok nájezdů"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbaři se neobjeví před tímto rokem."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Délka revoluce v tazích"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4826,11 +4844,11 @@ msgstr ""
 "Pokud se mění státní zřízení, tento počet tahů bude trvat anarchie. "
 "Nastavení této hodnoty na 0 způsobí trvání anarchie 1-6 tahů."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Používat clonu války"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4840,30 +4858,30 @@ msgstr ""
 "jednotky přímo vidí se vám ukáží. Neuvidíte nové města nebo terénní úpravy, "
 "které nevidí vaše jednotky."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Povolit závod v dobývání vesmíru"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Pokud je nastaveno na 1, mohou hráči stavět kosmické lodě."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Minimální počet měst pro občanskou válku"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4873,11 +4891,11 @@ msgstr ""
 "město. Pokud je tato volba nastavena na maximum, je občanská válka celkově "
 "zakázána."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Počet tahů, než je ztracen kontakt s jiným hráčem"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4887,12 +4905,12 @@ msgstr ""
 "naposledy setkaly jejich jednotky, když nemají ambasádu. Pokud je tato "
 "hodnota nastavena na 0, nemohou se sejít, pokud nemají ambasádu."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Vybudování paláce při dobytí hl. města"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4903,11 +4921,11 @@ msgstr ""
 "palác v jiném, náhodně zvoleném, městě. To je podstatné, protože technologie "
 "potřebná k budování paláce bude ignorována."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Jestli použít původní názvy měst"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -4915,11 +4933,11 @@ msgstr ""
 "Pokud je povoleno, budou výchozí jména měst nabízena v závislosti na okolním "
 "terénu."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Hráči, které jsou uživatelé oprávněni vzít"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4980,11 +4998,11 @@ msgstr ""
 "4 = Ovládání není povoleno, Pozorování povoleno;\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Přepnutí na/z počítačového ovládání"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -4992,35 +5010,38 @@ msgstr ""
 "Pokud je nastaveno na 1, Status Říezeno počítačem je vypnut, když se připojí "
 "hráč a zapnuto, pokud se odpojí."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Rok, ve kterém hra končí"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Hra na konci zvoleného roku skončí."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Maximální čas na kolo (v sekundách)"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "V případě, že někteří z hráčů nestiskli tlačítko \"Konec tahu\" do uvedeného "
 "počtu sekund skončí tah automaticky. Nula znamená neomezeně dlouhé tahy. "
 "Použití společně s příkazem \"timeoutincrease\" umožňuje dynamické změny "
 "délky kola. V DEBUG serverech znamená hodnota -1 testovací režim autogame."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "Prodleva nejméně n sekund když se přesouvá nepřítel"
 
-#: server/settings.c:896
+#: server/settings.c:889
 #, fuzzy
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
@@ -5029,22 +5050,22 @@ msgstr ""
 "Kdykoliv se přesouvá jednotka poblíž nepřátelského hráče, zbývající prodlevy "
 "jsou nastaveny na tuto hodnotu, když jsou nižší."
 
-#: server/settings.c:905
+#: server/settings.c:898
 #, fuzzy
 msgid "Whether to have simultaneous player phases."
 msgstr "Logovat statistiky hráčů"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Doba blokování spojení s klientem"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5053,11 +5074,11 @@ msgstr ""
 "TCP spojení bude ukončeno, pokud je blokováno déle než udává tato volba. "
 "Nula znamená, že není použit žádný limit."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Max sekund pro vyprázdnění síťových bufferů"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5067,11 +5088,11 @@ msgstr ""
 "odblokování všech klientských spojení. Nula znamená, že server nebude na "
 "blokovaná spojení čekat."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Sekund mezi PINGy"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5079,20 +5100,20 @@ msgstr ""
 "Civserver (server hry) bude testovat klienty pomoci PINGu, kdy uplyne tento "
 "interval."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Doba k odpojení klienta"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr "Pokud klient neodpoví na PING během této doby, bude odpojen."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Režim dokončování kol"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
@@ -5101,11 +5122,11 @@ msgstr ""
 "Pokud je nastaveno na 1, herní kolo se nedokončí, pokud jej nedokončí "
 "všichni hráči, včetně odpojených."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Režim fixní délky kola"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5115,11 +5136,11 @@ msgstr ""
 "uplyne čas potřebný pro jedno kolo, bez ohledu na to zda hráči stiskli "
 "\"Konec tahu\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Co obsahuje Demografický přehled"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5159,11 +5180,11 @@ msgstr ""
 "    b = zobraz sloupec \"nejlepší národ\"\n"
 "Pořadí těchto znaků není důležité, ale jejich velikost ano."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Počet kol před automatickým uložením"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5171,11 +5192,11 @@ msgstr ""
 "Hra bude uložena jednou za uvedený počet kol. Nula znamená automaticky "
 "neukládat."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Úroveň komprimace ukládaných her"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5186,11 +5207,11 @@ msgstr ""
 "trvá déle. Pokud nebyl tento server zkompilován s podporou knihovny zlib, "
 "bude maximální povolená hodnota nula."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Předpona automaticky ukládaných her"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5198,11 +5219,11 @@ msgstr ""
 "Automaticky ukládané hry budou mít jméno ve tvaru \"<předpona><rok>.sav\". "
 "Tato volba ovlivňuje část <předpona>."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Logovat statistiky hráčů"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5216,7 +5237,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Server nemůže číst ze standardního vstupu. Ignorováno."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Server: špatná adresa: [%s:%d]."
@@ -5348,102 +5369,102 @@ msgstr "Nepodařilo se uložit hru jako %s"
 msgid "Game saved as %s"
 msgstr "Hra uložena jako %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Hra již probíhá."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Zahajuji hru."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "požadavek pro neznámé hlášení (typ %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Upozornění: odmítnut starý klient %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Přijat paket typu %d od mrtvého hráče nebo pozorovatele"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Prosím zvolte si neprázdné jméno."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Tento národ je již použit."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "Jméno '%s' již používá jiný hráč.  Prosím zvolte si jiné jméno."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Prosím zvolte si jméno obsahující pouze ASCII znaky."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "%s národ je již použit."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s je %s vládce %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Čekání na start hry: %d z of %d hráčů je připraveno ke hře."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s byl přidán jako počítačem ovládaný hráč úrovně %s."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Hráč %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s vládne %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Posílám info metaserveru [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Hra je u konce..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Nyní přijímám spojení od klientů."
 
@@ -5464,7 +5485,7 @@ msgstr "(nejednoznačný)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5641,7 +5662,7 @@ msgstr "Po začátku hry již nelze odstraňovat hráče."
 msgid "Removed player %s from the game."
 msgstr "Hráč %s byl odstraněn ze hry."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5716,281 +5737,281 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr "Nelze zvýšit úroveň oprávnění na '%s'; máte pouze oprávnění '%s'."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Úroveň oprávnění pro spojení %2$s nastavena na '%1$s'"
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 "Příkazová přístupová úroveň nemůže být nastavena na '%s' pro spojení %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Příkazová přístupová úroveň je nastavena na '%s' pro nové hráče."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 "Příkazová přístupová úroveň nastavena na '%s' pro prvního hráče pro převzetí."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 #, fuzzy
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "Zadání příkazu 'firstlevel' na serveru nemá nemá význam."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Máte již úroveň oprávnění '%s' nebo lepší."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 #, fuzzy
 msgid "Someone else already is game organizer."
 msgstr "Někdo další má příkazovou přístupovou úroveň '%s' nebo lepší."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Neplatný argument %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Použití: timeoutincrease <počet> <hodnota> <přírůstek> <násobek>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Dynamický čas na kolo nastaven na %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Volba:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Popis:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Stav: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "změnitelné"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "neměnné"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Hodnota: %d, Minimum: 0, Výchozí: %d, Maximum: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Hodnota: %d, Minimum: %d, Výchozí: %d, Maximum: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Hodnota: \"%s\", Výchozí: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Pro následující volby serveru je dostupné vysvětlení:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Zatím bez vysvětlení."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Nejednoznačné jméno volby."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Operátor serveru: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Hráč '%s' ovládaný počítačem má nyní úroveň nastavenu na '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s není počítačem ovládaný hráč."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Výchozí schopnosti umělé inteligence nastaveny na '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Tento příkaz je pouze pro klienta."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Použití: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Pouze hráči mohou použít příkaz away."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s se nastavil na away mód."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s se vrátil(a) do hry."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Lituji, ale nemáte oprávnění k prohlížení volby '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Neznámá volba '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 #, fuzzy
 msgid "All options with non-default values"
 msgstr "= znamená, že volba má svou výchozí hodnotu"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Všechny možnosti"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Rozhodující možnosti"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Situační možnosti"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Zřídka používané možnosti"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ znamená, že můžete volbu změnit"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= znamená, že volba má svou výchozí hodnotu"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s hodnota (min,max)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Volba"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "popis"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 #, fuzzy
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr "Zkuste 'show situational' nebo 'show rare' pro zobrazení více možností"
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Nelze měnit týmy po spuštění hry."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 #, fuzzy
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Nedefinovaný argument.  Použití: team <hráč> [tým]."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Nelze být v týmu s barbary."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Hráč %s je v týmu %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Nedefinované argumenty. Použití: vote yes|no [vote číslo]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Pozorovatelé nemohou hlasovat."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Hlasování %d \"%s\": %d pro, %d proti"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Neprobíhá žádné hlasovaní."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Žádné předchozí platné hlasování."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Hodnota musí být celé číslo."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Žádné hlasování (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Zvolili jste \"%s\"."
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Hlasoval jsi proti \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 #, fuzzy
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
@@ -5999,426 +6020,454 @@ msgstr ""
 "Nedefinované argumenty. Použití: debug <player <player> | city <x> <y> | "
 "units <x> <y> | unit <id>>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Tento příkaz lze použít jednou po zahájení hry."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "%s dipolomacie se již neladí"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "%s diplomacie se ladí"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "%s technologie se již neladí"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "%s technologie se ladí"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Hodnota 2 a 3 musí být celé číslo."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Špatné koordináty mapy."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Na těchto koordinátech není město."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s se již neladí"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "%s %s se již neladí."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "%s %s se ladí."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Hodnota 2 musí být celé číslo."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Jednotka %d neexistuje."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Nedefinovaný argument.  Použití: set <volba> <hodnota>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Nemáte povoleno měnit tuto volbu."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Toto nastavení nelze změnit poté co byla hra zahájena."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Hodnota musí být celé číslo."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Hodnota mimo rozsah (minimum: 0, maximum: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Volba: %s byla nastavena na %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Hodnota mimo rozsah (minimum: %d, maximum: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Textová hodnota je příliš dlouhá.  Použití: set <volba> <hodnota>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Volba: %s byla nastavena na \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Lituji, ale nikdo nemůže pozorovat celou hru."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 "Lituji, nemůžete převzít globálního pozorvatele. Pozorujte ho místo toho."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Lituji, nelze přebírat hráče v této hře."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Lituji, žádné pozorování barbarů v této hře."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Lituji, nelze převzít barbary v této hře."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Lituji, nelze pozorovat mrtvé hráče v této hře."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Lituji, nelze převzít mrtvé hráče v této hře."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Lituji, nelze pozorovat počítačem ovládané hráče v této hře."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Lituji, nelze přezvít počítačem ovládané hráče v této hře."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Lituji, nelze pozorovat hráče v této hře."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "Lituji, nelze přebírat hráče v této hře."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Lituji, nelze pozorovat v této hře."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Lituji, nelze přebírat hráče v této hře."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "Lituji, ale nemůžeš převzít již připojeného hráče."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Použití: observe [název-spojení [jméno-hráče]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Použití: observe [jméno-hráče]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s již ovládá %s. Použití 'observe' odebere %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s již pozoruje %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s již pozoruje."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s nyní pozoruje %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s nyní pozoruje"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Použití: take <název-připojení> <jméno-hráče>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Použití: take <jméno-hráče>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Použití: take [název-spojení] <jméno-hráče>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s již ovládá %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Neexistuje žádný hráč ani spojení se jménem %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "byl odpojen od %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s nyní ovládá %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbar"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "Počítač"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Člověk"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Aktivní"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Mrtvý"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s není připojen k žádnému hráči."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Použití: detach <jméno-spojení>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Nemůžete odpojit jiné hráče."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s není připojen k žádnému hráči."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s se odpojuje od %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s již nepozoruje."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "odpojování od %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 #, fuzzy
 msgid "Usage: load <game name>"
 msgstr "Použití: load <jméno-souboru>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 #, fuzzy
 msgid "Cannot load a game while another is running."
 msgstr "Nelze nahrát hru, dokud jiná běží."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, fuzzy, c-format
 msgid "Could not load savefile: %s"
 msgstr "Nelze nahrát uložený soubor: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Současný adresář s pravidly je: \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Adresář s pravidly \"%s\" nebyl nalezen"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Adresář s pravidly nastaven na \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Adresář s pravidly nastaven na \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Neshledanou."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Lituji, ale nemáte povoleno používat příkazy serveru."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Varování: '%s' iterpretováno jako '%s', ale je nejednoznačně.  Zkuste '%"
 "shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Neznamý příkaz.  Zkuste '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Váš nový hlas zrušil vaše předchozí hlasování."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, fuzzy, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Nové hlasování, č. %d, od %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Nemáte povoleno používat tento příkaz."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(prompt serveru)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Hra skončila remízou."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr "Končí se hra. Server restartuje po odpojení všech klientů."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Nelze ukončit hru: žádná hra neběží."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Nyní nemůžete kapitulovat."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Nedostatečný počet hráčů, hru nelze zahájit."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Nedostatečný počet hráčů, hru nelze zahájit."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Nedostatečný počet hráčů, hru nelze zahájit."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Všichni hráči připraveni; startuji hru."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr "Nelze zahájit hru: hra čeká na odpojení všech klientů."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Nelze zahájit hru: hra již běží."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Ruším spojení s %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6456,77 +6505,77 @@ msgstr ""
 "  save   -  uloží aktuální hru\n"
 "  quit   -  ukončí program"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Příkaz:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Použití:"
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Úroveň: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Server podporuje následující příkazy:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Argument '%s' příkazu help je nejednoznačný."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Příkaz help nenalezl žádnou shodu pro argument '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Chybný argument '%s' příkazu list. Zkuste '%s help list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Seznam hráčů:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<žádní hráči>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "uživatel %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", mrtvý"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", úroveň obtížnosti %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", připraven"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", nepřipraven"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
@@ -6534,21 +6583,21 @@ msgstr[0] " %d spojení:"
 msgstr[1] " %d spojení:"
 msgstr[2] " %d spojení:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "%s z %s (úroveň oprávnění %s), bufsize=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (režim pozorovatele)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Seznam týmů:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
@@ -6556,25 +6605,25 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Prázdný tým: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Seznam spojení k server:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<žádná spojení>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 #, fuzzy
 msgid "List of scenarios available:"
 msgstr "Žádné dostupné jednotky"
@@ -6645,17 +6694,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Ve městě %s nebyla nalezena žádná nová technologie."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, fuzzy, c-format
 msgid "You steal %s from the %s."
 msgstr "%s získali %s od %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr ""
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, fuzzy, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%s získali %s od %s."
@@ -7179,20 +7228,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr "Jednotka %s má neplatné rozkazy."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Příliš velká pevnina - to může pár sekund trvat."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Návrat zpět ke generátoru %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Generátoru 3 se nepodařilo rozmístit všechny velké ostrovy."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Generátor 3 nezozmístil %li pevniny."
@@ -7285,16 +7334,17 @@ msgstr "Je možné, že příčinou je špatná konfigurace nebo oprávnění"
 msgid "Cannot find audio file %s"
 msgstr "Nelze nalézt zvukový soubor %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX tahů"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d zlata na kolo"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
@@ -7302,30 +7352,30 @@ msgstr[0] "%3d tah"
 msgstr[1] "%3d tahy"
 msgstr[2] "%3d tahů"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "nikdy"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/kolo"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
@@ -7333,74 +7383,74 @@ msgstr[0] "%s (%d) %d tah"
 msgstr[1] "%s (%d) %d tahy"
 msgstr[2] "%s (%d) %d tahů"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Zastaralé"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Postaveno"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Velký div světa"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Malý div světa"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/kolo"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, fuzzy, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%s - %s obyvatel"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, fuzzy, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "Neexistují obchodní cesty.\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, fuzzy, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "Stavba jednotek"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -7515,8 +7565,8 @@ msgid "Best defending units"
 msgstr "Nejlepší obranné jednotky"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7696,8 +7746,8 @@ msgstr "?pollution [short]:Zne"
 msgid "?cma:Governor"
 msgstr "?cma:Guvernér"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 #, fuzzy
@@ -7961,19 +8011,19 @@ msgstr ""
 "Auto-připojení k serveru \"%s\" na portu %d jako \"%s\" každých %f sekund na "
 "%d pokusů"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "nováček"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "lehká"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normální"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "těžká"
 
@@ -7981,31 +8031,31 @@ msgstr "těžká"
 msgid "experimental"
 msgstr "experimentální"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Spouští se server..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Nelze spustit server."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Musíte ho spustit ručně. Lituji..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Nelze se připojit k serveru."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Pravděpodobně nebudeme moci odtud začit."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Máme kontrolu nad serverem (úprava úrovně přístupových práv)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "Nelze převzít kontrolu nad serverem, zkusíme kill."
 
@@ -8090,27 +8140,27 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Umožňuje %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Umožňuje %s (s %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Řeky"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Lituji, pro téma %s není nápověda.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8121,65 +8171,65 @@ msgstr ""
 "Tato stránka byla vytvořena automaticky.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr "* Vyžaduje %d populace pro stavbu.\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Objev %s způsobí, že %s zastarajá.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* Umožní všem hráčům s znalostí %s stavbu %s jednotek.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Umožňuje %s (s %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Umožňuje %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Nemůže se stavět ve městech.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Neměl nikdy domovské město.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Ztracení této jednotky znamená prohru!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Každý hráč může mít pouze jednu jednotku tohoto typu.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Vyžaduje %d populace pro stavbu.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
@@ -8187,7 +8237,7 @@ msgstr[0] "* Může vézt a doplňovat palivo %d jednotce letectva.\n"
 msgstr[1] "* Může vézt a doplňovat palivo %d jednotky letectva.\n"
 msgstr[2] "* Může vézt a doplňovat palivo %d jednotek letectva.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -8195,7 +8245,7 @@ msgstr[0] "Může nést a doplňovat palivo %d raketě.\n"
 msgstr[1] "Může nést a doplňovat palivo %d raketám.\n"
 msgstr[2] "Může nést a doplňovat palivo %d raketám.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
@@ -8203,7 +8253,7 @@ msgstr[0] "* Může vézt %d pozemních jednotku přes vodu.\n"
 msgstr[1] "* Může vézt %d pozemní jednotky přes vodu.\n"
 msgstr[2] "* Může vézt %d pozemních jednotek přes vodu.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8211,166 +8261,166 @@ msgstr ""
 "* Může zřizovat obchodní cesty (musí se přesunout do cílového města a musí "
 "být minimálně 9 polí od svého domovského města).\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Může pomoci se stavbou divů světa (přidá %d produkce).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Nemůže být rozpuštěna.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Může být rozložen ve městě, za účelem získání 50%% surovin potřebných k "
 "výrobě.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Může stavět nová města.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Může zvýšit populaci o %d, pokud není město větší než %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Může stavět cesty a železnice.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Může stavět doly.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Může stavět závlahy.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Může stavět farmy.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Může stavět farmy (pokud je %s objeven).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Může postavit farmu (pokud je známo: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Může stavět pevnosti.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Může postavit pevnosti (pokud je známa technologie %s).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Může postavit pevnosti (pokud je známo: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Může odstraňovat znečištění z terénu.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Může odstranit radioaktivní spad z terénu.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Může transformovat terén.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Může stavět letiště.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Může se opevnit, aby ziskal o 50%% vyšší obrannou sílu.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Může plenit, tj. ničit intfrastrukturu.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* Může provádět diplomatické a navíc speciální špionážní akce.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Může provádět diplomatické akce.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Nikdy neprohraje v boji Diplomat proti Diplomatu.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Nemůže být podplacen.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Může útočit na nepřátelské letectvo.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* Je neviditelný, pokud není u nepřátelského města nebo jednotky.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Může útočit jen na jednotky na moři (není možný pozemní útok)\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr "* Může útoči přímo z lodi na pozemní jednotky a města.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Může být vysazen z přátelského města (dosah: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr ""
 "* Získává dvojnásobnou obranu proti jednotkám specifikovaným jako "
 "'mounted' (jízda).\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Počítá se jako jízda (mounted) proti některým typům obránců.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "Raketa: Je použita(ztracena) při útoku.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Útokem tato jednotka ukončí tah.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Útok této jednotky způsobí jaderný výbuch!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Má dvojnásobnou palebnou sílu, pokud útočí na města.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignoruje efekt městských hradeb.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8379,35 +8429,35 @@ msgstr ""
 "* Provádí bombardování (%d za tah).  Tento typ útoku jenom zraní obránce "
 "(nikdy nezabije), ale není žádným rizikem pro útočníka.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Získává čtyřnásobnou obranu proti raketám a letadlům.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Ignoruje rerén. (považuje se za cestu).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignoruje ZOC (zony kontroly).\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* Není vojenskou jednotkou (nemůže utočit, neprosadí stanné právo).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "* Zlá jednotka: působí jednoho nespokojeného ikdyž není agresivní.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Nemůže nikdy dosáhnout veterán stavu.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Může se stát vetránem během tréninku nebo boje.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8416,12 +8466,12 @@ msgstr ""
 "* Musí končit kolo ve městě nebo u pevniny, nebo je 50%% pravděpodobnost "
 "ztráty v moři.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* Vynález %s snižuje riziko na 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s rsnižuje riziko na 12%%.\n"
@@ -8430,15 +8480,15 @@ msgstr "* %s rsnižuje riziko na 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " nebo "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
@@ -8446,14 +8496,14 @@ msgstr[0] "Musí se vrátit do města nebo na pole kde je %s po %d tahu.\n"
 msgstr[1] "Musí se vrátit do města nebo na pole kde je %s po %d tazích.\n"
 msgstr[2] "Musí se vrátit do města nebo na pole kde je %s po %d tazích.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr ""
 "Pokud teď začneme zkoumat technologii %s, budeme potřebovat %d žárovek "
 "(bulbs)."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8462,90 +8512,90 @@ msgstr ""
 "Abychom ovládli technologii %s budeme před tím potřebovat získat %d "
 "jednodušší. Celý projekt spotřebuje %d žárovek (bulbs)."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Nemůžeme zkoumat tuto technologii."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 "Toto číslo se může lišit v závislosti na tom, co zkoumají ostatní hráči.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "První hráč, který vynalezne %s ziská okamžitě jednu technologii navíc.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Snižuje šanci ztráty lodi na otevřeném moři na 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Snižuje šanci ztráty lodi na otevřeném moři na 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Zvýší znečištení produkované populací.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Umožňuje %s stavbu mostů přes řeky.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Umožňuje %s stavbu pevností.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Umožňuje %s stavbu letišť.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Umožňuje %s vylepšit cesty na železnice.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Umožňuje %s vylepšit závlahu na farmu.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Na tomto terénu nelze generovat znečištění."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Na tomto terénu nemůžete stavět města."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Pobřeží tohoto terénu je nebezpečné."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Tento terén je nebezpečný pro přesun jednotek."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Pozemní jednotky se nemohou pohybovat v oceánu."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8566,7 +8616,7 @@ msgstr[2] ""
 "nespokojenost.\n"
 " "
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8574,48 +8624,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8623,23 +8673,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8651,7 +8701,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8660,64 +8710,64 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 #, fuzzy
 msgid "* Your units cannot be bribed.\n"
 msgstr "Tato jednotka nemůže být uplacena!"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 #, fuzzy
 msgid "* Your cities cannot be incited.\n"
 msgstr "Město nemůže být rozvráceno!"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 #, fuzzy
 msgid "* Has no unhappy citizens.\n"
 msgstr "%d dalších nespokojených obyvatel."
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 #, fuzzy
 msgid "* Veteran units.\n"
 msgstr "Námořní jednotky"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8725,7 +8775,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8733,71 +8783,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Umožňuje stavbu %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d nespokojených"
@@ -9202,16 +9252,16 @@ msgstr "String kapacity serveru: %s"
 msgid "Start of turn %d"
 msgstr "Začátek kola %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "AI Mód je nyní %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "ZAP"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "VYP"
 
@@ -9242,13 +9292,13 @@ msgstr "?Player:Jméno"
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Vlajka"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9262,7 +9312,7 @@ msgstr "Hranice"
 msgid "Score"
 msgstr "Skóre"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Tým"
 
@@ -9295,36 +9345,36 @@ msgstr "?Player_dlg:Nečinný"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Nemůžete prodat vylepšení."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Prodáno %d %s za %d zlatých."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Žádný %s nebyl prodán."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Nemůžete rozpustit jednotky."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s nemůže být rozpuštěn."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Rozpuštěn náš %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Žádný %s nebyl rozpuštěn."
@@ -9644,64 +9694,69 @@ msgstr "Zlato: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Daně:%d Luxus:%d Věda:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "v %s"
+
+#: client/text.c:609
 #, fuzzy, c-format
 msgid "Moving: %s"
 msgstr "v %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Klikněte pro více informací)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s Lidí"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Tah: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Zlato: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr ""
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, fuzzy, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Daně:%d Luxus:%d Věda:%d"
 
-#: client/text.c:639
+#: client/text.c:643
 #, fuzzy, c-format
 msgid "Researching %s: %s"
 msgstr "Zkoumá se %s: %d/%d"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Zřízení: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9710,21 +9765,21 @@ msgstr[1] "%d jednotky"
 msgstr[2] "%d jednotek"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Tahů k cíli: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, fuzzy, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Tahů k cíli: %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
@@ -9732,37 +9787,37 @@ msgstr[0] "%d jednotka vybrána"
 msgstr[1] "%d jednotky vybrány"
 msgstr[2] "%d jednotek vybráno"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 #, fuzzy
 msgid "No units selected."
 msgstr "Výběr jednotek"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 #, fuzzy
 msgid "No units to upgrade!"
 msgstr "Žádné jednotky nemohou být vylepšeny."
 
-#: client/text.c:860
+#: client/text.c:864
 #, fuzzy
 msgid "None of these units may be upgraded."
 msgstr "Žádné jednotky nemohou být vylepšeny."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9780,14 +9835,14 @@ msgstr[2] ""
 "Vylepšit %s na %s za %d zlatých?\n"
 "V pokladně je %d zlatých."
 
-#: client/text.c:887
+#: client/text.c:891
 #, fuzzy
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 "Zobrazí průběh výzkumu naší současné technologie.\n"
 "%s: %d/%d."
 
-#: client/text.c:893
+#: client/text.c:897
 #, fuzzy
 msgid "no research target."
 msgstr ""
@@ -9795,46 +9850,46 @@ msgstr ""
 "(žádný výzkum)"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 #, fuzzy
 msgid "Shows the progress of global warming:"
 msgstr ""
 "Zobrazit průběh globálního oteplování:\n"
 "%d."
 
-#: client/text.c:917
+#: client/text.c:921
 #, fuzzy, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Znečištění:    %3d"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 #, fuzzy
 msgid "Shows the progress of nuclear winter:"
 msgstr ""
 "Zobrazit průběh nukleární zimy:\n"
 "%d."
 
-#: client/text.c:936
+#: client/text.c:940
 #, fuzzy, c-format
 msgid "Fallout rate: %d%%"
 msgstr "%s max úroveň: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 #, fuzzy
 msgid "Shows your current government:"
 msgstr ""
@@ -9842,25 +9897,25 @@ msgstr ""
 "%s."
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Populace:      %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Podpora:       %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energie:        %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9869,96 +9924,96 @@ msgstr[1] "Hmotnost:      %5d tuny"
 msgstr[2] "Hmotnost:      %5d tun"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Doba letu:       %5.1f roků"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Doba letu:       není známa"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Ǔspěšnost odhad.:   %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Rok doletu: %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:vyp"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dd %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:pretečení"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Pozorovatel: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Stavby: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Žádné. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Divy: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Města: %d celkem, %d nad hranicí z %d měst."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9967,7 +10022,7 @@ msgstr[1] "%d spokojený před postihem s "
 msgstr[2] "%d spokojený před postihem s "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9976,16 +10031,16 @@ msgstr[1] "%d dalších nespokojených obyvatel."
 msgstr[2] "%d dalších nespokojených obyvatel."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Stanné právo v efektu ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "žádné maximum, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9994,20 +10049,20 @@ msgstr[1] "%d jednotky max., "
 msgstr[2] "%d jednotek max., "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d na jednotku). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Vojenské jednotky v poli mohou způsobit nespokojenost. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Vojenské jednotky nemají na spokojenost vliv. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luxus: %d celkem."
@@ -10054,12 +10109,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "žádný"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "vlastní"
 
@@ -10113,11 +10168,13 @@ msgid "Ooops..."
 msgstr "Ooops..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Tato jednotka nemůže být uplacena!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10134,6 +10191,7 @@ msgstr "Uplatit nepřátelskou jednotku"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10174,6 +10232,7 @@ msgstr "_Objevy:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Podle úsudku špionáže"
 
@@ -10198,12 +10257,13 @@ msgstr "_Vylepšení:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Produkce města"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Nemůžete vyvolat převrat ve městě %s!"
@@ -10215,6 +10275,7 @@ msgstr "Město nemůže být rozvráceno!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10231,6 +10292,7 @@ msgstr "Podnítit revoluci!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10240,6 +10302,7 @@ msgstr ""
 "Pokladna obsahuje %d zlatých."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10309,11 +10372,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Rozvrátit nepřátelskou jednotku"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Pane, diplomat očekává Vaše rozkazy"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Pane, špion očekává Vaše rozkazy"
@@ -10414,7 +10479,7 @@ msgstr "Znečištění:"
 msgid "_Overview"
 msgstr "Př_ehled"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10439,11 +10504,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d tahů"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Koupit"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "P_rodukce"
@@ -10564,7 +10629,7 @@ msgstr "Podporovaných jednotek %d"
 msgid "Present units %d"
 msgstr "Přítomných jednotek %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Cen_trovat"
 
@@ -10653,32 +10718,32 @@ msgstr "Přejmenovat město"
 msgid "What should we rename the city to?"
 msgstr "Jak chcete přejmenovat město?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "Změ_nit"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Přidat _První"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Přidat _Další"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Přidat P_oslední"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Vybrat"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "_Zobrazit"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10688,13 +10753,13 @@ msgstr "_Zobrazit"
 msgid "Cities"
 msgstr "Města"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "_Samostatné"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10703,85 +10768,90 @@ msgstr "_Samostatné"
 msgid "Improvements"
 msgstr "Vylepšení"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Divy světa"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Všechna města"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Žádná města"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Obrátit výběr"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Stavba jednotek"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Stavba vylepšení"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Stavba divů světa"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Staví se jednotka"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Staví se vylepšení"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Staví se div světa"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Pobřežní města"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Stejný ostrov"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Podporované jednotky"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Přítomné jednotky"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Vylepšení ve městě"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Divy světa ve městě"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Dostupné jednotky"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Dostupná vylepšení"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Dostupné divy světa"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Celkem výdaje:"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 #, fuzzy
 msgid ""
@@ -10850,127 +10920,127 @@ msgstr "Jak se bude jmenovat předvolba?"
 msgid "Remove this preset?"
 msgstr "Smazat tuto předvolbu?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "Jít k po_loze"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "_Ukázat město"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Takže Vy chcete revoluci?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revoluce!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Co plenit"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Vyberte co plenit:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Jednotka"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Jméno"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Výběr jednotek"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_Připravit všechny"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "_Strážit nečinné"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Národy:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Jaký národ chcete vést?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Vyberte národ"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Náhodný národ"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Vyberte národ"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Vlastnosti"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Vůdce:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Žena"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Muž"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "_Styl měst:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "L_egenda"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Musíte si vybrat pohlaví."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Musíte si vybrat styl měst."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Musíte napsat platné jméno."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Vylepšit jednotku!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11219,63 +11289,69 @@ msgstr ""
 msgid "Not _ready"
 msgstr ", nepřipraven"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Připraven"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Start"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Města"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Vyberte _národ"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 #, fuzzy
 msgid "_Observe"
 msgstr "_Pozorovatel"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "nyní _pozoruje"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<PO>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Náhodný"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Pozorovatel"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Detached"
 msgstr "Mrtvý"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Opravdu to chcete ukončit?"
 
@@ -12196,223 +12272,223 @@ msgstr "Přip_ojit k síťové hře"
 msgid "Connect to Gaming _Zone"
 msgstr "Připojit do Herní _Zóny"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Hesla nesouhlasí, zadejte heslo."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Jméno serveru"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Verze"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Stav"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Hráči"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Komentář"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Lo_kální síť"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Internet _Metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Host:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Port:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Login:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "He_slo:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Heslo z_novu:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "Přip_ojit"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Název připojení: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Jméno hráče: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Host: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s info"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 #, fuzzy
 msgid "Toggle player ready"
 msgstr "aitoggle <jméno-hráče>"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Vyberte národ"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Pozorovat tohoto hráče"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 #, fuzzy
 msgid "Take this player"
 msgstr "Města"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 #, fuzzy
 msgid "Cut connection"
 msgstr "Ruším spojení s %s."
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 #, fuzzy
 msgid "Aitoggle player"
 msgstr "aitoggle <jméno-hráče>"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 #, fuzzy
 msgid "Remove player"
 msgstr "Odstraňuji hráče %s."
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, fuzzy, c-format
 msgid "Put on %s"
 msgstr "Populace: %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "_Počet hráčů (včetně počítačových):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "Úroveň počítačem ovládaných hráčů:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "Vládce:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Více M_ožností Hry..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Záznam"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 #, fuzzy
 msgid "Rating"
 msgstr "čekání"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Připraven"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Vůdce"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Vyberte uloženou hru pro nahrání"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Vyberte uloženou hru pro _nahrání:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Procházet..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Vyberte scénář"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Vyberte _scénář:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Typ"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Vyberte _národ pro hru:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Vyberte si umístění pro uložení"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Uložit hru"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Uložené _hry:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Uložit _soubor:"
 
@@ -12449,7 +12525,7 @@ msgstr "Název stavby"
 msgid "Count"
 msgstr "Počet"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12692,28 +12768,28 @@ msgstr "_Seznamy prací:"
 msgid "Edit Global _Worklists"
 msgstr "Upravit globální seznamy _prací"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Tahů"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "Zdrojové _Úkoly:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Zobrazit _budoucí cíle"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Cílový _Seznam prací:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "Přidat do _globálního seznamu prací"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Změn_it produkci"
 
@@ -13017,8 +13093,8 @@ msgid "City shrinks: %d %s"
 msgstr "Město: %s (%s)"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13130,11 +13206,11 @@ msgstr "Konečný přehled:"
 msgid "Maintenance Report"
 msgstr "Vědecký přehled"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "seznam prací"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13553,21 +13629,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Inicializace klienta"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -14882,7 +14958,7 @@ msgstr "Styl měst:"
 msgid "Unit Selection"
 msgstr "Výběr jednotky"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "ŽÁDNÉ"
 
diff --git a/po/da.gmo b/po/da.gmo
index ac0f5a8..91db54d 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index bd739a3..431ba79 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,6 +1,5 @@
-# translation of da.po to Danish
 # Danish translation of Freeciv.
-# Copyright (C) 1999-2007
+# Copyright (C) 1999-2008 The Freeciv Team, Joe Hansen.
 # This translation is covered by the GNU General Public License Version 2.
 #
 # Konventioner:
@@ -8,9 +7,10 @@
 #   For ordlister og konventioner henvises til siden 
 #   http://da.freeciv.wikia.com/wiki/Overs%C3%A6ttelsesmanual
 #   
+#  ' ' og /" /" følger den engelske tekst.
 # Keld Simonsen <keld at dkuug.dk>, 2001-2002, 2004.
 # Ole Laursen <olau at hardworking.dk>, 2004.
-# Joe Hansen <joedalton2 at yahoo.dk>, 2006, 2007.
+# Joe Hansen <joedalton2 at yahoo.dk>, 2006, 2007, 2008.
 # Herudover har Dansk-Gruppen været behjælpelig med teknik og diverse sprogspørgsmål.
 # Også en tak til Elmo som har lagt da.po filer på plads i svn.
 #
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
-"PO-Revision-Date: 2007-10-18 18:43+0300\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"PO-Revision-Date: 2008-11-05 18:43+0300\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
@@ -59,22 +59,22 @@ msgstr "Luksus"
 msgid "Science"
 msgstr "Forskning"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?Bygget:B"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?Vidunder:v"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?Forældet:F"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?Overflødig:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?Bygget:B"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?Vidunder:v"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -493,81 +493,81 @@ msgstr "Kopler til/fra beskeder"
 msgid "AI Debug messages"
 msgstr "AI fejlrettelse beskeder"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:Morderisk"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:Krigerisk"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:Fjendtlig"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:Usamarbejdsvillig"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:Urolig"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?attitude:Neutral"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:Ærefuld"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:Hjælpsom"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:Begejstret"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:Beundring"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:Ærværdig"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:VÃ¥benstilstand"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Krig"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:VÃ¥benhvile"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Fred"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Alliance"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Aldrig mødt"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Hold"
 
@@ -613,13 +613,13 @@ msgstr "%s enheder"
 msgid "Size %d"
 msgstr "Størrelse %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Fremtidsteknologi %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -631,65 +631,65 @@ msgstr "Fremtidsteknologi %d"
 msgid "None"
 msgstr "Ingen"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Fremtidsteknologi"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Ukendt)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Vej"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Overrislet land"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Jernbane"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Mine"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Forurening"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Landsby"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Befæstning"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Flod"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Dyrket land"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Flybase"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Atomaffald"
 
@@ -765,7 +765,7 @@ msgstr "Du kan kun opgradere enheder i dine byer."
 #: common/unit.c:1598
 #, c-format
 msgid "Upgrading this %s would strand units it transports."
-msgstr "Opgradering af %s ville strande de enheder den transporterer"
+msgstr "Opgradering af %s ville strande de enheder den transporterer."
 
 #: common/unittype.c:61
 msgid "Missile"
@@ -795,11 +795,11 @@ msgstr "Atombombe"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " og "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?og:, "
 
@@ -958,80 +958,80 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (total %d gentagelse)"
 msgstr[1] " (total %d gentagelser)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Mangler parameter for \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Mangler parameter for \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d f.Kr."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d e.Kr."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "FREECIV_PATH er sat til at være tom, benytter standardsti (PATH) i stedet."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Kunne ikke læse fra datakataloget %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "Datastien kan sættes via miljøvariablen FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Nuværende datasti er: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Den nødvendige fil \"%s\" mangler... afslutter!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Fatal fejl: du forsøger at køre mig som superbruger!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Brug en ikke-priviligeret konto i stedet.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "eksakt fund"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "eneste fund"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "tvetydig"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "tom"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "for lang"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "ikke-fund"
 
@@ -1060,24 +1060,24 @@ msgstr "%s har startet bygningen af %s i %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s sælger %s (ikke nødvendig) for %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 "*%s (Computer)* I automatisk indstilling kan computeren ikke underskrive en "
 "sådan traktat."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (computer)* Bryd først alliancen med %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (computer)* Lad os først stoppe blodsudgydelserne, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1086,47 +1086,47 @@ msgstr ""
 "*%s (Computer)* Jeg ønsker at se dig overholde den nuværende våbenhvile lidt "
 "længere, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (Computer)* Jeg stoler ikke nok på dig til en alliance, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (Computer)* Jeg kender ikke byen du nævner."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (Computer)* Beklager, delt vision med dig er ikke sikkert"
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (Computer)* Denne aftale var ikke særlig god for us, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (Computer)* Velkommen til vores alliance %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (Computer)* Ja, må vi for evigt forblive forenede, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (Computer)* Ja, fred i vor tid!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (Computer)* Enig. Ikke flere blodsudgydelser, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1135,22 +1135,22 @@ msgstr ""
 "*%s (Computer)* Velkommen %s! Må vi foreslå en våbenhvile så vi kan lære "
 "hinanden bedre at kende?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (Computer)* Rummet vil aldrig blive dit!"
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr "*%s (Computer)* Jeg har tolereret dig længe nok! Krig!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
-msgstr "*%s (Computer)* Fred ... på et andet tidspunkt"
+msgstr "*%s (Computer)* Fred ... på et andet tidspunkt."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1159,17 +1159,17 @@ msgstr ""
 "*%s (Computer)* Endelig når jeg til dig! Troede du virkelig, at du kunne "
 "slippe afsted med dine misgerninger?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (Computer)* Din hemmelige krig bragte denne konflikt til dig!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (Computer)* Din aggression mod %s var din sidste fejltagelse!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1184,7 +1184,7 @@ msgstr[1] ""
 "*%s (Computer)* Vi vil starte en totalkrig mod %s i %d runder for at stoppe "
 "rumskibsaffyringen."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1192,7 +1192,7 @@ msgid ""
 msgstr ""
 "*%s (Computer)* Din assistance forventes. Leve leve vores stærke alliance!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1204,14 +1204,14 @@ msgid_plural ""
 "us and do likewise!"
 msgstr[0] ""
 "*%s (Computer)* %s har groft overtrådt hans traktat med os for egen vindings "
-"skyld. Vi vil svare med magt i %d runde og forventer at du står bag os i "
+"skyld. Vi vil svare med magt om %d runde og forventer, at du står bag os i "
 "vores alliance."
 msgstr[1] ""
 "*%s (Computer)* %s har groft overtrådt hans traktat med os for egen vindings "
-"skyld. Vi vil svare med magt i %d runder og forventer at du står bag os i "
+"skyld. Vi vil svare med magt om %d runder og forventer, at du står bag os i "
 "vores alliance."
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1226,13 +1226,13 @@ msgstr[1] ""
 "*%s (Computer)* Vi vil plyndre og ødelægge den rige civilisation %s. vi "
 "erklærer krig om %d runder."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
-msgstr "*%s (Computer)* Hvis du vil have en del af kagen, så er du velkommen!."
+msgstr "*%s (Computer)* Hvis du vil have en del af kagen, så er du velkommen!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1247,14 +1247,14 @@ msgstr[1] ""
 "*%s (Computer)* Vi er færdige med %s. Lad os knuse denne ynkelige "
 "civilisation. Vi erklærer krig om %d runder."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (Computer)* Som de gode allierede vi er, forventer vi din hjælp i denne "
 "krig."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1269,7 +1269,7 @@ msgstr[1] ""
 "*%s (AI)* Vi vi respektere vores alliance og erklærer krig mod %s om %d "
 "runder. Hold ud - vi kommer!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1284,7 +1284,7 @@ msgstr[1] ""
 "*%s (AI)* Vi vil respektere vores alliance med %s og erklære krig mod %s om %"
 "d runder.  Vi forventer du gør det samme."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1293,7 +1293,7 @@ msgstr ""
 "*%s (AI)* Dit forsøg på at erobre plads til dig selv afslører dine sande "
 "intentioner, og jeg vil ikke mere acceptere vores alliance!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1302,7 +1302,7 @@ msgstr ""
 "*%s (AI)* Dit forsøg på unilateralt at dominere det ydre rum er stærkt "
 "fornærmende."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1311,12 +1311,12 @@ msgstr ""
 "*%s (AI)* Hvis du ikke stopper konstruktionen af dit rumskib, kan jeg se mig "
 "nødsaget til at handle!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr "*%s (AI)* Beklager, delt synsfelt med dig er ikke længere sikkert."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1325,7 +1325,7 @@ msgstr ""
 "*%s (AI)* Hil vores pålideligste allierede, vi beder dig om at tilintetgøre "
 "vores fjende, %s."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1334,7 +1334,7 @@ msgstr ""
 "*%s (AI)* Hil allierede, jeg ser at du endnu ikke har erklæret krig mod "
 "vores fjende, %s. Hvorfor er det nødvendigt at minde dig om dine løfter?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1345,7 +1345,7 @@ msgstr ""
 "fred med vores dødelige fjende, %s! Dette er uacceptabelt; vores alliance er "
 "hermed ophævet!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1353,12 +1353,12 @@ msgid ""
 msgstr ""
 "*%s (AI)* Hil dig ven, må vi foreslå at vi står sammen og skaber en alliance?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr "*%s (AI)* Hil dig nabo, må vi foreslå mere fredelige forhold?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1367,7 +1367,7 @@ msgstr ""
 "*%s (AI)* Vi bliver begge nedbrudt af disse blodsudgydelser. Må vi foreslå "
 "at vi ophører med vores fjendtligheder?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1377,57 +1377,62 @@ msgstr ""
 "alliance og dit navn vil aldrig blive glemt!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, c-format
 msgid "Auth option \"%s\":"
 msgstr "Auth indstilling \"%s\":"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr " mangler fra indstillingsfil (anvender standard)"
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr " (standard)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr " (indstil)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr " (sæt)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr "Ugyldig værdi for auth-port: \"%s\""
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Auth indstillingsfilnavn \"%s\" er ikke tilladt!"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Kan ikke hente auth indstillingsfil \"%s\"!"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr "Advarsel: Gæstenavnet '%s' er blevet taget, omdøber til bruger '%s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Gæster er ikke tilladt på denne server. Beklager."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s blev afvist: Gæster er ikke tilladt."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1436,7 +1441,7 @@ msgstr ""
 "Der opstod en fejl ved læsning af brugerdatabasen, logger ind som "
 "gæsteforbindelsen '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1444,39 +1449,39 @@ msgstr ""
 "Der opstod en fejl ved læsning af brugerdatabasen og gæstetilslutninger er "
 "ikke tilladt. Beklager"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s blev afvist: Database fejl og gæster er ikke tilladt."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Indtast adgangskode for %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Indtast en ny adgangskode (og husk den)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Denne server tillader kun præregistrerede brugere. Beklager."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s blev afvist: Denne server tillader kun præregistrerede brugere."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Beklager, for mange forkerte forsøg..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr "%s blev afvist: For mange forkerte kodeordstjek for ny bruger."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1484,30 +1489,30 @@ msgstr ""
 "Advarsel: Der opstod en fejl ved gemning i databasen. Fortsætter, men dine "
 "statistiskker bliver ikke gemt."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s blev afvist: For mange forkerte kodeords indtastninger."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Din adgangskode er forkert. Prøv igen."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
-msgstr "Beklager, din forbindelse løb ud af tid ..."
+msgstr "Beklager, din forbindelse løb ud af tid..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s blev afvist: Forbindelse løb ud mens den ventede for adgangskode."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "Din adgangskode er for kort, den mindste længde er %d. Prøv igen."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -1620,9 +1625,9 @@ msgstr "Overførte %s fra %s til %s."
 # problem
 #. TRANS: Polish Destroyer ... German <city>
 #: server/citytools.c:548
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s lost in transfer to %s %s"
-msgstr "%s %s gik tabt i transit til %s %s."
+msgstr "%s %s gik tabt i transit til %s %s"
 
 #: server/citytools.c:631
 #, c-format
@@ -1696,7 +1701,7 @@ msgstr "Du erobrer %s."
 #: server/citytools.c:1329
 #, c-format
 msgid "%s conquered %s."
-msgstr "%s erobrede %s"
+msgstr "%s erobrede %s."
 
 #: server/citytools.c:1336
 #, c-format
@@ -1878,7 +1883,7 @@ msgstr "%s kan ikke bygge %s fra arbejdslisten; årsag ukendt!  Udsætter..."
 
 #. TRANS: The <city> worklist ....
 #: server/cityturn.c:870
-#, fuzzy, c-format
+#, c-format
 msgid "The %s worklist is now empty."
 msgstr "Arbejdslisten i %s er nu tom."
 
@@ -1895,7 +1900,7 @@ msgstr "Borgere i %s dør i deres mislykkedes forsøg på at opretholde %s!"
 #: server/cityturn.c:1080 server/cityturn.c:1200
 #, c-format
 msgid "%s is building %s, which is no longer available."
-msgstr "Folkeslaget %s bygger %s som ikke længere er tilgængelig."
+msgstr "Folkeslaget %s bygger %s, som ikke længere er tilgængelig."
 
 #: server/cityturn.c:1122
 #, c-format
@@ -2240,10 +2245,10 @@ msgid ""
 "options (like 'help options'), and with an argument it gives help for a "
 "particular option (like 'help <option-name>')."
 msgstr ""
-"Kommandoen \"explain\" har en delmængde af funktionaliteten til kommandoen "
-"\"help\", og er til for bagudkompatibilitet. Uden argumenter giver den en "
-"liste over argumenter (som \"help options\"), og med et argument giver den "
-"hjælp for en valgmulighed (som \"help <alternativnavn>\")."
+"Kommandoen 'explain' har en delmængde af funktionaliteten til kommandoen "
+"'help', og er til for bagudkompatibilitet. Uden argumenter giver den en "
+"liste over argumenter (som 'help options'), og med et argument giver den "
+"hjælp for en valgmulighed (som 'help <alternativnavn>')."
 
 #. TRANS: translate text between <> only
 #: server/commands.c:93
@@ -2299,9 +2304,7 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "En spiller med rette rettigheder kan starte en kommando der påbegynder "
 "stemmeafgivning. /stem kommandoen efterfulgt af \"ja\" eller \"nej\", og et "
@@ -2309,10 +2312,9 @@ msgstr ""
 "stemmenummer gives din stemme til den seneste kommando. Du kan kun foreslå "
 "en stemme ad gangen. Afstemningen vil gå igennem straks hvis mere end "
 "halvdelen af spillerne stemmer for den, eller afvises øjeblikkeligt hvis "
-"mindst halvdelen af spillerne stemmer imod den. Hvis en fuld tur går kan "
-"stemmeafgivningen gå igennem hvis ingen stemmer imod den."
+"mindst halvdelen af spillerne stemmer imod den."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2320,11 +2322,11 @@ msgstr ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Slå kunstig intelligens til eller fra på den givne størrelse."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2332,23 +2334,23 @@ msgstr ""
 "Vis kunstig intelligens information vedrørende en given størrelse og slå "
 "afhængig fejlfinding udlæsning for den givne størrelse til eller fra."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <optionsnavn> <værdi>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Sæt server-option."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <spiller> [hold]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Ændr, tilføj eller fjern en spillers tilhørsforhold til hold."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2361,15 +2363,15 @@ msgstr ""
 "med delt vision og ambassader, og slås sammen for at opnå holdsejr med "
 "snittet af de individuelle pointsummer."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <katalog>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Vælg nyt katalog for regelopsætning eller tilføjelsespakke."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2378,15 +2380,15 @@ msgstr ""
 "At kalde denne uden argumenter vil vise dig den nuværende regelopsætning."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <metalinje>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Sæt metaserver infolinje."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2399,19 +2401,19 @@ msgstr ""
 "beskeder, hvis den er tilgængelig."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <metalinje>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Sæt metaserver infolinje."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Kontroller metaserver tilslutning."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2424,33 +2426,33 @@ msgstr ""
 "metaserveren op."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <adresse>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Sæt adresse metaserveren skal rapportere til."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <spillernavn>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Skift spillers AI-status."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "tag [navnpåforbindelse] <spillernavn>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Overtag en spillers rolle i spillet."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2465,15 +2467,15 @@ msgstr ""
 "til forbindelsen."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [navnpåforbindelse] [spillernavn]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Observer en spiller eller hele spillet."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2488,15 +2490,15 @@ msgstr ""
 "global observerer."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <tilslutningsnavn>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "Løsgøre fra en spiller."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2505,20 +2507,20 @@ msgstr ""
 "forbindelser til at overtage en spiller."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <spillernavn>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Opret en AI spiller med givet navn."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
-msgstr "'create' kommandoen er kun tilgængelig før spillet er startet."
+msgstr "'Create'-kommandoen er kun tilgængelig før spillet er startet."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2526,18 +2528,18 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 "Sæt dig selv på automatik. Den kunstige intelligens vil foretage dine valg."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr ""
 "Den kunstige intelligens vil styre dit rige, men kun foretage få ændringer."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2545,11 +2547,11 @@ msgstr ""
 "Novice\n"
 "novice <spillernavn>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Sæt en eller alle AI-spillere til 'novice'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2561,7 +2563,7 @@ msgstr ""
 "kun for den spiller"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2569,11 +2571,11 @@ msgstr ""
 "easy\n"
 "easy <spillernavn>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Sæt en eller alle AI-spillere til 'let'."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2585,7 +2587,7 @@ msgstr ""
 "for den spiller"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2593,11 +2595,11 @@ msgstr ""
 "normal\n"
 "normal <spillernavn>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Sæt en eller alle AI-spillere til 'normal'."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2609,7 +2611,7 @@ msgstr ""
 "kun for den spiller"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2617,11 +2619,11 @@ msgstr ""
 "hard\n"
 "hard <spillernavn>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Sæt en eller alle AI-spillere til at være vanskelig (hard)."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2633,7 +2635,7 @@ msgstr ""
 "for den spiller"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2641,11 +2643,11 @@ msgstr ""
 " \n"
 "<spillernavn>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Sæt en eller alle AI-spillere til 'eksperimental'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2659,7 +2661,7 @@ msgstr ""
 "FUNKTIONER! For normale servere har denne indstilling ingen effekt."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2673,11 +2675,11 @@ msgstr ""
 "cmdlevel <niveau> first\n"
 "cmdlevel <niveau> <tilslutningsnavn>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Bed om eller sæt kommandoniveau adgang."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2717,20 +2719,20 @@ msgstr ""
 "person kan koble til med det samme navn. Læg mærke til at denne kommando nu "
 "tager imod tilslutningsnavne, ikke spillernavne."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "Hvis der ikke er nogen, bliv spilleder med øget rettigheder."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <runde> <rundetillæg> <værdi> <faktor>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Se \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2744,24 +2746,24 @@ msgstr ""
 "Brug denne kommando sammen med \"timeout\". Standardværdiene er 0 0 0 1."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "Slutspil"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Spillet slutter med det samme som uafgjort"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "overgivelse"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Erkende at spillet er tabt."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2770,15 +2772,15 @@ msgstr ""
 "undtagelse af en spiller (eller et hold) har erkendt vil spillet slutte."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <spillernavn>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Fjern spilleren fuldstændigt fra spillet."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2787,7 +2789,7 @@ msgstr ""
 "enheder. Bruges med forsigtighed!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2795,11 +2797,11 @@ msgstr ""
 "save\n"
 "save <filnavn>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Gem spil i fil."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2816,7 +2818,7 @@ msgstr ""
 "og brug 'start' kommandoen når alle spillerne har koblet op igen."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2824,11 +2826,11 @@ msgstr ""
 "load\n"
 "load <filnavn>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Indlæs spil fra fil."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2837,28 +2839,28 @@ msgstr ""
 "spillere, regelopsætning og serveralternativer vil forsvinde.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <filnavn>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Udfør serverkommandoer fra fil."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <filnavn>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Skriv opsætningen som bliver brugt nu til en fil som serverkommandoer."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Skift server-udskrifter mellem 'RFC-stil' og normal stil."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Returnerer id på serveren."
 
@@ -2874,9 +2876,9 @@ msgstr "Velkommen til serveren %s på port %d."
 
 #. TRANS: (connection) identifier: ... [network address]
 #: server/connecthand.c:97
-#, fuzzy, c-format
+#, c-format
 msgid "(%d) %s: connected [%s]"
-msgstr "(%d) %s har tilsluttet sig fra %s."
+msgstr "(%d) %s: tilsluttet [%s]"
 
 #: server/connecthand.c:104
 #, c-format
@@ -2909,46 +2911,42 @@ msgstr "Turblokerende spillestil: venter på at %s skal blive færdig..."
 
 #. TRANS: (connection) identifier: ... [network address]
 #: server/connecthand.c:240
-#, fuzzy, c-format
+#, c-format
 msgid "(%d) %s: connection request [%s]"
-msgstr "(%d) Tilkoblingsforespørgsel fra %s fra %s"
+msgstr "(%d) %s: Tilkoblingsforespørgsel [%s]"
 
 #: server/connecthand.c:266
-#, fuzzy
 msgid "The client is missing a capability that this server needs."
-msgstr "Klienten mangler en egenskab som denne server behøver."
+msgstr "Klienten mangler en egenskab, som denne server kræver."
 
 #: server/connecthand.c:268 server/connecthand.c:279
-#, fuzzy, c-format
+#, c-format
 msgid "(%d) %s rejected: mismatched capabilities!"
-msgstr "(%d) %s blev afvist: uforenelige egenskaber."
+msgstr "(%d) %s blev afvist: Uforenelige egenskaber!"
 
 #: server/connecthand.c:277
-#, fuzzy
 msgid "This server is missing a capability that the client needs."
-msgstr "Serveren mangler en egenskab som denne klient behøver."
+msgstr "Serveren mangler en egenskab, som denne klient kræver."
 
 #: server/connecthand.c:290
-#, fuzzy
 msgid "The username is invalid!"
-msgstr "Ugyldigt brugernavn"
+msgstr "Ugyldigt brugernavn!"
 
 #. TRANS: (connection) identifier: ... [network address]
 #: server/connecthand.c:292
-#, fuzzy, c-format
+#, c-format
 msgid "(%d) %s rejected: invalid username [%s]"
-msgstr "(%d) %s blev afvist: Ugyldigt navn [%s]."
+msgstr "(%d) %s blev afvist: Ugyldigt navn [%s]"
 
 #: server/connecthand.c:303
-#, fuzzy
 msgid "Your username is already connected!"
-msgstr "er allerede tilsluttet."
+msgstr "Dit brugernavn er allerede tilsluttet!"
 
 #. TRANS: (connection) identifier: ... [network address]
 #: server/connecthand.c:305
-#, fuzzy, c-format
+#, c-format
 msgid "(%d) %s rejected: duplicate username [%s]"
-msgstr "(%d) %s blev afvist: Ens login navn [%s]."
+msgstr "(%d) %s blev afvist: Ens brugernavn [%s]"
 
 #: server/connecthand.c:335 server/connecthand.c:344
 #, c-format
@@ -3047,13 +3045,13 @@ msgstr "Du får %d guld."
 
 #. TRANS: ... Polish worldmap.
 #: server/diplhand.c:410
-#, fuzzy, c-format
+#, c-format
 msgid "You receive the %s worldmap."
 msgstr "Du får verdenskortet som %s opfatter det."
 
 #. TRANS: ... Polish seamap.
 #: server/diplhand.c:419
-#, fuzzy, c-format
+#, c-format
 msgid "You receive the %s seamap."
 msgstr "Du får søkortet som %s opfatter det."
 
@@ -3074,7 +3072,7 @@ msgstr "Du accepterer en våbenhvile med %s."
 
 #. TRANS: ... the Poles ... Polish territory.
 #: server/diplhand.c:476 server/diplhand.c:488
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You agree on an armistice with the %s. In %d turn, it will become a peace "
 "treaty. Move your units out of %s territory."
@@ -3148,18 +3146,18 @@ msgid "The %s have established an embassy in %s."
 msgstr "Folkeslaget %s har etableret en ambassade i %s."
 
 #: server/diplomats.c:333
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s could not sabotage the %s %s."
 msgstr "Din %s kunne ikke sabotere %s's %s."
 
 #: server/diplomats.c:355
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s succeeded in sabotaging the %s %s."
 msgstr "Din %s saboterede %s's %s."
 
 #. TRANS: ... the Poles!
 #: server/diplomats.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s was sabotaged by the %s!"
 msgstr "Din %s blev saboteret af %s!"
 
@@ -3168,24 +3166,24 @@ msgid "You can't bribe a unit from this nation."
 msgstr "Du kan ikke bestikke en enhed fra denne nation."
 
 #: server/diplomats.c:422
-#, fuzzy, c-format
+#, c-format
 msgid "You don't have enough gold to bribe the %s %s."
 msgstr "Du har ikke nok guld til at bestikke %s's %s."
 
 #: server/diplomats.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "You cannot bribe the %s!"
 msgstr "Du kan ikke bestikke %s!"
 
 #. TRANS: <diplomat> ... <unit>
 #: server/diplomats.c:455
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s succeeded in bribing the %s."
 msgstr "Din %s bestak %s."
 
 #. TRANS: <unit> ... <Poles>
 #: server/diplomats.c:463
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s was bribed by the %s."
 msgstr "Din %s-enhed blev bestukket af %s."
 
@@ -3204,7 +3202,7 @@ msgid "Your %s was caught in the attempt of stealing technology from %s."
 msgstr "Din %s-enhed blev fanget i forsøget på at stjæle teknologi fra %s."
 
 #: server/diplomats.c:606
-#, fuzzy, c-format
+#, c-format
 msgid "The %s %s failed to steal technology from %s."
 msgstr "%s's %s mislykkedes i forsøget på at stjæle teknologi fra %s."
 
@@ -3301,9 +3299,9 @@ msgstr "Folkeslaget %s ødelagde %s i %s."
 
 #. TRANS: <unit> ... <diplomat>
 #: server/diplomats.c:1091
-#, fuzzy, c-format
+#, c-format
 msgid "An enemy %s has been eliminated by your %s."
-msgstr "En fjendtlig %s er blevet udslettet under forsvar af %s."
+msgstr "En fjendtlig %s er blevet udslettet af din %s."
 
 #. TRANS: <unit> ... <city> ... <diplomat>
 #: server/diplomats.c:1098
@@ -3313,14 +3311,14 @@ msgstr "Din %s er blevet udslettet under forsvar af %s mod %s."
 
 #. TRANS: <unit> ... <diplomat>
 #: server/diplomats.c:1106
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s has been eliminated defending against a %s."
-msgstr "Din %s er blevet udslettet under forsvar af mod %s."
+msgstr "Din %s er blevet udslettet da den forsvarede sig mod %s."
 
 #: server/diplomats.c:1119
 #, c-format
 msgid "Your %s was eliminated by a defending %s."
-msgstr "Din %s blev udslettet af en forsvarende %s"
+msgstr "Din %s blev udslettet af en forsvarende %s."
 
 #: server/diplomats.c:1127
 #, c-format
@@ -3334,23 +3332,23 @@ msgid "Eliminated %s %s while infiltrating our troops."
 msgstr "Udslettede %s %s under infiltration af vore tropper."
 
 #: server/diplomats.c:1185
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Your %s has successfully completed the mission and returned unharmed to %s."
 msgstr "Din %s har klaret sin mission og er returneret uskadt til %s."
 
 #: server/diplomats.c:1204
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s was captured after completing the mission in %s."
 msgstr "Din %s blev fanget efter at have fuldført sin mission i %s."
 
 #: server/diplomats.c:1210
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s was captured after completing the mission."
 msgstr "Din %s blev fanget efter at have fuldført sin mission."
 
 #: server/diplomats.c:1242
-#, fuzzy, c-format
+#, c-format
 msgid "You have caused an incident while bribing the %s %s."
 msgstr "Du har forårsaget en skandale ved at bestikke %s's %s."
 
@@ -3379,26 +3377,35 @@ msgstr "Du har forårsaget en skandale ved at anspore til oprør i %s."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s har forårsaget en skandale ved at anspore til oprør i %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr "Start flådeenheder er ikke understøttet. Ingen får %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Ã…r: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Rundens tidsfrist har overskredet sin maksimale værdi, sætter til maksimum"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Rundens tidsfrist er mindre end nul, sætter den til nul."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr "Kan ikke oprette midlertidig mappe for GGZ-spil.\n"
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr "Kan ikke skifte til midlertidig servermappe %s.\n"
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Alene GGZ klienten må kalde civclient i ggz mode!\n"
 
@@ -3441,11 +3448,11 @@ msgstr "Der er ingen tilslutning ved navn %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Der er ingen spiller eller tilslutning ved navn %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Der er sket en global opvarmning!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
@@ -3453,16 +3460,16 @@ msgstr ""
 "Kystlinjer er blevet oversvømmet og vidtstrakte græsområder er blevet til "
 "ørken."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Atomvinter er opstået!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Vådområder er tørret ud og vidtstrakte græsområder er blevet til tundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3472,7 +3479,7 @@ msgstr ""
 "kundgjort.\n"
 "      Arbejderne samler sig spontant og bygger jernbaner i samtlige byer."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3481,12 +3488,12 @@ msgstr ""
 "Folket er tilfreds med at dine forskere endelig har opdaget jernbanen.\n"
 "      Arbejderne samler sig spontant og bygger jernbaner i samtlige byer."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Flyttede din %s på grund af ændret terræn."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Opløste din %s på grund af ændret terræn."
@@ -3547,27 +3554,27 @@ msgstr "Revolution: Tilbage til anarki."
 msgid "You should choose a new government from the government menu."
 msgstr "Du burde vælge en ny styreform fra ledelses menuen."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Skatteniveauet er højere end maks. niveau for %s; justeret."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Forskningsniveauet er højere end maks. niveau for %s; justeret."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Luksusniveauet er højere end maks. niveua for %s; justeret."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s giver os ikke længere delt synsfelt!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3576,13 +3583,13 @@ msgstr ""
 "Senatet vil ikke tillade at du bryder traktaten med %s.  Du må enten opløse "
 "senatet eller vente til et senere mere gunstigt øjeblik."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "Senatet vedtager dit lovforslag pga. de stadige provokationer fra %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3591,12 +3598,12 @@ msgstr ""
 "Senatet afviser at bryde traktaten med %s, men du har ingen problemer med at "
 "få et nyt senat."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Den diplomatiske status mellem %s og %s er nu %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3605,14 +3612,14 @@ msgstr ""
 " Folkeslaget %s afbrød den diplomatiske aftale! Det diplomatiske forhold "
 "mellem %s og %s er nu %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 "%s har angrebet din allierede %s! Du ophæver alliancen med aggressoren."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3621,43 +3628,43 @@ msgstr ""
 "Din holdkammerat %s erklærede krig med %s. Du er nødt til at annullere "
 "alliancen med %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Fjerner spiller %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Du er blevet fjernet fra spillet!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s er blevet fjernet fra spillet."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Du har fået kontakt med %s, ledet af %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 "%s og %s mødes og går i øjeblikkelig krig. Du ophæver alliancen med begge."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Kunne ikke kaste %s ind i borgerkrig - for mange spillere"
 
-#: server/plrhand.c:1659
-#, fuzzy, c-format
+#: server/plrhand.c:1663
+#, c-format
 msgid "Could not throw %s into civil war - no available nations"
-msgstr "Kunne ikke kaste %s ind i borgerkrig - for mange spillere"
+msgstr "Kunne ikke kaste %s ind i borgerkrig - ingen tilgængelige nationer"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3666,13 +3673,13 @@ msgstr ""
 "Din nation er splittet i en borgerkrig. %s er proklameret leder for de "
 "oprørske landsdele."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s erklærer troskab mod %s."
 
-#: server/plrhand.c:1718
-#, fuzzy, c-format
+#: server/plrhand.c:1722
+#, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
 "      structures have sparked a civil war.  Opportunists have flocked to the "
@@ -3682,7 +3689,7 @@ msgstr ""
 "Erobringen af %s's hovedstad og ødelæggelsen af rigets administrative\n"
 "      strukturer har udløst en borgerkrig. Opportunister har sluttet sig "
 "til\n"
-"      oprørerne, og opkomlingen %s har nu magten i %d landsdele."
+"      oprørerne, og opkomlingen %s har nu magten i %d oprørsprovinser."
 
 #: server/report.c:56
 #, c-format
@@ -3908,21 +3915,21 @@ msgstr "."
 msgid "th"
 msgstr "."
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Demografi-tekststrengen indeholder ugyldige bogstaver. Prøv \"help demography"
 "\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Demografirapport:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Beklager, demografirapporten er ikke tilgængelig."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%s af %s (%s)"
@@ -3933,11 +3940,11 @@ msgstr "%s af %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Kunne ikke finde en læsbar regelfil \"%s.%s\" "
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr "Ingen barbarnation i regelsæt, mindst 1 kræves!"
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Indlæser regelsæt"
 
@@ -3951,7 +3958,7 @@ msgstr ""
 "Den gemte fil indeholder fejl med kortdata.  Dette kan ske med gamle gemte "
 "spil, eller det kan tyde på fejl ved selve filen.  Fortsæt på eget ansvar."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
 "Den gemte fil er for gammel, versioner fra og med 1.9.0 er understøttet."
@@ -3974,19 +3981,19 @@ msgstr ""
 "længere støttet. Bruger '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr "%s havde ugyldit nation; ændrer til %s."
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
-#, fuzzy, c-format
+#: server/savegame.c:4073
+#, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
 "treaty."
 msgstr ""
-"Illegal alliance struktur opdaget: %s's alliance med %s er reduceret til en "
+"Illegal alliancestruktur opdaget: %s's alliance med %s er reduceret til en "
 "fredstraktat."
 
 #: server/settings.c:32
@@ -4017,7 +4024,7 @@ msgstr "Intern"
 msgid "Networking"
 msgstr "Netværk"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Alle"
@@ -4038,7 +4045,7 @@ msgstr "Sjældne"
 msgid "Changed"
 msgstr "Ændret"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4046,7 +4053,7 @@ msgstr ""
 "Tekststrengen for tilladte erobringer indeholder\n"
 "ugyldige bogstaver. Prøv \"help allowtake\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4054,7 +4061,7 @@ msgstr ""
 "Tekststrengen for tilladte startenheder indeholder\n"
 "ugyldige bogstaver. Prøv \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4064,15 +4071,15 @@ msgstr ""
 "mindst en bygrundlægger.  Prøv \n"
 "\"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr "Kan ikke indstille slutåret tidligere end nuværende år."
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "Kan ikke ændre det maksimale antal spillere i GGZ mode."
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
@@ -4080,11 +4087,17 @@ msgstr ""
 "Antal spillere er højere end den ønskede værdi;\n"
 "beholder gammel værdi."
 
-#: server/settings.c:236
+#: server/settings.c:181
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr ""
+"Du har ikke tilladelse til at indstille tidsbegrænsninger mindre end 30 "
+"sekunder."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Kortstørrelse (i tusind felter)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4094,12 +4107,12 @@ msgstr ""
 "  størrelse = 4 er et normalt kort med 4.000 felter (standard)\n"
 "  størrelse = 20 er et stort kort med 20.000 felter"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Korttopologi indeks"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4167,11 +4180,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Metode brugt til at generere kort"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4191,11 +4204,11 @@ msgstr ""
 "standardværdien af startpositionen anvendes vil en startposition værdi blive "
 "valgt baseret på generatoren.  Se \"startpos\" indstilling."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Metode brugt til at vælge startsted"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4217,36 +4230,36 @@ msgstr ""
 "Bemærk: Generatoren forsøger at skabe det korrekte antal kontinenter ud fra "
 "valgene af startposistion og antallet af spillere."
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Om 1x1 øer skal være med eller ikke"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = ingen 1x1 øer; 1 = nogle 1x1 øer"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Om polerne er separate kontinenter"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = kontinenter kan forbindes til polerne, 1 = polerne er normalt separate"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Hele kortet er tempereret"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = normal jordlignende planet; 1 = kun tempereret planet "
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Gennemsnitstemperatur på planeten"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4279,22 +4292,22 @@ msgstr ""
 "\n"
 "0 betyder en meget kold planet med store polarzoner og ingen tropiske zoner."
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Procentandel af et kort som er land"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 "Denne indstilling angiver den cirka procent af kortet som vil blive intoland."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Mængde bakker/bjerge"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4302,11 +4315,11 @@ msgstr ""
 "Lave værdier giver flade kort, mens højere værdier giver et mere kuperet "
 "kort med flere bakker og bjerge."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Mængde vand på land"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4314,11 +4327,11 @@ msgstr ""
 "Lave værdier betyder meget tørt, ørkenagtigt land; højere værdier betyder et "
 "vådere kort med flere sumpe, jungler og floder."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Udgangspunkt for tilfældig generering af kort"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4329,11 +4342,11 @@ msgstr ""
 "et tilfældigt kort. Denne indstilling er normalt kun af interesse ved "
 "fejlsøgning af spillet."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Udgangspunkt for tilfældighedsfunktion"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4341,11 +4354,11 @@ msgstr ""
 "For 0 (standardværdi) vil udgangspunktet blive valgt baseret på klokkeslæt. "
 "Denne indstilling er normalt kun af interesse ved fejlsøgning af spillet."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Mængde felter med \"specielle\" resurser"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4353,11 +4366,11 @@ msgstr ""
 "Specielle resurser forbedrer den basale terræntype de er på. Serverens "
 "variabelskala er dele per tusind."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Mængde landsbyer (mindre stammelandsbyer)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4366,23 +4379,23 @@ msgstr ""
 "hele kortet. Landsbyer er små stammefællesskaber som kan undersøges af "
 "enheder."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Minimum antal spillere"
 
-#: server/settings.c:419
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
-"Der skal være mindst så mange spillere (tilsluttede rigtige spillere eller "
-"AI'er)før spillet kan starte."
+"Der skal være mindst så mange spillere (tilsluttede rigtige spillere) før "
+"spillet kan begynde."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Maksimalt antal spillere"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4392,11 +4405,11 @@ msgstr ""
 "spillet. NÃ¥r dette antal spillere er tilsluttet under forspillet afvises "
 "alle yderligere spillere som forsøger at opkoble."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Antal spillere (inklusive datastyrede spillere)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4404,11 +4417,11 @@ msgstr ""
 "Hvis der er færre end dette antal spillere når spillet starter, vil ekstra "
 "AI-spillere blive suppleret."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Liste over spillers startenheder"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4436,27 +4449,27 @@ msgstr ""
 "    a   = Hurtig angrebsenhed (fx, rytter)\n"
 "    A   = Stærk angrebsenhed (fx, katapult)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Området hvor startenheder er"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "Dette er radiusen indenfor hvilken startenhederne er spredt ud."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Antal guld per spiller ved start"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "I starten af spillet modtager hver spiller denne guldværdi."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Antal teknologier per spiller ved start"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4467,11 +4480,11 @@ msgstr ""
 "Teknologierne vælges tilfældig for hver spiller. Afhængig af værdien på de "
 "tildelte teknologier kan den næste teknologi bliver meget dyr. "
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Teknologiomkostningsmultiplierprocent"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4481,11 +4494,11 @@ msgstr ""
 "teknologiomkostninger ganges med dette beløb (som en procent). "
 "Standardomkostningen bestemmes af regelsættet eller andre spilindstillinger."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Procentvis tab ved ændring af forskning"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4495,11 +4508,11 @@ msgstr ""
 "overskud af forskningsværdi mister man denne procentandel af det. Dette "
 "gælder ikke hvis man netop har gjort et fremskridt i denne omgang."
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Tab ved anskaffelse af teknologi eller guld via en traktat"
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4512,11 +4525,11 @@ msgstr ""
 "at have negativ forskningsværdi. Gælder også ved guldoverførsler i "
 "diplomatiske aftaler."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Tab ved anskaffelse af teknologi fra erobring"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4527,11 +4540,11 @@ msgstr ""
 "at udvikle en ny teknologi. Forskningsværdien kan blive negativ hvis denne "
 "er forskellig fra nul."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Tab af forskningspoint når du får gratis teknologi"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4545,11 +4558,11 @@ msgstr ""
 "omkostningen ved at udvikle en ny teknologi. Forskningsværdien kan blive "
 "negativ hvis denne er forskellig fra nul."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Mad nødvendig for at få vækst i en by"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4559,11 +4572,11 @@ msgstr ""
 "værdi ganges med en anden faktor som kommer fra regelsættet og er afhængig "
 "af størrelsen på byen."
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr "Procentandel mad som går tabt, når bygning er krævet"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4573,11 +4586,11 @@ msgstr ""
 "kloaksystem),  mister den dette antal procent af sin mad (eller halvdelen "
 "hvis den har kornlager)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Mulitplierprocent for produktionsomkostningen"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4585,11 +4598,11 @@ msgstr ""
 "Denne instilling afgør hvor hurtigt enheder og bygninger kan produceres. "
 "Standardtiden ganges med denne multiplier (som en procent)."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Mindste størrelse på by for at få fuld handel"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4601,11 +4614,11 @@ msgstr ""
 "formindskes gradvis til 0% (ingen begrænsning udover normal korruption) for "
 "byer med størrelse fulltradesize. Se også notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Største størrelse på en by uden handel"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4615,11 +4628,11 @@ msgstr ""
 "øger gradvis for byer større end notradesize og mindre end fulltradesize. Se "
 "også fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Bystørrelse før folk bliver ulykkelige"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4627,11 +4640,11 @@ msgstr ""
 "Før andre faktorer har indvirkning er de første unhappysize indbyggere i en "
 "by glade, derefter er indbyggerne tilfredse. Se også cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Antal byer for øget ulyksalighed"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4643,11 +4656,11 @@ msgstr ""
 "også unhappysize. Dette forudsætter et Demokrati, for andre styreformer er "
 "indtræffer effekten ved færre antal byer."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Mindste afstand mellem byer"
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4659,11 +4672,11 @@ msgstr ""
 "mindst 2 tomme felter mellem 2 byer i alle retninger. Hvis den er sat til 0 "
 "(standard) så benyttes værdien i regelsættet i stedet."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Antal runder mellem hver fejring"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4671,11 +4684,11 @@ msgstr ""
 "Sætter antal runder mellem vækst fra fejring i en by. Når sat til n vil byen "
 "vokse efter at have fejret i n+1 runder."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Risiko for ødelæggelse af bygning ved erobring"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4683,11 +4696,11 @@ msgstr ""
 "Når en spiller erobrer en by, så har hver byforbedring denne procentrisiko "
 "for at blive ødelagt."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Chance for at flytte ind i felt efter angreb"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4701,11 +4714,11 @@ msgstr ""
 "tilbage i feltet). Værdier mellem 0 og 100 giver varierende sandsynlighed "
 "for at området bliver \"okkuperet\"."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Indstil on/off server autoangreb"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4713,11 +4726,11 @@ msgstr ""
 "Hvis sat til on, vil enheder med ledig bevægelsesmulighed automtisk angribe "
 "fjendeenheder som flytter forbi dem."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Reducér bybefolkning efter angreb"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4733,11 +4746,11 @@ msgstr ""
 "  4 = heli\n"
 "  8 = luft"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Radius på landegrænser"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4747,11 +4760,11 @@ msgstr ""
 "radius af byen været ejet af nationen. Speciale regler er gældende for ocean "
 "områder og områder indenfor radius af mere end en nations byer."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Militære enheder indenfor grænsen fører ikke til utilfredshed. "
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4759,11 +4772,11 @@ msgstr ""
 "Hvis denne indstilling er sat, vil enheder ikke medføre uro når de er "
 "indenfor dine egne grænser."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Evnen til at føre diplomati med andre spillere"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4777,11 +4790,11 @@ msgstr ""
 "3 = diplomati er afgrænset til hold.\n"
 "4 = diplomati er slået fra."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Tilladte bynavne"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4806,11 +4819,11 @@ msgstr ""
 " /nHvis denne er sat til 3, får spillerne ikke lov til at benytte "
 "standardnavnene for en anden nations byer."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Hvor ofte barbarerne dukker op"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4824,19 +4837,19 @@ msgstr ""
 "3 - høj barbarfrekvens \n"
 "4 - vandrende horder, massevis af barbarer"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Ã…r for barbarer"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbarer vil ikke dukke op før dette år"
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Revolutionslængde i form af runder"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4845,11 +4858,11 @@ msgstr ""
 "dette antal runder. Hvis den sættes til 0, giver det en tilfældig længde "
 "mellem 1-6 runder."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Hvorvidt 'fog of war' skal tillades"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4859,11 +4872,11 @@ msgstr ""
 "synsfeltet for sine egne enheder og byer. Man kan ikke se nye byer, eller "
 "landskabsforandringer i ikke-observerede felter."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Succesbasechance for diplomater og spioner."
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4872,19 +4885,19 @@ msgstr ""
 "Sandsynligheden for at en spion returnerer fra en succesfuld mission og "
 "succes-basechancen for diplomater og spioner."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Hvorvidt rumkapløb tillades"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Hvis dette tilvalg er 1, kan spillerne bygge rumskibe."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Minimum antal byer for borgerkrig"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4894,11 +4907,11 @@ msgstr ""
 "spillerenshovedstad falder. Hvis dette alternativ er sat til sin største "
 "værdi vil der aldrig komme borgerkrig."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Runder indtil spillerkontakt er tabt"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4908,11 +4921,11 @@ msgstr ""
 "sidst har mødtes, også selv om de ikke har en ambassade. Hvis den sættes til "
 "0 kan spillere ikke mødes uden at de har en ambassade."
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Genopbyg palads hvis hovedstaden erobres"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4924,21 +4937,21 @@ msgstr ""
 "blandt de byer som er tilbage. Man behøver ikke at have kundskab om "
 "Murerkunst for at få nyt palads."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Hvorvidt naturlige bynavne skal benyttes"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr "Hvis dette er valgt bestemmes bynavnene efter landskabet omkring byen."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Spillere som brugere kan vælge"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -5003,11 +5016,11 @@ msgstr ""
 "4 = Ingen spilleder tilladt, observatører tilladt;\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Automatisk AI-status"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5015,36 +5028,39 @@ msgstr ""
 "Hvis denne er sat til 1, deaktiveres AI-kontrol når en spiller tilslutter, "
 "og aktiveres når en spiller afbryder forbindelsen."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Ã…ret spillet slutter"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Spillet vil slutte ved udgangen af det angivne år."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Maksimalt antal sekunder per runde"
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Hvis ikke alle spillerne har trykket på \"Runde over\" før tidsbegrænsningen "
 "er udløbet, vil runden slutte automatisk. Nul betyder ingen tidsbegrænsning. "
-"I DEBUG servere vil en tidsbegrænsning på -1 køre spillet selvstændigt i "
-"testtilstand. Benyt dette med \"timeoutincrease\" for at få en dynamisk "
-"tidsbegrænsning."
+"I fejlsøgning indstiller en tidsbegrænsning på -1 den automatiske "
+"testtilstand. Kun forbindelser med hack-niveau kan indstille "
+"tidsbegrænsningen til mindre end 30 sekunder. Benyt dette med "
+"\"timeoutincrease\" for at få en dynamisk tidsbegrænsning."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "Tidsbegrænsning på mindst n sekunder når fjenden har flyttet sig"
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
@@ -5052,11 +5068,11 @@ msgstr ""
 "Når en enhed flytter indenfor synsfelt af en fjendtlig spiller, sættes den "
 "tilbageværende tidsbegrænsning til denne værdi."
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Hvorvidt der skal være samtidige spillerfaser."
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5064,11 +5080,11 @@ msgstr ""
 "Hvis sand, vil alle spillers bevægelser foregå samtidig; hvis falsk vil "
 "spillerne ændre deres bevægelser."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Maksimal klient-blokering (sekunder)"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5078,11 +5094,11 @@ msgstr ""
 "lukkes den. 0 betyder at der ikke findes nogen tidsbegrænsning undtagen den "
 "som findes i selve TCP-protokollen."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Maks sekunder for tømning af TCP-buffere"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5092,11 +5108,11 @@ msgstr ""
 "klienttilslutningers TCP-buffere ikke er blokerede. 0 betyder at serveren "
 "ikke vil vente overhovedet."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Sekunder mellem PING"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5104,22 +5120,22 @@ msgstr ""
 "Civserver vil kontakte klienterne med PING forespørgsler efter dette "
 "tidsinterval."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "PÃ¥ tide at fjerne en klient"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Hvis en klient ikke svarer på en PING inden denne tid vil klienten blive "
 "koblet fra."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Runde-blokerende spiltilstand"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5127,11 +5143,11 @@ msgstr ""
 "Hvis denne er sat til 1, så går spillet ikke videre før allespillerne har "
 "afsluttet deres runde, inkluderet afkoblede spillere."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Fast-længde runder-spiltilstand"
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
@@ -5139,11 +5155,11 @@ msgstr ""
 "Hvis denne er sat til 1, så går spilrunden ikke videre, før tiden er løbet "
 "ud, uanset at spillerne alle har klikket på \"Runde færdig\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Hvad er der i demografi-rapporten"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5184,11 +5200,11 @@ msgstr ""
 "Rækkefølgen på tegnene betyder ingenting, men størrelsen på bogstaverne gør "
 "det."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Runder pr auto-gemning"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5196,11 +5212,11 @@ msgstr ""
 "Spillet vil automagisk gemmes med så mange runders mellemrum. 0 betyder at "
 "man ikke ønsker auto-gemning."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Komprimeringsniveau på gemt spil"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5210,11 +5226,11 @@ msgstr ""
 "format). Højere tal vil give højere komprimering, men tage længere tid. Hvis "
 "maksimum er 0 var denne server ikke oversat til at bruge zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Autogemnings præfiks"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5222,11 +5238,11 @@ msgstr ""
 "Automatisk lagrede spil vil have navnet \"<forstavelse><Ã¥r>.sav\"\n"
 "Denne indstilling ændrer <forstavelse> delen."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Hvorvidt spillerstatistik skal logges"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5240,7 +5256,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Serveren kan ikke læse fra tastaturet. Ignorerer det."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Server: Ugyldig adresse: [%s:%d]."
@@ -5338,10 +5354,10 @@ msgid "Game ended in a draw"
 msgstr "Spillet endte uafgjort"
 
 #: server/srv_main.c:461 server/srv_main.c:472
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
 msgstr ""
-"Dine %s enhed blev opløst i overensstemmelse med din fredstraktat med %s."
+"Din %s enhed blev opløst i overensstemmelse med din fredstraktat med %s."
 
 #: server/srv_main.c:512 server/srv_main.c:516
 #, c-format
@@ -5373,88 +5389,88 @@ msgstr "Kunne ikke gemme spil som %s"
 msgid "Game saved as %s"
 msgstr "Spil gemt som %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Spillet er allerede i gang."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%s mistede kontrollen cmdlevel ved spilstart. Bruger afstemning fra nu af."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Starter spil."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "Ukendt rapport (type %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Advarsel: Afviser ældre klient %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Modtog en netpakke af type %d fra en død eller observatør spiller"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Vælg venligst et navn der ikke er blankt."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Denne nation er allerede i brug."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "En anden spiller kaldet '%s' deltager allerede.  Vælg et andet navn."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Vælg venligst et navn der kun indeholder ASCII karakterer."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "%s nation er ikke tilgængelig i dette scenarie."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "Nation %s er allerede i brug."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s er %s hersker %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Kan ikke starte spil: %d ud af %d spillere er allerede i gang."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s er blevet tilføjet som %s niveau AI-kontrolleret spiller."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Spiller %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s styrer %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
@@ -5462,16 +5478,16 @@ msgstr ""
 "Dette civserver program har spillerbekræftelseunderstøttelse, men det er for "
 "nuværende ikke i brug."
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Sender info til metaserver [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Spillet er forbi..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Accepterer nu nye klient-tilslutninger."
 
@@ -5492,7 +5508,7 @@ msgstr "(uklar)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5666,7 +5682,7 @@ msgstr "Spillere kan ikke fjernes efter at spillet er startet."
 msgid "Removed player %s from the game."
 msgstr "Fjernede spiller %s fra spillet."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Navnet \"%s\" er ikke tilladt af sikkerhedsårasager."
@@ -5742,200 +5758,200 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr "Kan ikke øge kommandoniveau til '%s'; du har kun '%s' selv."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Kommando adgangs-niveau sat til '%s' for tilslutning %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "Kommando adgangsniveau kunne ikke sættes til '%s' for tilslutning %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Kommando adgangs-niveau sat til '%s' for nye spillere."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "Kommando-adgangsniveau tildeles '%s' første spiller som kobler til."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "'Førsteniveau'-kommandoen giver ikke mening på server-kommandolinje."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Du har allerede adgangsniveau '%s' eller bedre."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "En andre er allerede spilleder."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "Forbindelse %s har anmodet om at blive spileleder."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Ugyldigt argument %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Brug: timeoutincrease <runde> <rundetillæg> <værdi> <faktor>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Dynamisk rundetidsbegrænsning sat til %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Indstilling:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "kan ændres"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "rettet"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Værdi: %d, Minimum: 0, Std.værdi: %d, Maksimum: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Værdi: %d, Minimum: %d, Std.værdi: %d, Maksimum: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Værdi: \"%s\", Std.værdi: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Forklaringer er tilgængelige for følgende serveroptioner:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Ingen forklaring på det endnu."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Indstillingsnavn er ikke entydigt."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Server Operatør: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Spiller '%s' har nu AI sværhedsgrad '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s er ikke kontrolleret af AIen."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Standard AI sværhedsgrad er sat til '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Denne kommando er for klienter kun."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Brug: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Kun spillere må anvende væk kommandoen."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s er sat til væk-tilstand."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s returnerede til spillet."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Beklager, du har ikke adgang til at se indstillingen '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Ukendt indstilling '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Alle indstillinger med ikkestandardværdier"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Alle indstillinger"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Vitale indstillinger"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Situationsindstillinger"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Sjældent brugte indstillinger"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ betyder at du kan ændre indstillingen"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= betyder at indstillingen har standardværdi"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s værdi  (min,maks)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Indstilling"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "beskrivelse"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -5943,38 +5959,38 @@ msgstr ""
 "Brug 'show situational' eller 'show rare' for at vise flere indstillinger.\n"
 "Brug 'show changed' for at vise indstillinger med ikke standard værdier."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Kan ikke ændre holdene når spillet er startet."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Udefineret argument. Brug: team <spiller> <hold>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 "Ikke noget sådant hold %s.  Oplys venligst et gyldigt holdnavn eller nummer."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Kan ikke være på hold sammen med en barbar."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Spiller %s er med i holdet %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Udefinerede argumenter. Brug: vote yes/no [afstemningsnummer]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Observatører kan ikke stemme."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -5982,39 +5998,39 @@ msgstr ""
 "Du kan kun stemme i et igangværende spil. Brug 'first' for at blive "
 "spilleder, hvis der ikke er en."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Stem %d\"%s\": %d for, %d imod"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Der er ingen stemmeafgivning i gang."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Ingen gyldig sidste stemme."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Værdien skal være et heltal."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Ingen sådan stemme (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Du stemte for \"%s\""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Du stemte imod \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6022,423 +6038,447 @@ msgstr ""
 "Udefinerede argumenter. Brug: debug <diplomati <spiller> | by <x> <y> | "
 "enhed <x> <y> | enhed <id> | tech <spiller> | timing | info>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Kan først bruge denne kommando når spillet er startet."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "%s diplomati ikke længere i fejlsøgning"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "%s diplomati fejlsøgt"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "%s teknologi ikke længere i fejlsøgning"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "%s teknologi fejlsøgt"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Værdi 2 og 3 skal være heltal."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Ugyldige kortkoordinater."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Ingen by på denne koordinat."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s ikke længere i fejlsøgning"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
-#, fuzzy, c-format
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#, c-format
 msgid "%s %s no longer debugged."
 msgstr "%s's %s ikke længere i fejlsøgning."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
-#, fuzzy, c-format
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#, c-format
 msgid "%s %s debugged."
 msgstr "%s's %s fejlsøgt."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Værdi 2 skal være et heltal"
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Enhed %d eksisterer ikke."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Udefineret argument. Brug: set <indstilling> <værdi>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Du har ikke lov at sætte denne indstilling."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Denne indstilling kan ikke ændres efter at spillet er startet."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Værdien skal være et heltal"
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr "Parameteren %s bør kun indholde tallene 0-1."
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Værdi udenfor område (minimum: 0, maksimum: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Indstilling: %s er blevet sat til %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr "Parameteren %s bør kun indeholde +- og 0-9."
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Værdi uden for det gyldig interval (minimum: %d, maksimum: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Strengværdi for lang. Brug: set <indstilling> <værdi>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Indstilling: %s er blevet sat til \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Beklager, du kan ikke være global observatør i dette spil."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 "Beklager, du kan ikke overtage en global observatør. Observer i stedet."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Beklager, man kan ikke overtage spiller i dette spil."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Beklager, man kan ikke observere barbarer i dette spil."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Beklager, man kan ikke tage barbarer i dette spil."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Beklager, man kan ikke observere døde spillere i dette spil."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Beklager, man kan ikke tage døde spillere i dette spil."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Beklager, man kan ikke observere AI-spillere i dette spil."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Beklager, man kan ikke overtage AI-spillere i dette spil."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Beklager, man kan ikke observere spillere i dette spil."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "Beklager, man kan ikke overtage spiller i dette spil."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Beklager, man kan ikke observere i dette spil."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Beklager, man kan ikke overtage spillere i dette spil."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "Beklager, man kan ikke overtage spillere der allerede er forbundet."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Brug: observer [connection-name [spillernavn]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Brug: observer [spillernavn]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s kontrollere allerede %s. Brug af 'observer' vil fjerne %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s observerer allerede %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s observerer allerede."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s observer nu %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s observer nu"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Brug: tag [forbindelsesnavn] <spillernavn>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Brug: tag <spillernavn>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Brug: tag [forbindelsesnavn] <spillernavn>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s kontrollerer allerede %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Der er ingen ledige spillerpladser til %s"
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "Løsnes fra %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s kontrollerer nu %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbar"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "AI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Menneske"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "I live"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Død"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
-msgstr "%s er ikke knyttet til nogen spiller."
+msgid "%s failed to attach to any player."
+msgstr "%s er ikke knyttet til nogen spiller"
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Brug: løs <tilslutningsnavn>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Du kan ikke løsne andre brugere."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s er ikke knyttet til nogen spiller."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s frigører fra %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s observerer ikk mere."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "frigører fra %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Brug: hent <spilnavn>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "Kan ikke indlæse et spil, når et andet kører."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "Kan ikke finde det gemte spil eller scenarie med navnet\"%s\"."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "Kunne ikke indlæse gemt spil: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Nuværende katalog for regelopsætningen er: \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Kunne ikke finde regelopsætningskataloget \"%s\""
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Regelopsætningskataloget er allerede \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Regelopsætningskataloget er \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Farvel."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Beklager, du har ikke rettigheder til at benytte serverkommandoer."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Advarsel: '%s' tolket som '%s', men dette er tvetydigt.  Forsøg '%shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Ukendt kommando. Prøv '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Din nye stemmeafgivning afløser din tidligere."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Ny stemme (nummer %d) fra %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
-msgstr ""
+msgstr "Din nye stemme (\"%s\") var ikke gyldig eller kunne ikke genkendes."
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Du har ikke lov at bruge denne kommando."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(serverkommandolinje)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Spillet endte uafgjort."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr "Afslutter spillet. Serveren genstarter når alle klienter er logget af."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Kan ikke afslutte spil: det er ikke noget spil i gang."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s har erkendt at personen ikke kan vinde."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Du kan ikke overgive dig nu."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
-msgstr "Ikke nok spillere, spillet vil ikke starte."
+#: server/stdinhand.c:3883
+msgid "Not enough human players, game will not start."
+msgstr "Ikke nok ikke-computer-spillere, spillet vil ikke starte."
 
-#: server/stdinhand.c:3819
-#, fuzzy
+#: server/stdinhand.c:3888
+msgid "No players, game will not start."
+msgstr "Ingen spillere, spillet vil ikke starte."
+
+#: server/stdinhand.c:3892
 msgid "Not enough nations for all players, game will not start."
-msgstr "Ikke nok spillere, spillet vil ikke starte."
+msgstr "Ikke nok nationer til alle spillere, spillet vil ikke starte."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Alle spillere er klar; starter spillet."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr "Kan ikke starte spil: Spillet afventer at alle klienter logger af.."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Kan ikke starte spil: Det er allerede i gang."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Afbryder tilslutning til %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6477,123 +6517,123 @@ msgstr ""
 "  save   -  gem det nuværende spil\n"
 "  quit   -  afslut"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Kommando:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Sammendrag: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Niveau: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Følgende serverkommandoer er tilgængelige:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Hjælpeargument '%s' er ikke entydigt."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Ingen træffer fundet for hjælpeargument '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Ulovligt listeargument: '%s'.  Forsøg '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Spillerliste:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<ingen spillere>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "bruger %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", død"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", sværhedsgrad %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", klar"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", ikke klar"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] "%d forbindelse:"
 msgstr[1] "%d forbindelser:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s fra %s (kommando-adgangsniveau %s), bufstørrelse=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (observatørtilstand)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Holdliste:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : '%s' : %d spiller"
 msgstr[1] "%2d : '%s' : %d spillere"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 spiller : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Hold uden spillere: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Liste af tilslutninger til server:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<ingen tilslutninger>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Tilgængelige scenarier"
 
@@ -6664,17 +6704,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Det teknologiske mål er %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Du stjæler %s fra %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "Folkeslaget %s stjal %s fra dig!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "Din %s stjal %s fra %s."
@@ -6767,13 +6807,13 @@ msgstr "Atomangrebet på %s blev undgået af dit SDI-forsvar."
 
 #. TRANS: "Your Cannon ... the Polish Destroyer."
 #: server/unithand.c:901
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s survived the pathetic attack from the %s %s."
 msgstr "Din %s overlevede det ynkelige angreb fra %s %s."
 
 #. TRANS: "... Cannon ... the Polish Destroyer."
 #: server/unithand.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "Your attacking %s failed against the %s %s!"
 msgstr "Din %s mislykkes i angrebet mod %s %s!"
 
@@ -6796,7 +6836,7 @@ msgid "%s can only move into your own zone of control."
 msgstr "%s kan kun bevæge sig i din kontrolzone."
 
 #: server/unithand.c:1007
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot invade unless you break peace with %s first."
 msgstr "Kan ikke angribe hvis du ikke først erklærer krig med %s."
 
@@ -6882,7 +6922,7 @@ msgstr ""
 "Din %s fra %s er ankommet i %s, og overskuddet udgør %d i guld og forskning."
 
 #: server/unittools.c:253
-#, fuzzy, c-format
+#, c-format
 msgid "%s was upgraded for free to %s."
 msgstr "%s blev opgraderet uden omkostning til %s."
 
@@ -6923,7 +6963,6 @@ msgstr "Din %s er løbet tør for brændstof."
 
 #. TRANS: And, <the unit> became ...
 #: server/unittools.c:616
-#, fuzzy
 msgid "And, became more experienced!"
 msgstr " og blev mere erfaren!"
 
@@ -6971,19 +7010,19 @@ msgstr "Barbarleder fanget, %d guld betalt i løsepenge."
 
 #. TRANS: "... Cannon ... the Polish Destroyer."
 #: server/unittools.c:1545
-#, fuzzy, c-format
+#, c-format
 msgid "Your attacking %s succeeded against the %s %s!"
 msgstr "Din %s lykkedes i angrebet mod %s %s!"
 
 #. TRANS: "Cannon ... the Polish Destroyer."
 #: server/unittools.c:1554 server/unittools.c:1612
-#, fuzzy, c-format
+#, c-format
 msgid "%s lost to an attack by the %s %s."
 msgstr "%s gik tabt i et angreb fra %s %s."
 
 #. TRANS: "... Cannon ... the Polish Destroyer ...."
 #: server/unittools.c:1588
-#, fuzzy, c-format
+#, c-format
 msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
 msgid_plural ""
 "Your attacking %s succeeded against the %s %s (and %d other units)!"
@@ -6994,7 +7033,7 @@ msgstr[1] "Din %s lykkedes i angrebet mod %s %s (og %d andre enheder)!"
 #. TRANS: "Cannon lost when the Polish Destroyer
 #. * attacked the German Musketeers."
 #: server/unittools.c:1621
-#, fuzzy, c-format
+#, c-format
 msgid "%s lost when the %s %s attacked the %s %s."
 msgstr "%s gik tabt da %ss %s angreb %ss %s."
 
@@ -7002,7 +7041,7 @@ msgstr "%s gik tabt da %ss %s angreb %ss %s."
 #. TRANS: "Musketeers (and Cannon) lost to an
 #. * attack from the Polish Destroyer."
 #: server/unittools.c:1636
-#, fuzzy, c-format
+#, c-format
 msgid "%s (and %s) lost to an attack from the %s %s."
 msgstr "%s (og %s) gik tabt i et angreb fra %ss %s."
 
@@ -7011,7 +7050,7 @@ msgstr "%s (og %s) gik tabt i et angreb fra %ss %s."
 #. * an attack from the Polish Destroyer."
 #. * (only happens with at least 2 other units)
 #: server/unittools.c:1646
-#, fuzzy, c-format
+#, c-format
 msgid "%s and %d other unit lost to an attack from the %s %s."
 msgid_plural "%s and %d other units lost to an attack from the %s %s."
 msgstr[0] "%s og %d anden enhed gik tabt i et angreb fra %ss %s."
@@ -7021,7 +7060,7 @@ msgstr[1] "%s og %d andre enheder gik tabt i et angreb fra %ss %s."
 #. * attacked the German Musketeers."
 #. * (only happens with at least 2 other units)
 #: server/unittools.c:1660
-#, fuzzy, c-format
+#, c-format
 msgid "%d unit lost when the %s %s attacked the %s %s."
 msgid_plural "%d units lost when the %s %s attacked the %s %s."
 msgstr[0] "%d enhed tabt da %ss %s angreb %ss %s"
@@ -7038,7 +7077,7 @@ msgstr "dig selv"
 
 # problem
 #: server/unittools.c:1935
-#, fuzzy, c-format
+#, c-format
 msgid "The %s %s was nuked."
 msgstr "%ss %s blev udsat for atomangreb."
 
@@ -7195,20 +7234,20 @@ msgstr "Forsøg på at bygge vidunder for %s mislykkedes."
 msgid "Your %s has invalid orders."
 msgstr "Din %s har ugyldige ordre."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Stor landmasse - dette kan tage nogen sekunder."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Falder tilbage på generator %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Generator 3 placerede ikke alle de store øer."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Generator 3 efterlod %li landmasse uplaceret."
@@ -7299,120 +7338,121 @@ msgstr "MÃ¥ske er der fejl ved konfigurationen"
 msgid "Cannot find audio file %s"
 msgstr "Kan ikke finde lydfilen %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX runder"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d guld per runde"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d/runde"
 msgstr[1] "%3d/runde"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "aldrig"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/runde"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d/runde"
 msgstr[1] "%s (%d) %d/runder"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Forældet"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Bygget"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Vidunder"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Mindre vidunder"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/runde"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : byboere\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Skatteindkomst fra handel\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : Handelsrute med %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : Skaber tiende\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : Bonus fra %s (% +d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Affald\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Uro\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Anvendt\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : Bliver\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Overskud"
@@ -7524,8 +7564,8 @@ msgid "Best defending units"
 msgstr "Bedste forsvarsenheder"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7695,8 +7735,8 @@ msgstr "?pollution [short]:For"
 msgid "?cma:Governor"
 msgstr "?cma:Leder"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7773,9 +7813,9 @@ msgstr ""
 
 #. TRANS: No full stop after the URL, could cause confusion.
 #: client/civclient.c:273
-#, fuzzy, c-format
+#, c-format
 msgid "Report bugs at %s\n"
-msgstr "Rapportér fejl til %s.\n"
+msgstr "Rapportér fejl til %s\n"
 
 #: client/civclient.c:297
 #, c-format
@@ -7959,19 +7999,19 @@ msgstr ""
 "Auto-tilslutter til serveren \"%s\" på port %d som \"%s\" hvert %f sekund"
 "(er) for %d gange"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "begynder"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "let"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "vanskelig"
 
@@ -7979,31 +8019,31 @@ msgstr "vanskelig"
 msgid "experimental"
 msgstr "eksperimentel"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Starter spil..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Kunne ikke starte serveren."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Du er nød til at starte en manuelt. Beklager..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Kunne ikke forbinde til serveren."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Vi kunne højst sandsynlig ikke starte herfra."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Vi har kontrol med serveren (kommandoniveau adgang)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "Vi kan ikke få kontrol med serveren, forsøget at slå den ned."
 
@@ -8088,27 +8128,27 @@ msgstr "Gælder kun for %s.\n"
 msgid "Requires a minimum size of %d.\n"
 msgstr "Kræver en minimum størrelse på %d.\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Tillader %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Tillader %s (med %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Floder"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Beklager, ikke noget hjælpeemne for %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8119,7 +8159,7 @@ msgstr ""
 "Denne side blev auto-genereret.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
@@ -8127,79 +8167,79 @@ msgstr ""
 "Kræver: Intet\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Opdagelsen af %s vil forælde %s.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* Tillader alle spillere med kundskab om %s at bygge %s enheder.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Tillader %s (med %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Tillader %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Kan kun bygges hvis der er %s i byen.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Kan kun bygges med %s som styreform.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Kan ikke bygges i byer.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Har aldrig en hjemby.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Tab af denne enhed betyder at spillet tabes!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Hver spiller kan kun have en af denne type enhed.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Kræver %d befolkning for at du kan bygge.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Kan transportere og tanke %d luftenheder.\n"
 msgstr[1] "* Kan transportere og tanke %d luftenheder.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Kan transportere og tanke %d missilenheder.\n"
 msgstr[1] "* Kan transportere og tanke %d missilenheder.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Kan transportere %d landenheder over vand.\n"
 msgstr[1] "* Kan transportere %d landenheder over vand.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8207,168 +8247,168 @@ msgstr ""
 "* Kan etablere handelsruter (må flytte til den ønskede by der skal være "
 "mindst 9 felter fra enhedens hjemby).\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Kan hjælpe med at bygge vidundere (tilfører %d produktion).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Kan ikke opløses.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Kan opløses i en by og du opnår derved at få 50%% af "
 "produktionsomkostningen tilbage.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Kan bygge nye byer.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Kan tilføje %d befolkning til byer ikke størrelse end %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Kan bygge veje og jernbaner.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Kan bygge miner på felter.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Kan foretage overrisling på felter.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Kan omdanne til landbrug.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Kan omdanne til landbrug (hvis %s er kendt).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Kan bygge landbrug (hvis en af de følgende er kendt: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Kan bygge fæstningsværker.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Kan bygge fæstningsværker (hvis %s er kendt).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Kan bygge fæstningsværker (hvis en af de følgende er kendt: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Kan rense for forurening på felter.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Kan fjerne atomaffald fra felter.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Kan ændre felter.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Kan bygge lufthavne.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Kan befæste sig, og dermed opnå en 50%% forsvarsbonus.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Kan ødelægge infrastruktur på felter.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Kan udføre diplomatiske handlinger, samt specielle spion-egenskaber.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Kan udføre diplomatiske handlinger.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Vil aldrig tabe en diplomat-mod-diplomat kamp.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Denne enhed kan ikke bestikkes.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Kan angribe fjendtlige luftenheder.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* Er usynlig undtaget når den er ved siden af en fremmed enhed eller by.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Kan kun angribe enheder på havet (ingen angreb mod land).\n"
 
 # dumbo translation
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr ""
 "* Kan fra søenheder angribe fjendens byer og landenheder på felter på land.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Kan lave faldskærmsudspring fra venlig by (Rækkevidde: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* FÃ¥r dobbelt forsvar mod enheder som er 'til hest'.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Tæller som 'til hest' mod enkelte forsvarere.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* En raketenhed: bliver brugt op idet den angriber.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Et angreb afslutter denne enheds runde.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Denne enheds angreb skaber en atomeksplosion!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Får dobbelt angrebsstyrke når byer angribes.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignorerer effekten af bymure.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8377,36 +8417,36 @@ msgstr ""
 "* Foretager bombardement (%d per runde). Disse angreb vil kun skade (aldrig "
 "dræbe) forsvareren men udgør til gengæld ingen risiko for angriberen.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* FÃ¥r femdoblet forsvar mod raketter og fly.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Ignorerer effekten af terræn (alle felter svarer til veje).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignorerer kontrolzoner.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 "* En ikke-militær enhed (kan ikke angribe; ingen undtagelsestilstand).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "* En kampenhed: medfører 1 ulykkelig selv når den er ikke-aggressiv.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Kan ikke opnå veteran status.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Kan blive veteran igennem træning eller kamp.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8415,12 +8455,12 @@ msgstr ""
 "* Skal afslutte runden i en by eller ved kysten, ellers har den en 50%% "
 "risiko for at gå tabt på havet.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* Opdagelsen af %s reducerer risikoen til 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s reducerer risikoen til 12%%.\n"
@@ -8429,27 +8469,27 @@ msgstr "* %s reducerer risikoen til 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " eller "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?eller:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* Enhed skal være i en by, eller på en %s efter %d runder.\n"
 msgstr[1] "* Enhed skal være i en by, eller på en %s efter %d runder.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Hvis vi havde startet med %s ville vi have behøvet %d forskningspoint."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8458,102 +8498,104 @@ msgstr ""
 "For at nå %s behøver vi at anskaffe %d andre teknologier først. Hele "
 "projektet kræver %d forskningspoint for at fuldføres."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Du kan ikke forske i denne teknologi."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 "* Dette nummer kan variere afhængigt af til hvad andre spillere forsker "
 "på. \n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* Den første spiller som forsker på %s får et umiddelbart fremskridt.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Reducerer risikoen for at miste skibe på det dybe ocean til 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Reducerer risikoen for at miste skibe på det dybe ocean til 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Øger forureningen skabt af befolkningen.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Tillader %s at bygge veje på flodfelter.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Tillader %s at bygge forter.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Tillader %s at bygge flybaser.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Tillader %s at opgradere veje til jernbaner.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Tillader %s at opgradere overrislet land til landbrugsland.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Forurening opstår ikke på denne type terræn."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Du kan ikke bygge byer på dette terræn."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Kystlinjen på dette terræn er usikker."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Dette terræn er usikkert for enheder."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Landenheder kan ikke rejse på havterræn."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Fordele:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr "?outputlist: Intet "
 
-#: client/helpdata.c:1417
-#, fuzzy, c-format
+#: client/helpdata.c:1421
+#, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
 "become unhappy.\n"
 msgid_plural ""
 "* Military units away from home and field units will cause %d citizens to "
 "become unhappy.\n"
-msgstr[0] "Militære enheder i felten gør %d indbyggere ulykkelige.\n"
-msgstr[1] "Militære enheder i felten gør %d indbyggere ulykkelige.\n"
+msgstr[0] ""
+"Militære enheder i felten og feltenheder gør %d indbygger ulykkelige.\n"
+msgstr[1] ""
+"Militære enheder i felten og feltenheder gør %d indbyggere ulykkelige.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8562,30 +8604,30 @@ msgstr ""
 "* Hver af dine byer undgår %d ulykkelige indbyggere skabt af enheder.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* Du betaler %d gange normal %s vedligehold for dine enheder.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* Du betaler %d gange normal vedligehold for dine enheder.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* Du betaler ingen %s vedligehold for dine enheder.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* Du betaler ingen vedligehold for dine enheder.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
@@ -8593,19 +8635,19 @@ msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 "* Hver af dine byer vil undgå betaling af %d til enhedsvedligeholdelse.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "* Risiko for borgerkrig er %d%% hvis du mister din hovedstad.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8615,7 +8657,7 @@ msgstr ""
 "størrelse vil opstå når du har %d byer.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8624,18 +8666,18 @@ msgstr ""
 "* Efter den første utilfredse indbygger på baggrund af bystørrelse, vil for "
 "hver %d ekstra byer, endnu en utilfreds indbygger opstå.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 "Maksimum procenten du kan anvende for videnskab, guld eller luksus er %d%%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "Har ubegrænset videnskab/guld/luksus procenter.\n"
 
-#: client/helpdata.c:1505
-#, fuzzy, c-format
+#: client/helpdata.c:1509
+#, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
 "force %d unhappy citizen to become content.\n"
@@ -8644,22 +8686,22 @@ msgid_plural ""
 "force %d unhappy citizens to become content.\n"
 msgstr[0] ""
 "* Dine enheder kan indføre undtagelsestilstand. Hver militær enhed i en by "
-"vil fremtvinge at %d ulykkelig(e) indbygger(e) fremstår som tilfreds.\n"
+"vil fremtvinge at %d ulykkelig indbygger fremstår som tilfreds.\n"
 msgstr[1] ""
 "* Dine enheder kan indføre undtagelsestilstand. Hver militær enhed i en by "
-"vil fremtvinge at %d ulykkelig(e) indbygger(e) fremstår som tilfreds.\n"
+"vil fremtvinge at %d ulykkelige indbyggere fremstår som tilfreds.\n"
 
-#: client/helpdata.c:1517
-#, fuzzy, c-format
+#: client/helpdata.c:1521
+#, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
 msgstr[0] ""
-"* Et maksimum på %d enheder i hver by kan indføre undtagelsestilstand.\n"
+"* Et maksimum på %d enhed i hver by kan indføre undtagelsestilstand.\n"
 msgstr[1] ""
 "* Et maksimum på %d enheder i hver by kan indføre undtagelsestilstand.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8668,15 +8710,15 @@ msgstr ""
 "* Du kan få dine byer til at vokse ved hjælp af jubel. Dine byer må være "
 "mindst af %d størrelse før de kan vokse på denne måde.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Dine enheder kan ikke bestikkes.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Dine byer kan ikke overtales til oprør.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8684,15 +8726,15 @@ msgstr ""
 "* Din administration vil ende i anarki hvis en by er i uro i mere end to "
 "runder ad gangen.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Har et senat som kan forhindre krigserklæring.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr "* Tillander partisaner når byer er overtaget af fjenden.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
@@ -8700,25 +8742,25 @@ msgstr ""
 "* Bygninger som normalt giver bonus mod ulykkelighed vil i stedet generere "
 "guld.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* Betaler ikke vedligeholdelse for fanatikere.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* Har ingen ulykkelige indbyggere.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* Veteran %s enheder.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Veteran enheder.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8728,7 +8770,7 @@ msgstr ""
 "der ikke er jubel i byen.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8737,71 +8779,71 @@ msgstr ""
 "* Hvert anvendt felt med mindst 1 %s vil medføre %d ekstra når der festes.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr "* Hvert anvendt felt med mindst 1 %s vil medføre %d ekstra.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* %s produktion øges %d%%.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* %s produktion vil medføre store mængder affald.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* %s produktion vil medføre en del affald.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* %s produktion vil medføre en mindre mængde affald.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* %s affald vil stige stærkt i forhold til afstand fra hovedstad.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* %s affald vil stige i forhold til afstand fra hovedstad.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr "* %s affald vil stige langsomt ud fra afstand til hovedstad.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Tillader %s at bygge flybaser.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d ulykkelig"
@@ -9231,9 +9273,8 @@ msgid "Saved settings to file %s"
 msgstr "Gemte opsætning i filen %s"
 
 #: client/packhand.c:211 client/packhand.c:217
-#, fuzzy
 msgid "You were rejected from the game...."
-msgstr "Du blev afvist fra spillet:"
+msgstr "Du blev afvist fra spillet...."
 
 #: client/packhand.c:229
 #, c-format
@@ -9250,16 +9291,16 @@ msgstr "Egenskabsstreng for server: %s"
 msgid "Start of turn %d"
 msgstr "Runde %d begynder"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "AI-tilstand er nu %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "TIL"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "FRA"
 
@@ -9290,13 +9331,13 @@ msgstr "?Player:Navn"
 msgid "Username"
 msgstr "Brugernavn"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Flag"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9310,7 +9351,7 @@ msgstr "Grænse"
 msgid "Score"
 msgstr "Point"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Hold"
 
@@ -9343,36 +9384,36 @@ msgstr "?Player_dlg:Inaktiv"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Du kan ikke sælge forbedringer."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Solgt %d %s for %d guld."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Ingen %s kunne sælges."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Du kan ikke opløse enheder."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s kan ikke opløses."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Opløste %d%s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Ingen %s kunne opløses."
@@ -9458,7 +9499,6 @@ msgid "Minor Tribe Village"
 msgstr "Mindre stammelandsby"
 
 #: client/text.c:119
-#, fuzzy
 msgid "Our territory"
 msgstr "Vores territorium"
 
@@ -9510,9 +9550,9 @@ msgstr "By: %s (%s, %s)"
 
 #. TRANS: previous lines gave other information about the city.
 #: client/text.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "?clistbegin: with %s"
-msgstr "med %s"
+msgstr "?clistbegin: med %s"
 
 #. TRANS: "Trade from Warsaw: 5"
 #: client/text.c:202
@@ -9682,64 +9722,68 @@ msgstr "Guld: %d (% +d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Skat:%d Luks: %d Forsk: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+msgid "Moving: Nobody"
+msgstr "Bevæger: Ingen"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Bevægelse: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Klik for mere information)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s folk"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Runde: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Guld: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Indtægt: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Skattesatser: Guld:%d%% Luks: %d%% Forsk: %d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Forsker på %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Risiko for global opvarmning: %d%% (%+d%%/runde)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Sandsynlighed for atomvinter: %d%% (%+d%%/runde)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Styreform: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9747,55 +9791,55 @@ msgstr[0] "%d enhed"
 msgstr[1] "%d enheder"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr "?goto:Ikke tilgængelig"
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Runder til mål: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Runder til mål: %d til %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d enhed valgt"
 msgstr[1] "%d enheder valgt"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Ingen enheder valgt."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Andre: %d civil; %d militær"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Andre: %d civile"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Andre: %d militær"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Ingen enheder kunne opgraderes!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Ingen enheder kan opgraderes."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9810,72 +9854,72 @@ msgstr[1] ""
 "Opgradér %d for %d guld?\n"
 "Skatkammeret har %d guld."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Viser dit fremskridt i forskningen af ny teknologi."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "ingen forskning"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Viser hvor fremskreden global opvarmning er:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Forureningsgrad: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Risiko for global opvarmning hver runde: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Viser hvor fremskreden en atomvinter er:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Strålingsrate: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Risiko for en katastrofal vinter hver runde: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Viser din aktuelle styreform:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Befolkning:      %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Understøttelse:  %5d%%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energi:          %5d%%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9883,121 +9927,121 @@ msgstr[0] "Masse:           %5d ton"
 msgstr[1] "Masse:           %5d ton"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Rejsetid:        %5.1f år"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Rejsetid:            -      "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Succeschance:    %5d%%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Ankomstår:       %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:off"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/Secs:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dd %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:overflow"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s af %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Observatør: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Bygninger: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Ingen. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Vidundere: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Byer: %d totalt, %d over tærskelen på %d byer."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
-#, fuzzy, c-format
+#: client/text.c:1251
+#, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
-msgstr[0] "%d tilfredse før minuspoint med "
-msgstr[1] "%d tilfredse før minuspoint med "
+msgstr[0] "%d tilfreds før minuspoint."
+msgstr[1] "%d tilfredse før minuspoint."
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
-#, fuzzy, c-format
+#: client/text.c:1257
+#, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
-msgstr[0] "%d ekstra ulykkelige indbyggere."
+msgstr[0] "%d ekstra ulykkelig indbygger."
 msgstr[1] "%d ekstra ulykkelige indbyggere."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Undtagelsestilstand ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "intet maksimum, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10005,20 +10049,20 @@ msgstr[0] "%d enhed maksimum, "
 msgstr[1] "%d enheder maksimum, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d per enhed). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Militære enheder i felten kan føre til uro i deres hjemby. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Militære enheder har ingen indvirkning på lyksaligheden. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luksus: %d totalt."
@@ -10065,12 +10109,12 @@ msgid ""
 "have a look."
 msgstr "Byforvaltning: %s har gjort os forvirret. Du bør selv kigge på sagen."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "ingen"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "egendefineret"
 
@@ -10124,11 +10168,13 @@ msgid "Ooops..."
 msgstr "Ups..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Denne enhed kan ikke bestikkes!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10145,6 +10191,7 @@ msgstr "Bestik fjendtlig enhed"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10185,6 +10232,7 @@ msgstr "_Fremskridt:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Lad spionen vælge"
 
@@ -10209,12 +10257,13 @@ msgstr "_Forbedringer:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Byproduktion"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Du kan ikke anspore til oprør i %s."
@@ -10226,6 +10275,7 @@ msgstr "Byen kan ikke blive ansporet!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10242,6 +10292,7 @@ msgstr "Anspor til oprør!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10251,6 +10302,7 @@ msgstr ""
 "Skatkammeret har %d guld."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10320,10 +10372,12 @@ msgid "Subvert Enemy Unit"
 msgstr "Omvend fjendtlig enhed"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr "Diplomaten afventer din ordre"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr "Spionen afventer din ordre"
 
@@ -10423,7 +10477,7 @@ msgstr "Forurening:"
 msgid "_Overview"
 msgstr "_Oversigt"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10448,11 +10502,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d runder"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Køb"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr "_Produktion"
 
@@ -10571,7 +10625,7 @@ msgstr "Støttede enheder %d"
 msgid "Present units %d"
 msgstr "Enheder tilstede %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Cen_trér"
 
@@ -10660,31 +10714,31 @@ msgstr "Omdøb by"
 msgid "What should we rename the city to?"
 msgstr "Hvad skal vi omdøbe byen til?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "Ændr"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Tilføj _først"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Tilføj _næste"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Tilføj _last"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "Vælg _S"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr "Vis _h"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10694,12 +10748,12 @@ msgstr "Vis _h"
 msgid "Cities"
 msgstr "Byer"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr "_Inspeksér"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10708,85 +10762,90 @@ msgstr "_Inspeksér"
 msgid "Improvements"
 msgstr "Forbedringer"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Vidundere"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Alle byer"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Ingen byer"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Vend valg om"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Bygger enheder"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Bygningsforbedringer"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Bygning af vidunder"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Bygger enhed"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Bygningsforbedring"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Bygning af vidunder"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Byer ved kysten"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Samme ø"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Støttede enheder"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Enheder tilstede"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Forbedringer i by"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Vidundere i byen"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Tilgængelige enheder"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Tilgængelige Forbedringer"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Tilgængelige vidundere"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Total købspris: %d"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10852,122 +10911,122 @@ msgstr "Hvad skal vi kalde forhåndsvalget?"
 msgid "Remove this preset?"
 msgstr "Fjern dette forhåndsvalg?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "GÃ¥ ti_l"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr "_Vis by"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "SÃ¥ du vil have revolution?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revolution!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Hvad skal plyndres"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Vælg hvad der skal plyndres:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Enhed"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Navn"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Valg af enhed"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_Klargør alle"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "Hold _stand inaktive"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
 msgstr "Nation_grupper:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Hvilken nation vil du være?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Vælg nation"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
 msgstr "_Tilfældig nation"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Vælg en nation"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Egenskaber"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Leder:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Hunkøn"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Hankøn"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
 msgstr "_Bystil:"
 
 # RETMIG: rigtigt?
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 msgid "_Description"
 msgstr "_Legende"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Du skal vælge dit køn."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Du skal vælge stil for dine byer."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Du skal skrive et gyldigt navn."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Opgradér enhed!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11229,60 +11288,65 @@ msgstr ""
 msgid "Not _ready"
 msgstr "Ikke kla_r"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Klargør alle"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Start"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+msgid "_Take Player"
+msgstr "_Benyt denne spiller"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Vælg _nation"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_Observer"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr "Undlad at _observere"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<Novice AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<Nem AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<Normal AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<Dygtig AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Tilfældig"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Observatør"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Aftaget"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Er du sikker på at du vil slutte?"
 
@@ -11935,9 +11999,8 @@ msgstr "_Enheder"
 
 #. TRANS: Nations report action
 #: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
-#, fuzzy
 msgid "_Nations"
-msgstr "Nationer"
+msgstr "_Nationer"
 
 #: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
 msgid "_Economy"
@@ -11945,9 +12008,8 @@ msgstr "_Økonomi"
 
 #. TRANS: Research report action
 #: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
-#, fuzzy
 msgid "_Research"
-msgstr "Forskning"
+msgstr "_Forskning"
 
 #: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
 msgid "_Wonders of the World"
@@ -12202,214 +12264,214 @@ msgstr "_Tilslut til netværksspil"
 msgid "Connect to Gaming _Zone"
 msgstr "Tilslut til netværksspil"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Adgangskoder passer ikke, indtast adgangskode."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Servernavn"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Version"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Status"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Spillere"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Kommentar"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Lokalnetværk"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Internet _Metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Vært:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Port:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Bruger:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Adgangskode:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Bekræft adgangskode:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "Tilslut"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Forbindelsesnavn: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Spillernavn: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Server: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Spiller/forb info"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s info"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Toggle spiller klar"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Vælg nation"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Observer denne spiller"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Benyt denne spiller"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Afbryd tilslutning"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "Aitoggle spiller"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Fjern spiller"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Giv info adgang"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "Giv ctrl adgang"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "Brug %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr "_Antal spillere (inklusiv AI):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr "_AI niveau:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
 msgstr "_Regelsæt:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Flere spil indstillinger..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Optag"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Rater"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Klar"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Leder"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Vælg gemt spil at indlæse"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Vælg gemt spil til ind_læsning"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "Gennemse"
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Vælg et scenarie"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Vælg et scenarie"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Type"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Vælg et folkeslag du ønsker at spille som:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Vælg placering hvor du vil gemme"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Gem spil"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Gemte spil"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Filnavn:"
 
@@ -12444,7 +12506,7 @@ msgstr "?Building:Navn"
 msgid "Count"
 msgstr "Antal"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12491,7 +12553,6 @@ msgid "Unit Type"
 msgstr "Enheds-type"
 
 #: client/gui-gtk-2.0/repodlgs.c:934 client/gui-win32/repodlgs.c:696
-#, fuzzy
 msgid "?Upgradable unit [short]:U"
 msgstr "E"
 
@@ -12690,28 +12751,28 @@ msgstr "_Arbejdsliste:"
 msgid "Edit Global _Worklists"
 msgstr "Tilret Tilgængelige arbejdslister"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Runder"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "Source _Tasks:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Vis fremtidige mål"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "_Arbejdsliste:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "Tilgængelige arbejdslister"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Ændr produktion"
 
@@ -13004,8 +13065,8 @@ msgid "City shrinks: %d %s"
 msgstr "Byen formindskes: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13107,11 +13168,11 @@ msgstr "Garrisonsrapport"
 msgid "Maintenance Report"
 msgstr "Vedligeholdelsesrapport"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "arbejdsliste"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -13536,21 +13597,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr "  -t,  --theme THEME\tAnvend GUI tema THEME\n"
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr "Laver skærmbillede fc_%05d.bmp"
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Brug af video output: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Initialisere klient"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Venter på opstart af spillet"
 
@@ -13633,7 +13694,7 @@ msgid "Intelligence Information for the %s Empire"
 msgstr "Efterretningsinfo om det %se rige"
 
 #: client/gui-sdl/inteldlg.c:289
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Ruler: %s %s  Government: %s\n"
 "Capital: %s  Gold: %d\n"
@@ -14852,7 +14913,7 @@ msgstr "Bystil:"
 msgid "Unit Selection"
 msgstr "Valg af enhed"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "INGEN"
 
@@ -24337,7 +24398,7 @@ msgid ""
 msgstr ""
 "Det nuværende Tyrkiet er efterfølger til Det Ottomanske Rige, som brød "
 "sammen og opdelt af vinderne i 1. verdenskrig. Landet blev senere reformeret "
-"og sekulariseret af Kemal Mustapha, helten fra forsvaret af Gallipoli. "
+"og sekulariseret af Kemal Mustapha, helten fra forsvaret af Gallipoli."
 
 #: data/nation/ukrainian.ruleset:3
 msgid "Ukrainian"
@@ -24403,7 +24464,7 @@ msgid ""
 msgstr ""
 "Venezuela er det mest nordlige land i Sydamerika. Landet var en spansk "
 "koloni fra det 16. århundrede indtil sin uafhængighed den 5. juli 1811 under "
-"ledelse af El Libertador Simon Bolivar. "
+"ledelse af El Libertador Simon Bolivar."
 
 #: data/nation/venezuelan.ruleset:28
 msgid "Terrateniente"
@@ -24492,8 +24553,8 @@ msgid ""
 "Khoisan peoples and clashing with European settlers."
 msgstr ""
 "Zuluerne er et bantufolk som flyttede fra den vestlige central del af Afrika "
-"til det sydlige Afrika i begyndelsen af 1700-tallet. Her knust de de "
-"indfødte Khoisaner og kæmpede mod europæiske bosættere. "
+"til det sydlige Afrika i begyndelsen af 1700-tallet. Her knuste de "
+"deindfødte khoisaner og kæmpede mod europæiske bosættere."
 
 #: data/scenario/british-isles-85x80-v2.80.sav:3
 msgid "British Isles (medium/classic)"
diff --git a/po/de.gmo b/po/de.gmo
index 993387e..3908e48 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 7f9bfb2..0a5ad62 100644
--- a/po/de.po
+++ b/po/de.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-08-11 01:23+0300\n"
 "Last-Translator: Christian Knoke <chrisk at cknoke.de>\n"
 "Language-Team: German Freeciv Translators <freeciv.de at freelists.org>\n"
@@ -80,22 +80,22 @@ msgstr "Luxus"
 msgid "Science"
 msgstr "Forschung"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:-"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:+"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:0"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:-"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:+"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -514,81 +514,81 @@ msgstr "Mitteilungen zu Verbindungen"
 msgid "AI Debug messages"
 msgstr "KI Debug-Meldungen"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "völkermordend"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "kriegswütig"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "feindselig"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "unkooperativ"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "verärgert"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "neutral"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "respektvoll"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "hilfsbereit"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "begeistert"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "bewundernd"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "anbetend"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "Waffenstillstand"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "Krieg"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "Feuerpause"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "Frieden"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "Allianz"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "Unbekannt"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "Team"
 
@@ -634,13 +634,13 @@ msgstr "%s Einheiten"
 msgid "Size %d"
 msgstr "Größe %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Zukunftstechnologie %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -652,65 +652,65 @@ msgstr "Zukunftstechnologie %d"
 msgid "None"
 msgstr "Nichts"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Zukunftstechnologie"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Unbekannt)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Straße"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Bewässerung"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Eisenbahn"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Bergwerk"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Verschmutzung"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Hütte"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Befestigung"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Fluß"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Ackerland"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Fliegerhorst"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Fallout"
 
@@ -816,11 +816,11 @@ msgstr "Atomrakete"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " und "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?and:, "
 
@@ -979,82 +979,82 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (insgesamt 1 Wiederholung)"
 msgstr[1] " (insgesamt %d Wiederholungen)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Unvollständige Eingabe ('%s').\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Unvollständige Eingabe ('%s').\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d v. Chr."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d AD"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH ist leer; es wird der Standardpfad verwendet."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Kann das Datenverzeichnis %s: %s nicht lesen."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "Der Suchpfad kann über die Umgebungsvariable FREECIV_PATH gesetzt werden."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Aktueller Suchpfad: '%s'"
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Die Datei '%s' wird benötigt... Abbruch!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 "%s: Dieses Programm darf nicht von privilegierten Benutzern aufgerufen "
 "werden!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Starten Sie es als 'normaler' Benutzer.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "Volltreffer"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "Treffer"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "mehrdeutig"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "leer"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "zu lang"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "Fehlschlag"
 
@@ -1084,73 +1084,73 @@ msgstr "Die %s haben begonnen, %s in %s zu bauen."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s verkauft %s (unnötig) zum Preis von %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 "*%s (KI)* Im Abwesenheitsmodus kann die KI diesen Vertrag nicht "
 "unterzeichnen."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (KI)* Löse zuerst die Allianz mit %s, %s"
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (KI)* Laß uns erst die Feindseligkeiten beenden, %s"
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr "*%s (KI)* Ich will erst abwarten, ob Du die Feuerpause einhältst, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (KI)* Ich traue einer Allianz mit Dir noch nicht, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (KI)* Die Stadt, die Du nennst, kenne ich nicht."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 "*%s (KI)* Tut mir leid, es ist mir zu gefährlich, Dir Karteneinsicht zu "
 "geben."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (KI)* Diese Vereinbarung ist für uns unvorteilhaft, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (KI)* Willkommen in unserer Allianz, %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (KI)* Ja, mögen wir für immer verbunden sein, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (KI)* Ja, wir brauchen Frieden!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (KI)* Einverstanden. Keine Feindseligkeiten mehr, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1159,23 +1159,23 @@ msgstr ""
 "*%s (KI)* Sei gegrüßt, %s! Dürfen wir eine Feuerpause vorschlagen, damit wir "
 "uns besser kennenlernen können?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (KI)* Der Weltraum wird Dir niemals gehören. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "*%s (KI)* Ich habe Deine feindseligen Aktionen lange genug toleriert! Krieg!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (KI)* Frieden ... vielleicht ein anderes Mal."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1184,18 +1184,18 @@ msgstr ""
 "*%s (KI)* Endlich kriege ich Dich! Dachtest Du wirklich, Du könntest mit "
 "Deinen Verbrechen davonkommen?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 "*%s (KI)* Deine verdeckten Feindseligkeiten haben Dir diesen Krieg gebracht!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (KI)* Deine Aggression gegen %s war Dein letzter Fehler!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1210,7 +1210,7 @@ msgstr[1] ""
 "*%s (KI)* Wir werden einen gemeinsamen Krieg gegen %s in %d Runden beginnen, "
 "um den Start des Raumschiffes zu verhindern."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1219,7 +1219,7 @@ msgstr ""
 "*%s (KI) Wir erwarten in dieser Angelegenheit Deine Hilfe. Lang lebe unsere "
 "glorreiche Allianz!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1238,7 +1238,7 @@ msgstr[1] ""
 "Wir werden darauf in %d Runden gemeinsam reagieren und erwarten, daß Du Dich "
 "als unser Verbündeter anschließt!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1253,7 +1253,7 @@ msgstr[1] ""
 "*%s (KI)* Wir beabsichtigen, die reiche Zivilisation des %s zu plündern und "
 "auszurauben. Wir erklären den Krieg in %d Runden."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1261,7 +1261,7 @@ msgstr ""
 "*%s (KI)* Wenn Du einen Teil der Beute möchtest, kannst Du Dich gerne daran "
 "beteiligen!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1276,14 +1276,14 @@ msgstr[1] ""
 "*%s (KI)* Wir haben es satt mit %s. Laßt uns diese niedrige Zivilisation "
 "auseinanderreißen. Wir erklären den Krieg in %d Runden."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (KI)* Als unsere glorreichen Verbündeten, erwarten wir Eure Hilfe in "
 "diesem Krieg."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1298,7 +1298,7 @@ msgstr[1] ""
 "*%s (KI)* Wir werden unsere Allianz hochhalten und %s in %d Runden den Krieg "
 "erklären. Halte aus - wir kommen!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1313,7 +1313,7 @@ msgstr[1] ""
 "*%s (KI)* Wir werden unsere Allianz mit %s hochhalten und %s in %d Runden "
 "den Krieg erklären. Wir erwarten, das Du ebenso handelst."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1322,7 +1322,7 @@ msgstr ""
 "*%s (KI)* Dein Versuch, allein den Weltraum zu erobern, zeigt Deine wahren "
 "Absichten. Unsere Allianz ist beendet!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1331,7 +1331,7 @@ msgstr ""
 "*%s (KI)* Dein Versuch, einseitig den Weltraum zu beherrschen, ist äußerst "
 "bedrohlich."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1340,14 +1340,14 @@ msgstr ""
 "*%s (KI)* Wenn Du nicht den Raumschiffbau beendest, könnte ich gezwungen "
 "sein zu reagieren!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 "*%s (KI)* Tut mir leid, es ist mir zu gefährlich, Dir länger Karteneinsicht "
 "zu geben"
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1356,7 +1356,7 @@ msgstr ""
 "*%s (KI)* Sei gegrüßt, ehrenwerter Verbündeter, wir zählen auf Dich, unseren "
 "Feind %s zu vernichten."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1366,7 +1366,7 @@ msgstr ""
 "keinen Krieg gegen unseren Feind %s. Warum müssen wir Dich an Deine "
 "Versprechen erinnern?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1377,7 +1377,7 @@ msgstr ""
 "und immer noch bist Du im Frieden mit unserem Todfeind %s! Das ist "
 "unakzeptabel, unsere Allianz ist beendet!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1386,14 +1386,14 @@ msgstr ""
 "*%s (KI)* Sei gegrüßt, Freund, dürfen wir vorschlagen, unsere Anstrengungen "
 "zu bündeln, und eine Allianz zu bilden?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "*%s (KI)* Sei gegrüßt, Nachbar, dürfen wir friedlichere Beziehungen "
 "vorschlagen?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1402,7 +1402,7 @@ msgstr ""
 "*%s (KI)* Wir sind des andauernden Blutvergießens müde. Dürfen wir eine "
 "Einstellung der Feindseligkeiten vorschlagen?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1413,58 +1413,63 @@ msgstr ""
 "werden!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, c-format
 msgid "Auth option \"%s\":"
 msgstr "Authentifizierungsoption '%s':"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr " nicht in der Konfigurationsdatei (benutze Standard)"
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr " (Standardwert)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr " (Konfigurationsdatei)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr " (Konsole)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr "Unzulässiger Wert für den Auth-Port: '%s'"
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr ""
 "Konfigurationsdatei für Authentifizierung: Dateiname '%s' ist nicht erlaubt!"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Kann Konfigurationsdatei '%s' für Authentifizierung nicht laden!"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr "Achtung, der Name '%s' ist vergeben, Gast in '%s' umbenannt."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Tut mir leid, auf diesem Server sind keine Gäste zugelassen."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s wurde abgewiesen: keine Gäste zugelassen."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1473,7 +1478,7 @@ msgstr ""
 "Fehler beim Lesen der Spielerdatenbank, Verbindung als Gast '%s' "
 "eingerichtet."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1481,43 +1486,43 @@ msgstr ""
 "Fehler beim Lesen der Spielerdatenbank, und Gäste sind nicht zugelassen. Tut "
 "mir leid."
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s wurde abgewiesen: Datenbankfehler und Gäste nicht erlaubt."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Paßwort für %s eingeben:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Neues Paßwort eingeben (und merken)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 "Tut mir leid, auf diesem Server sind nur bereits registrierte Spieler "
 "zugelassen."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s wurde abgewiesen: Nur registrierte Spieler erlaubt."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Tut mit leid, zu viele Versuche..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 "%s wurde abgewiesen: Zu viele fehlgeschlagene Paßwortüberprüfungen für neuen "
 "Spieler."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1525,32 +1530,32 @@ msgstr ""
 "Achtung: Fehler beim Schreiben der Datenbank. Spielen ohne Statistik ist "
 "möglich."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s abgewiesen: zu viele falsche Paßworteingaben."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Dein Paßwort ist falsch. Versuche es nochmals."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Tut mir leid, deine Verbindungszeit ist abgelaufen..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s wurde abgewiesen: Verbindungszeitablauf bei der Paßworteingabe."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 "Dein Paßwort ist zu kurz, mindestens %d Zeichen erforderlich. Versuche es "
 "nochmals."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2355,19 +2360,18 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Ein Spieler mit Zugangsberechtigung Info, der einen Befehl der Kontrollebene "
 "gibt, leitet damit eine Abstimmung ein. Jeder Spieler kann dann seine Stimme "
 "abgeben, indem er '/vote', gefolgt von 'yes' oder 'no', wahlweise gefolgt "
 "von einer Abstimmungsnummer, eingibt. Ohne Abstimmungsnummer bezieht sich "
-"die Stimmabgabe immer auf die letzte Abstimmung. Die Abstimmung dauert bis "
-"zum Ablauf einer vollen Runde oder bis ein klares Votum (mehr als 50%) "
-"erreicht ist."
+"die Stimmabgabe immer auf die letzte Abstimmung. Jeder Spieler kann zur "
+"gleichen Zeit nur eine Abstimmung einleiten. Die Abstimmung dauert bis zum "
+"Ablauf einer vollen Runde oder bis ein klares Votum (mehr als 50%) erreicht "
+"ist."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2375,11 +2379,11 @@ msgstr ""
 "debug [ player <Spieler> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<Spieler> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Fehlersuche für KI für ein Element ein- oder ausschalten."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2387,23 +2391,23 @@ msgstr ""
 "Gibt Informationen zur KI-Fehlersuche für das gegebene Spielelement aus und "
 "schaltet die fortlaufende Ausgabe ein oder aus."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <Option> <Wert>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Serveroption einstellen."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <Spieler> [Team]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Spielerzugehörigkeit zu einem Team"
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2416,15 +2420,15 @@ msgstr ""
 "Spielern, die Ansichten und Botschaften teilen und zusammen für einen "
 "Teamsieg kämpfen. Die Punkte werden aufgeteilt."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <Verzeichnis>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Neues Regelverzeichnis oder Modpack wählen."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2433,15 +2437,15 @@ msgstr ""
 "Argumente aufgerufen, wird der derzeitige Regelsatz angezeigt."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <Text>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Metaserver-Informationszeile setzen"
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2455,19 +2459,19 @@ msgstr ""
 "Informationszeilen verwendet, wenn sie verfügbar ist."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <Patch Info>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Patch-Informationen des Metaservers setzen"
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Verbindung zum Metaserver."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2478,33 +2482,33 @@ msgstr ""
 "'metaconnection up' oder 'metac u' stellt die Verbindung zum Metaserver her"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "Metaserver <Adresse>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Adresse (URL) des Metaservers einstellen."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <Spieler>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Umschalten zwischen menschlichem und KI-Spieler."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [Verbindungsname] <Spieler>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Den Platz eines Spielers im Spiel einnehmen."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2519,15 +2523,15 @@ msgstr ""
 "Verbindung noch keinen Spieler kontrolliert, wird ein neuer Spieler erzeugt."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [Verbindungsname] [Spieler]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Beobachten des Spiels oder eines Spielers."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2542,15 +2546,15 @@ msgstr ""
 "beobachtet die Verbindung das Spiel global."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <Verbindungsname>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "Verbindung zu Spieler lösen."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2560,20 +2564,20 @@ msgstr ""
 "<Spieler> erlaubt"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <Spieler>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "KI-Spieler erzeugen"
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "'create' kann nur vor Spielbeginn verwendet werden."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2581,16 +2585,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Abwesenheitsmodus. Die KI hält dir den Rücken frei."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "Die KI regiert deine Nation, ändert aber nur sehr wenig."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2598,11 +2602,11 @@ msgstr ""
 "novice\n"
 "novice <Spieler>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Einen oder alle KI-Spieler auf 'sehr leichte' Spielstärke einstellen."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2613,7 +2617,7 @@ msgstr ""
 "Spieler eingestellt."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2621,11 +2625,11 @@ msgstr ""
 "easy\n"
 "easy <Spieler>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Einen oder alle KI-Spieler auf 'einfache' Spielstärke einstellen."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2636,7 +2640,7 @@ msgstr ""
 "KI-Spieler eingestellt."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2644,11 +2648,11 @@ msgstr ""
 "normal\n"
 "normal <Spieler>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Einen oder alle KI-Spieler auf 'normale' Spielstärke einstellen."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2659,7 +2663,7 @@ msgstr ""
 "KI-Spieler eingestellt."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2667,11 +2671,11 @@ msgstr ""
 "hard\n"
 "hard <Spieler>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Einen oder alle KI-Spieler auf 'schwere' Spielstärke einstellen."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2682,7 +2686,7 @@ msgstr ""
 "KI-Spieler eingestellt."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2690,12 +2694,12 @@ msgstr ""
 "experimental\n"
 "experimental <Spieler>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr ""
 "Einen oder alle KI-Spieler auf 'experimentelle' Spielstärke einstellen."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2708,7 +2712,7 @@ msgstr ""
 "NEUEM KI-CODE! Auf normalen Servern hat diese Option keine Auswirkungen."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2722,11 +2726,11 @@ msgstr ""
 "cmdlevel <Zugriffsberechtigung> first\n"
 "cmdlevel <Zugriffsberechtigung> <Verbindungsname>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Abfrage bzw. Setzen der Zugriffsberechtigung"
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2766,20 +2770,20 @@ msgstr ""
 "Um Mißbrauch zu verhindern, gelten Zugangsberechtigungen nur bis zum Ende\n"
 "einer Verbindung."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "Übernehme die Rolle des Spielleiters mit erhöhten Rechten."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <Zug> <Zugzahl> <Wert> <Faktor>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "siehe 'help timeoutincrease'"
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2790,24 +2794,24 @@ msgstr ""
 "der Option 'timeout' benutzt. Die Standardwerte sind 0 0 0 1."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Beendet das Spiel sofort mit einem Unentschieden."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "surrender"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Spiel aufgeben."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2816,15 +2820,15 @@ msgstr ""
 "auf einen Spieler (oder ein Team) ausgeschieden sind, endet das Spiel."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <Spieler>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Spieler vollständig aus dem Spiel entfernen"
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2833,7 +2837,7 @@ msgstr ""
 "einschließlich aller Städte und Einheiten. Vorsicht!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2841,11 +2845,11 @@ msgstr ""
 "save\n"
 "save <Dateiname>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Spiel speichern"
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2862,7 +2866,7 @@ msgstr ""
 "auf und gibt nachdem alle Mitspieler bereit sind, 'start' ein."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2870,11 +2874,11 @@ msgstr ""
 "load\n"
 "load <Dateiname>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Spieldatei laden."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2883,28 +2887,28 @@ msgstr ""
 "Regelsatz und Serveroptionen) gehen dabei verloren.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <Dateiname>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Servereinstellungen aus Datei übernehmen"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <Dateiname>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Servereinstellungen als Datei speichern"
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Serverausgabe ändern: 'RFC-Stl' oder 'Standard-Stil'"
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Gibt die ID des Servers aus."
 
@@ -3440,29 +3444,38 @@ msgstr ""
 "%s hat durch die Anstiftung einer Revolte in %s eine diplomatische Krise "
 "verursacht."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "Marineeinheiten sind als Starteinheiten noch nicht möglich, niemand erhält %"
 "s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Jahr: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Die zulässige Rundenzeit hat das Maximum überschritten, sie wird auf den "
 "Maximalwert gesetzt."
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Die zulässige Rundenzeit ist negativ, sie wird auf Null gesetzt."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr "Kann temporäres Verzeichnis für das GGZ-Spiel nicht anlegen.\n"
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr "Kann nicht in das temporäre Verzeichnis %s auf dem Server wechseln.\n"
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Nur der GGZ-Client darf civclient im GGZ-Modus benutzen!\n"
 
@@ -3505,11 +3518,11 @@ msgstr "Es gibt keine Verbindung namens %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Es gibt keine(n) Spieler / Verbindung namens %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Es ist zu globaler Erwärmung gekommen!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
@@ -3517,17 +3530,17 @@ msgstr ""
 "Küstengebiete wurden überflutet und große Teile des Graslands sind zu Wüsten "
 "geworden."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Es ist zu einem nuklearen Winter gekommen!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Feuchtgebiete sind ausgetrocknet und große Teile des Graslands sind zu "
 "Tundra geworden."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3536,7 +3549,7 @@ msgstr ""
 "Als die Entwicklung der Eisenbahn bekannt gegeben wird, fassen\n"
 "       die Arbeiter neuen Mut. Spontan statten sie alle Städte damit aus."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3546,12 +3559,12 @@ msgstr ""
 "Wissenschaftler.\n"
 "       Spontan haben sie alle Städte damit ausgestattet."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Deine %s wurde wegen Veränderung des Geländes verschoben."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Deine %s wurde wegen Veränderung des Geländes aufgelöst."
@@ -3612,27 +3625,27 @@ msgstr "Revolution: Rückkehr zur Anarchie."
 msgid "You should choose a new government from the government menu."
 msgstr "Bitte wählen Sie eine neue Regierung im Menü Regierung."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Die Steuerquote übersteigt die Höchstgrenze für %s; angepaßt."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Die Forschungsquote übersteigt die Höchstgrenze für %s; angepaßt."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Die Luxusquote übersteigt die Höchstgrenze für %s; angepaßt."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s läßt uns nicht mehr in die Karte sehen!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3641,7 +3654,7 @@ msgstr ""
 "Der Senat erlaubt nicht den Bruch des Paktes mit den %s. Du mußt entweder "
 "den Senat auflösen oder auf einen passenderen Moment warten."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
@@ -3649,7 +3662,7 @@ msgstr ""
 "Aufgrund der ständigen Provokationen durch die %s stimmt der Senat der "
 "Vorlage zu."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3658,12 +3671,12 @@ msgstr ""
 "Der Senat weigert sich den Pakt mit den %s zu brechen, aber du hast keine "
 "Schwierigkeiten, einen neuen Senat zu finden."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Die %s und die %s haben jetzt %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3672,7 +3685,7 @@ msgstr ""
 "Die %s haben das Abkommen gekündigt! Zwischen den %s und den %s herrscht nun "
 "%s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
@@ -3680,7 +3693,7 @@ msgstr ""
 "%s hat Ihren Alliierten %s angegriffen! Sie beenden ihre Allianz mit dem "
 "Angreifer!"
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3689,26 +3702,26 @@ msgstr ""
 "Ihr Teampartner %s hat den %s den Krieg erklärt. Sie sind verpflichtet, Ihre "
 "Allianz mit %s zu beenden."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Spieler %s wird entfernt."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Sie wurden aus dem Spiel entfernt."
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s wurde aus dem Spiel entfernt."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Die %s entdeckt. Ihr Herrscher ist %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3716,17 +3729,17 @@ msgstr ""
 "%s und %s treffen aufeinander und beginnen sofort einen Krieg. Du beendest  "
 "deine Allianz mit beiden."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Bürgerkrieg der %s ist nicht möglich - zu viele Spieler"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Bürgerkrieg der %s ist nicht möglich - keine Nationen verfügbar"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3735,12 +3748,12 @@ msgstr ""
 "Die Nation wird vom Bürgerkrieg gespalten. %s ist der Anführer der "
 "revoltierenden Provinzen."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s erklärt ihre Loyalität zu %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3977,21 +3990,21 @@ msgstr "."
 msgid "th"
 msgstr "."
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Der Optionsstring zur 'Lage der Nation' enthält ungültige Einträge. Nähere "
 "Informationen sind mit 'help demography' erhältlich."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Bericht zur Lage der Nation:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Der Bericht zur Lage der Nation ist leider nicht verfügbar."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "Die %s der %s (%s)"
@@ -4002,11 +4015,11 @@ msgstr "Die %s der %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Could not find a readable \"%s.%s\" ruleset file."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr "Keine Barbarennation im Ruleset, eine wird mindestens benötigt!"
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Lade Regelsätze"
 
@@ -4021,7 +4034,7 @@ msgstr ""
 "daß es sich um eine ältere Sicherung handelt oder daß die Sicherungsdatei "
 "beschädigt ist. Wenn Sie weitermachen wollen: Auf eigene Gefahr!"
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Das abgespeicherte Spiel ist zu alt (< 1.9.0)."
 
@@ -4043,14 +4056,14 @@ msgstr ""
 "Stattdessen wird das Verzeichnis '%s' benutzt."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr "%s ist eine ungültige Nation und wird geändert auf %s."
 
 # CK: TECHNICAL
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4087,7 +4100,7 @@ msgstr "Spiel"
 msgid "Networking"
 msgstr "Netz"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Alle"
@@ -4108,7 +4121,7 @@ msgstr "selten"
 msgid "Changed"
 msgstr "Geändert"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4116,7 +4129,7 @@ msgstr ""
 "Der Optionsstring zu zulässigen Verbindungen enthält ungültige Zeichen. "
 "Nähere Informationen sind mit 'help allowconnect' erhältlich."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4124,7 +4137,7 @@ msgstr ""
 "Der Optionsstring zu den Starteinheiten enthält ungültige Zeichen. Nähere "
 "Informationen sind mit 'help startunits' erhältlich."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4133,26 +4146,32 @@ msgstr ""
 "Die Zeichenkette für die Starteinheiten enthält keinen Stadtgründer.\n"
 "Hilfe mit 'help startunits'."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr "Das Endjahr kann nicht vor dem aktuellen Jahr liegen."
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "Die Spielerzahl kann im GGZ-Modus nicht geändert werden."
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr ""
 "Es gibt bereits mehr Spieler als angegeben. Der alte Wert bleibt erhalten."
 
-#: server/settings.c:236
+#: server/settings.c:181
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr ""
+"Du bist nicht berechtigt, einen Timeout von weniger als 30 Sekunden "
+"einzustellen."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Kartengröße (mal 1000 Felder)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4162,12 +4181,12 @@ msgstr ""
 "  size = 4 ist eine normale Karte mit 4.000 Feldern (Standard)\n"
 "  size = 20 ist eine riesige Karte mit 20.000 Feldern"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Der Topologie-Index der Karte"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4236,11 +4255,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Art der Kartengenerierung"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4259,11 +4278,11 @@ msgstr ""
 "Die Zahlen in [] geben die Standardmethode zur Auswahl der Startpositionen "
 "an. Diese kann mit der \"startpos\" Option geändert werden."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Auswahl der Startpositionen"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4284,40 +4303,40 @@ msgstr ""
 "Hinweis: Der Kartengenerator versucht, die richtige Anzahl von Kontinenten "
 "zu erzeugen."
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "1x1-Inseln"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = Es gibt keine 1x1-Inseln; 1 = Es kann 1x1-Inseln geben"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Pole sind Kontinente"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = Kontinente können die Pole beinhalten; 1 = Die Pole sind eigene "
 "Kontinente"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Die Landkarte ist gleichmäßig warm"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr ""
 "Die Karte besitzt kalte (Pole) und warme (Äquator) Zonen, oder die "
 "Temperatur ist überall gleich mild:  0 = erdähnlicher Planet; 1 = "
 "gleichmäßig warmer Planet "
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Mittlere Temperatur des Planeten"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4349,11 +4368,11 @@ msgstr ""
 "0 bedeutet einen sehr kalten Planeten mit ausgedehnten Polarzonen und ohne "
 "Tropen."
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Prozentualer Anteil von Land auf der Karte"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
@@ -4361,11 +4380,11 @@ msgstr ""
 "Diese Option gibt den ungefähren Prozentsatz von Landfeldern auf der Karte "
 "an."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Anzahl der Hügel/Berge"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4373,11 +4392,11 @@ msgstr ""
 "Kleine Werte erzeugen mehr flaches Land, höhere Werte ergeben mehr Hügel und "
 "Berge."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Anteil der feuchten Landesteile"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4385,11 +4404,11 @@ msgstr ""
 "Kleinere Werte bedeuten viel trockenes, wüstenähnliches Land; größere Werte "
 "ergeben eine feuchtere Karte mit vielen Sümpfen, Dschungel und Flüssen."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Zufallsbasiszahl für die Kartenerzeugung"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4398,22 +4417,22 @@ msgstr ""
 "Gleiche Basiszahlen führen zu gleichen Karten; bei 0 (der Standardwert)wird "
 "die Zeit als Basis genommen, um zufällige Karten zu erzeugen."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Zufallsbasiszahl für das Spiel"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr "Bei 0 wird aus der Zeit eine Zufallszahl abgeleitet."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Anzahl der besonderen Ressourcen"
 
 # ? Original scheint fehlerhaft, siehe PR#11053
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4421,11 +4440,11 @@ msgstr ""
 "Besondere Ressourcenfelder verbessern den Geländetyp, auf dem sie liegen. "
 "Der Wert gibt die Anzahl der Ressourcen pro 1000 Felder an."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Anzahl der Hütten (Dörfer kleinerer Stämme)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4433,23 +4452,23 @@ msgstr ""
 "Diese Einstellung gibt die genaue Zahl von Hütten auf der Karte an. Hütten "
 "sind kleine Stammesdörfer, die von Einheiten untersucht werden können."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Mindestanzahl der Spieler"
 
-#: server/settings.c:419
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
-"Mindestanzahl der Spieler (einschließlich KI-Spielern), um ein Spiel zu "
+"Mindestanzahl der Spieler (verbundene, menschliche Spieler), um ein Spiel zu "
 "beginnen."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Höchstzahl der Spieler"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4459,11 +4478,11 @@ msgstr ""
 "Zahl während der Vorbereitungsphase erreicht wird, werden weitere "
 "Verbindungsversuche abgewiesen."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Gesamtzahl der Spieler (einschließlich KI-Spieler)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4471,11 +4490,11 @@ msgstr ""
 "Bei positiver Angabe werden automatisch KI-Spieler erzeugt oder entfernt, um "
 "die Gesamtzahl der Spieler auf diesem Wert zu halten."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Liste der Einheiten zu Spielbeginn"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4502,28 +4521,28 @@ msgstr ""
 "    a   = Schneller Angreifer (z.B. Reiter)\n"
 "    A   = Starker Angreifer (z.B. Katapult)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Fläche zur Verteilung der Anfangseinheiten"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "Dies ist der Radius, in dem die Einheiten zu Spielbeginn verteilt werden."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Goldstücke bei Spielbeginn"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Die Menge Gold, die jeder Spieler zu Beginn erhält."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Anzahl der Fortschritte bei Spielbeginn"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4535,11 +4554,11 @@ msgstr ""
 "Wert für techlevel kann das Erforschen der nachfolgenden Technologien sehr "
 "teuer machen."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Prozentfaktor für Forschungskosten"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4549,11 +4568,11 @@ msgstr ""
 "mit diesem Prozentwert multipliziert. Die Basiskosten für Fortschritte "
 "ergeben sich aus dem Regelsatz und anderen Spieleinstellungen."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Abzug (%) bei Forschungsänderung"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4563,11 +4582,11 @@ msgstr ""
 "Punkten verloren. Unmittelbar nach Abschluß eines Forschungsprojektes gehen "
 "keine Punkte verloren."
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Abzug für Forschungsergebnisse oder Gold aus Abkommen"
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4579,11 +4598,11 @@ msgstr ""
 "negatives Forschungskonto ist möglich. Gilt ebenfalls für Gold-Transfers "
 "mittels Abkommen."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Abzug für erbeutete Forschungsergebnisse"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4593,11 +4612,11 @@ msgstr ""
 "wird dieser Prozentsatz der Forschungspunkte in Abzug gebracht. Ein "
 "negatives Forschungskonto ist möglich."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Abzug für 'kostenlose' Entwicklungen"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4609,11 +4628,11 @@ msgstr ""
 "dieser Prozentsatz der Forschungspunkte in Abzug gebracht. Ein negatives "
 "Forschungskonto ist möglich."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Benötigte Nahrung für Städtewachstum"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4623,11 +4642,11 @@ msgstr ""
 "wird mit einem von den Regeln abhängigen Faktor multipliziert und hängt von "
 "der Stadtgröße ab."
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr "Nahrungsverluste in Prozent, wenn eine Stadterweiterung benötigt wird."
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4637,11 +4656,11 @@ msgstr ""
 "Abwassersystems) nicht kann, geht dieser Prozentsatz (oder die Hälfte davon, "
 "falls ein Kornspeicher vorhanden ist) verloren."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Prozentfaktor für Produktionskosten"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4649,11 +4668,11 @@ msgstr ""
 "Legt fest, wie schnell Einheiten und Gebäude produziert werden können. Die "
 "Basiskosten werden mit diesem Prozentwert multipliziert."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Mindestgröße für volle Handelspunkte"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4665,11 +4684,11 @@ msgstr ""
 "oder gleich 'notradesize' sind und reduziert sich stufenweise bis auf 0 % "
 "bei 'fulltradesize'."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Bis zu dieser Stadtgröße keine Handelspunkte"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4679,11 +4698,11 @@ msgstr ""
 "Handelspunkte steigen stufenweise für Städte, die größer als 'notradesize' "
 "und kleiner als 'fulltradesize' sind."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Anzahl der zufriedenen Bürger"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4691,11 +4710,11 @@ msgstr ""
 "Die Anzahl der Bürger einer Stadt, die (vor der Berücksichtigung von "
 "Modifikationen) zufrieden sind. Siehe auch 'cityfactor'."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Gesteigerte Unzufriedenheit"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4706,11 +4725,11 @@ msgstr ""
 "zufriedenen Bürger' um 1 reduziert. Dieser Wert bezieht sich auf Demokratie; "
 "bei anderen Staatsformen tritt dieser Effekt früher ein."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Mindestentfernung zwischen Städten"
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4722,11 +4741,11 @@ msgstr ""
 "zwischen zwei Städten mindestens zwei leere Felder liegen. Wenn dieser Wert "
 "0 ist (Standard), wird der Wert durch das verwendete Ruleset bestimmt."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Verzögerung des Begeisterungseffekts"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4734,11 +4753,11 @@ msgstr ""
 "Hier wird die Rundenzahl festgelegt, nach der Begeisterung zum Wachstum "
 "einer Stadt führt. Setzt man 'n', wächst die Stadt nach n+1 Runden."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Wahrscheinlichkeit der Gebäudezerstörung"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4746,11 +4765,11 @@ msgstr ""
 "Wenn eine Stadt erobert wird, besteht für jede Stadterweiterung die "
 "angegebene Chance (in %), zerstört zu werden."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Wahrscheinlichkeit, ein angegriffenes Feld zu besetzen"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4764,11 +4783,11 @@ msgstr ""
 "und 100 lassen siegreiche Einheiten mit der gesetzten Wahrscheinlichkeit das "
 "angegriffene Feld besetzen."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Automatisches Angreifen (serverseitig)"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4776,11 +4795,11 @@ msgstr ""
 "Einheiten mit Bewegungspunkten greifen automatisch anrückende feindliche "
 "Einheiten an."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Verminderung der Bevölkerung nach einem Angriff"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4797,11 +4816,11 @@ msgstr ""
 "  8 = Luftwaffeneinheiten\n"
 "Die Auswahl erfolgt durch Eingabe der Summe."
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Radius der nationalen Grenzen"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4812,12 +4831,12 @@ msgstr ""
 "und für Felder, die im Umkreis von mehreren Städten verschiedener Nationen "
 "liegen."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr ""
 "Einheiten innerhalb der eigenen Grenzen führen nicht zu Unzufriedenheit."
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4825,11 +4844,11 @@ msgstr ""
 "Falls gesetzt, erzeugen Einheiten, die sich innerhalb der eigenen Grenzen "
 "befinden, keine Unzufriedenheit."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Diplomatie unter den Spielern"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4843,11 +4862,11 @@ msgstr ""
 "3 - Diplomatie nur zwischen Teams.\n"
 "4 - Diplomatie nicht möglich."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Erlaubte Städtenamen"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4871,11 +4890,11 @@ msgstr ""
 "3 - wie 2, zusätzlich dürfen keine Standardnamen anderer Nationen verwendet "
 "werden."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Häufigkeit von Barbaren"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4889,19 +4908,19 @@ msgstr ""
 "3 - häufige Barbarenaufstände\n"
 "4 - Barbaren sind wütende Horden"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Startjahr für Barbaren"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbaren treten erst ab diesem Jahr auf."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Dauer der Revolution in Runden"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4910,11 +4929,11 @@ msgstr ""
 "angegebenen Anzahl Runden. Der Wert Null gibt eine zufällige Dauer von 1-6 "
 "Runden."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Nebel des Krieges"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4924,11 +4943,11 @@ msgstr ""
 "eigener Einheiten angezeigt werden. Auch neue Städte oder "
 "Landschaftsänderungen auf unbeobachteten Feldern bleiben unbemerkt."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Grundwahrscheinlichkeit für den Erfolg von Diplomaten und Spionen."
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4938,19 +4957,19 @@ msgstr ""
 "zurückzukehren, und die Grundwahrscheinlichkeit für den Erfolg von "
 "Diplomaten und Spionen."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Weltraumrennen erlaubt?"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "1 erlaubt den Raumschiffbau."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Mindestanzahl der Städte für Bürgerkrieg"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4960,11 +4979,11 @@ msgstr ""
 "hat und seine Hauptstadt erobert wird. Setzt man diesen Wert auf das "
 "Maximum, gibt es keine Bürgerkriege."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Zeit für Verhandlungen nach Spielerkontakt (Runden)"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4974,11 +4993,11 @@ msgstr ""
 "hatten, eine Konferenz einberufen. Bei Null ist diese Möglichkeit "
 "abgeschaltet."
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Ewiger Palast"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4989,22 +5008,22 @@ msgstr ""
 "ausgewählten Stadt kostenfrei ein neuer errichtet, auch wenn die "
 "technologischen Voraussetzungen dafür nicht vorhanden sind."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Geländebezogene Städtenamen"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr ""
 "Falls aktiviert, werden die Standardnamen abhängig von der Umgebung vergeben."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Spieler die frei zu übernehmen sind"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -5068,11 +5087,11 @@ msgstr ""
 "anderen Spieler kontrolliert wird.\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Automatischer KI-Status"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5081,36 +5100,40 @@ msgstr ""
 "aktiviert und bei Wiederherstellung der Verbindung der KI-Status automatisch "
 "deaktiviert wird."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Letztes Spieljahr"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Das Spiel endet mit Ablauf des angegebenen Jahres."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Maximale Rundendauer (in Sekunden)"
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Nach Ablauf dieser Zeit endet die Runde unabhängig davon, ob alle Spieler "
 "fertig sind. 0 deaktiviert diese Option. Bei Servern im DEBUG Modus wird mit "
-"-1 ein 'vollautomatisches' Testspiel gestartet. In Verbindung mit dem Befehl "
-"'timeoutincrease' kann der Timer dynamisch benutzt werden."
+"-1 ein 'vollautomatisches' Testspiel gestartet. Timeouts von weniger als 30 "
+"Sekunden können nur mit der Zugriffsberechtigung 'hack' eingestellt werden. "
+"In Verbindung mit dem Befehl 'timeoutincrease' kann der Timer dynamisch "
+"benutzt werden."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 "Wartezeit bis Rundenende nach dem letzten Zug eines Spielers (Sekunden)"
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
@@ -5118,11 +5141,11 @@ msgstr ""
 "Jedesmal, wenn eine Einheit in Sichtweite des Gegners zieht, wird der "
 "Zeitablauf der Runde auf mindestens diesen Wert gesetzt."
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Alle Spieler ziehen gleichzeitig"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5130,11 +5153,11 @@ msgstr ""
 "Falls gesetzt, können alle Spieler gleichzeitig ziehen; andernfalls ziehen "
 "die Spieler nacheinander."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Maximale TCP-Blockierung (Sekunden)"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5144,11 +5167,11 @@ msgstr ""
 "diese geschlossen. 0 bedeutet, es gibt nur das Zeitlimit aus der TCP-"
 "Protokoll-Vereinbarung."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Leerung der TCP-Puffer (Sekunden)"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5157,11 +5180,11 @@ msgstr ""
 "Der Server wartet bis zu diesem Wert auf die Freigabe der TCP-Puffer, falls "
 "die Verbindung stockt. Bei 0 wartet der Server nicht."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "PING-Intervall (Sekunden)"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5169,22 +5192,22 @@ msgstr ""
 "Der Server fordert am Ende dieser Zeitspanne (in Sek.) ein PING von den "
 "Clients."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Inaktiven Client trennen (Sekunden)"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Falls ein Client innerhalb dieser Zeit nicht auf ein PING reagiert, wird die "
 "Verbindung zu ihm getrennt."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Rundensperre"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5193,11 +5216,11 @@ msgstr ""
 "alle Spieler ihren Zug beendet haben, einschließlich der Spieler, zu denen "
 "der Server keine Verbindung hat."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Spielzüge mit vorgegebener Zeit"
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
@@ -5206,11 +5229,11 @@ msgstr ""
 "die vorgegebene Zeit abgelaufen ist, selbst wenn alle Spieler bereits auf "
 "'Fertig' gedrückt haben."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Bericht zur Lage der Nation"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5249,11 +5272,11 @@ msgstr ""
 "    b = Spalte 'Beste Nation' anzeigen\n"
 "(Groß- und Kleinschreibung muß beachtet werden, die Reihenfolge ist egal.)"
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Automatisch speichern (Runden)"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5261,11 +5284,11 @@ msgstr ""
 "Alle N Runden wird das Spiel automatisch gespeichert. 0 schaltet diese "
 "Option ab."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Dateikomprimierung"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5275,11 +5298,11 @@ msgstr ""
 "Komprimierung. Falls der Maximalwert 0 ist, unterstützt der Server keine "
 "Komprimierung."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Namenvorsatz für das automatische Speichern"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5287,11 +5310,11 @@ msgstr ""
 "Automatisch gespeicherte Spiele heißen '<Präfix><Jahr>.sav'. Mit dieser "
 "Option kann das <Präfix> festgelegt werden."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Spielerstatistiken"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5306,7 +5329,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Server cannot read standard input. Ignoring input."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Server: Die Adresse [%s:%d] ist ungültig."
@@ -5444,93 +5467,93 @@ msgstr "Konnte das Spiel nicht in der Datei '%s' speichern"
 msgid "Game saved as %s"
 msgstr "Spiel gespeichert als '%s'"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Das Spiel hat bereits angefangen."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%s hat seit Spielbeginn nicht mehr die Kontrollgewalt. Bitte von jetzt an "
 "Abstimmungen verwenden."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Spiel begonnen."
 
 # EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "request for unknown report (type %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Warnung: Client %s ist zu alt und wurde abgewiesen"
 
 # EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Got a packet of type %d from a dead or observer player"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Es muß ein Name gewählt werden."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Diese Nation ist bereits vergeben."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr ""
 "Ein anderer Spieler nimmt bereits unter dem Namen '%s' am Spiel teil. Bitte "
 "wählen Sie einen anderen Namen."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Bitte wählen Sie einen Namen, der nur ASCII-Zeichen enthält."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "Die Nation der %s ist in diesem Szenario nicht verfügbar."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "Die Nation der %s ist bereits vergeben."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s ist der %se Herrscher %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Warten auf Spielstart: %d von %d Spielern sind bereit zu starten."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s ist als KI-Spieler mit dem Level '%s' dazu gekommen."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Spieler %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s beherrscht die %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
@@ -5538,16 +5561,16 @@ msgstr ""
 "Unterstützung für Spieler-Authentifizierung verfügbar, wird aber nicht "
 "verwendet."
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Sende Informationen an den Metaserver [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Das Spiel ist vorbei..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Warte auf Spieler..."
 
@@ -5572,7 +5595,7 @@ msgstr "(mehrdeutig)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5751,7 +5774,7 @@ msgstr "Spieler können nach Spielstart nicht mehr entfernt werden."
 msgid "Removed player %s from the game."
 msgstr "Spieler %s aus dem Spiel entfernt."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Der Name \"%s\" ist aus Sicherheitsgründen nicht erlaubt."
@@ -5833,200 +5856,200 @@ msgstr ""
 "Die Zugangsberechtigung kann nicht auf '%s' erhöht werden,\n"
 "da die eigene Zugangsberechtigung nur '%s' ist."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "%2$s erhält Zugangsberechtigung '%1$s'."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "Zugangsberechtigung für %2$s konnte nicht auf '%1$s' gesetzt werden."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Neue Spieler erhalten die Zugangsberechtigung '%s'."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "Zugangsberechtigung für den ersten Spieler: %s"
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "Es ist sinnlos, den 'first'-Befehl über die Serverkonsole zu erteilen."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Sie haben bereits die Zugangsberechtigung '%s' oder besser."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Jemand anders ist bereits Spielleiter."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "Verbindung %s hat sich den Spielleiter-Status gewählt."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "%d ist unzulässig."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Syntax: timeoutincrease <n1> <n2> <n3> <n4>"
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Der dynamische Timer wurde auf %d %d %d %d gestellt."
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Option:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "veränderbar"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fest"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Wert: %d, Standard: %d, zulässig: 0 oder 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Wert: %d, Minimum: %d, Standard: %d, Maximum: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Wert: '%s', Standard: '%s'"
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Erläuterungen sind für folgende Serveroptionen verfügbar:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Dafür gibt es noch keine Erklärung."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Mehrdeutige Optionsbezeichnung."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Server Operator: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Der Spieler '%s' hat jetzt die KI-Spielstärke '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s wird nicht von der KI kontrolliert."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Die standardmäßige KI-Spielstärke ist '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Dieser Befehl kann nur im Client gegeben werden."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Syntax: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Der Befehl 'away' kann nur von Spielern gegeben werden."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s wurde auf Abwesenheitsmodus geschaltet."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s ist zum Spiel zurückgekehrt."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Keine Berechtigung, Einstellung '%s' einzusehen!"
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Unbekannte Option '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Alle Optionen, die vom Standardwert abweichen"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Alle Optionen"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Wichtige Optionen"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Interessante Optionen"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Seltene Optionen"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ heißt, daß diese Einstellung geändert werden kann"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= heißt, daß dies die Standardeinstellung ist"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s Wert    (min,max)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Option"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "Beschreibung"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -6034,39 +6057,39 @@ msgstr ""
 "Weitere Optionen mit 'show situational' oder 'show rare'\n"
 "Geänderte Optionen mit 'show changed'."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Nach Spielbeginn können Teams nicht mehr geändert werden."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Falscher Parameter. Anwendung: team <Spieler> <Team>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 "Ein Team %s gibt es nicht. Bitte gib einen gültigen Teamnamen oder -nummer "
 "an."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Barbaren können kein Team bilden."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Spieler %s gehört zu Team %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Befehl unvollständig. Anwendung: vote yes|no [Wahlnummer]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Beobachter können nicht abstimmen."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -6074,39 +6097,39 @@ msgstr ""
 "Es kann nur in einem laufenden Spiel abgestimmt werden. Benutze den Befehl "
 "'first', um Spielleiter zu werden, falls es noch keinen gibt."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Abstimmung %d über den Befehl '%s': %d dafür, %d dagegen"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Keine laufenden Abstimmungen."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Die letzte Abstimmung war ungültig."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Wert muß ganzzahlig sein."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Keine Abstimmung mit der Nummer %d vorhanden."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Sie haben für '%s' gestimmt."
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Sie haben gegen '%s' gestimmt."
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6114,430 +6137,460 @@ msgstr ""
 "Fehlende Parameter. Anwendung: debug diplomacy <Spieler> | city <x> <y> | "
 "units <x> <y> | unit <id> | tech <Spieler> | timing | info."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Befehl kann nur nach Spielbeginn verwendet werden."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "Fehlersuche für Diplomatie der %s ausgeschaltet."
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "Fehlersuche für Diplomatie der %s eingeschaltet."
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "Fehlersuche für Forschung der %s ausgeschaltet."
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "Fehlersuche für Forschung der %s eingeschaltet."
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Werte 2 und 3 müssen ganzzahlig sein."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Falsche Koordinaten."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Keine Stadt an diesen Koordinaten."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "Fehlersuche für %s ausgeschaltet."
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr "Fehlersuche für %se %s ausgeschaltet."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr "Fehlersuche für %se %s eingeschaltet."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Wert 2 muß ganzzahlig sein."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Einheit %d existiert nicht."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Falsche oder fehlende Option. Anwendung: set <Option> <Wert>"
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Keine Berechtigung zur Änderung dieser Einstellung."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Diese Einstellung kann nach Spielstart nicht mehr geändert werden."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Wert muß ganzzahlig sein."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr "Der Parameter %s darf nur die Ziffern 0 und 1 enthalten."
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Unzulässiger Wert (zulässig: 0 oder 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "%s auf %d gesetzt."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr "Der Parameter %s darf nur die Ziffern 0 bis 9 sowie +- enthalten."
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Unzulässiger Wert (Minimum: %d, Maximum: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Unzulässiger Wert. Anwendung: set <Option> <Wert>"
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "%s auf '%s' gesetzt."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Globale Beobachter sind in diesem Spiel nicht erlaubt."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 "Ein globaler Beobachter kann nicht übernommen, sondern nur beobachtet werden."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+msgid "You cannot take a new player at this time."
+msgstr "Das Übernehmen von neuen Spielern ist jetzt nicht möglich."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+"Du kannst keinen neuen Spieler übernehmen, weil die Höchtszahl von %d "
+"Spieler bereits erreicht ist (Option mayplayers)."
+msgstr[1] ""
+"Du kannst keinen neuen Spieler übernehmen, weil die Höchtszahl von %d "
+"Spielern bereits erreicht ist (Option mayplayers)."
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+"Du kannst keinen neuen Spieler übernehmen, weil es keine freien Plätze mehr "
+"gibt."
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Die Beobachtung von Barbaren ist in diesem Spiel nicht möglich."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Das Übernehmen von Barbaren ist in diesem Spiel nicht möglich."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Die Beobachtung gestorbener Spieler ist in diesem Spiel nicht möglich."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Das Übernehmen gestorbener Spieler ist in diesem Spiel nicht möglich."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Die Beobachtung von KI-Spielern ist in diesem Spiel nicht möglich."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Das Übernehmen von KI-Spielern ist in diesem Spiel nicht möglich."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 "Die Beobachtung von menschlichen Spielern ist in diesem Spiel nicht möglich."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 "Das Übernehmen von menschlichen Spielern ist in diesem Spiel nicht möglich."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Beobachten ist in diesem Spiel nicht erlaubt."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Das Ãœbernehmen von Spielern ist in diesem Spiel nicht erlaubt."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 "Das Ãœbernehmen von verbundenen Spielern ist in diesem Spiel nicht erlaubt."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Syntax: observe [Verbindung [Spieler]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Syntax: observe [Spieler]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s kontrolliert %s bereits; beobachten von %s daher sinnlos."
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s beobachtet %s bereits."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s beobachtet bereits."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s beobachtet jetzt den Spieler %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s beobachtet jetzt"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Anwendung: take <Verbindungsname> <Spieler>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Anwendung: take <Spieler>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Anwendung: take [Verbindungsname] <Spieler>"
 
-#: server/stdinhand.c:2951
+#: server/stdinhand.c:3010
 #, c-format
-msgid "%s already controls %s"
+msgid "%s already controls %s."
 msgstr "%s kontrolliert %s bereits."
 
-#: server/stdinhand.c:2965
+#: server/stdinhand.c:3024
 #, c-format
-msgid "There is no free player slot for %s"
+msgid "There is no free player slot for %s."
 msgstr "Kein Spielerplatz mehr frei für %s"
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "Die Verbindung zu Spieler %s wird getrennt."
 
-#: server/stdinhand.c:3076
+#: server/stdinhand.c:3135
 #, c-format
-msgid "%s now controls %s (%s, %s)"
-msgstr "%s hat den Spieler %s (%s, %s) übernommen"
+msgid "%s now controls %s (%s, %s)."
+msgstr "%s hat den Spieler %s (%s, %s) übernommen."
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "barbarisch"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "KI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "menschlich"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Lebend"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Tot"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s konnte nicht mit einem Spieler verbunden werden."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Syntax: detach <Verbindungsname>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Sie können nicht fremde Verbindungen zu Spielern lösen."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s ist mit nicht mit einem Spieler verbunden."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s löst die Verbindung zu %s."
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s beobachtet nicht mehr."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "Löse Verbindung zu %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Anwendung: load <Spielname>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "Solange ein Spiel läuft, kann kein weiteres geladen werden."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "Kann keinen Spielstand oder Szenario mit dem Namen \"%s\" finden."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "Kann Spielstand '%s' nicht laden."
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Derzeitiges Verzeichnis für Regelsätze: '%s'"
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Ruleset-Verzeichnis '%s' nicht gefunden"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Ruleset-Verzeichnis ist bereits '%s'"
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Ruleset-Verzeichnis ist jetzt '%s'"
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Auf Wiedersehen!"
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Keine Berechtigung zur Erteilung von Serverbefehlen."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Warnung: '%s' wurde (obwohl es mehrdeutig ist) als '%s' ausgelegt.\n"
 "         '%shelp' gibt nähere Informationen."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Unbekannter Befehl. '%shelp' gibt nähere Informationen."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Deine Wahl wurde abgeändert."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Neue Abstimmung (Nr. %d) von %s über den Befehl: %s"
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr "Dein neues Votum ('%s') war nicht gültig oder wurde nicht erkannt."
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Keine Berechtigung zur Erteilung dieses Befehls."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "Serverbefehl"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Spiel endete unentschieden."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Spiel wird beendet. Der Server startet neu, wenn sich alle Clients "
 "abgemeldet haben."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Spiel kann nicht beendet werden, da kein Spiel läuft."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s hat das Spiel aufgegeben und kann nicht mehr gewinnen."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Du kannst jetzt nicht aufgeben."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
-msgstr "Zu wenige Mitspieler, Spiel wird nicht gestartet."
+#: server/stdinhand.c:3883
+msgid "Not enough human players, game will not start."
+msgstr "Zu wenige menschliche Mitspieler, Spiel wird nicht gestartet."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+msgid "No players, game will not start."
+msgstr "Keine Mitspieler, Spiel wird nicht gestartet."
+
+#: server/stdinhand.c:3892
 msgid "Not enough nations for all players, game will not start."
 msgstr "Nicht genug Nationen für alle Spieler, Spiel wird nicht gestartet."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Alle Spieler sind bereit, das Spiel wird gestartet."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "Kann Spiel nicht starten: es wird gewartet, daß alle Spieler die Verbindung "
 "beenden."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Spiel kann nicht gestartet werden: es läuft bereits."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Verbindung zu %s wird beendet."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6575,123 +6628,123 @@ msgstr ""
 "   save   - Spiel speichern\n"
 "   quit   - Server herunterfahren."
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Befehl:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Ãœbersicht: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Zugriff während des Spiels: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Es gibt folgende Serverbefehle:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Argument '%s' des 'help'-Befehls ist mehrdeutig."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Keine Hilfe zu '%s' vorhanden."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Unzulässiges Argument zu 'list': '%s'. Versuchen Sie '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Spieler:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<keine>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "Benutzername %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Tot"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", Schwierigkeitsgrad %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", bereit"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", nicht fertig"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " 1 Verbindung:"
 msgstr[1] " %d Verbindungen:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr " %s von %s (Zugriffsberechtigung %s, %d kB Puffer)"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (Beobachtermodus)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Liste der Teams:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : '%s' : %d Spieler"
 msgstr[1] "%2d : '%s' : %d Spieler"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 Spieler : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Team %s ist leer."
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Liste der Verbindungen zum Server:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<keine Verbindungen>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Liste der verfügbaren Szenarios:"
 
@@ -6768,17 +6821,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Unser Forschungsziel ist %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Du hast %s von den %s gestohlen."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "Die %s haben %s von dir gestohlen!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "Die %s haben %s von den %s gestohlen."
@@ -7306,20 +7359,20 @@ msgstr "Der Versuch, ein Weltwunder in %s zu errichten, mißlang."
 msgid "Your %s has invalid orders."
 msgstr "Befehle für %s sind ungültig."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Große Landfläche - bitte warten..."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Benutze Kartengenerator %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Kartengenerator 3 hat nicht alle großen Inseln erzeugt."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Kartengenerator 3 hat %li Land nicht plaziert."
@@ -7414,120 +7467,121 @@ msgstr ""
 msgid "Cannot find audio file %s"
 msgstr "Cannot find audio file %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX Runden"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d Goldstücke pro Runde"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "1 Runde"
 msgstr[1] "%3d Runden"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "nie"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/Runde"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d Runde"
 msgstr[1] "%s (%d) %d Runden"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Veraltet"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "vorhanden"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Großes Wunder"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Kleines Wunder"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d Gold"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Bürger\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Handelssteuern\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : Handelsroute mit %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : Gebäudeabgaben\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : Bonus von %s (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Müll\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Aufruhr\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Verbrauch\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : ergibt\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Gesamtüberschuß"
@@ -7639,8 +7693,8 @@ msgid "Best defending units"
 msgstr "Bester Verteidiger"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7810,8 +7864,8 @@ msgstr "UV"
 msgid "?cma:Governor"
 msgstr "Bürgermeister"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -8083,19 +8137,19 @@ msgstr ""
 "Versuche als '%3$s' bis zu %5$dmal alle %4$f Sekunden eine Verbindung zu "
 "Server '%1$s' an Port %2$d herzustellen..."
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "Anfänger"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "Leicht"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "Normal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "Fortgeschritten"
 
@@ -8103,31 +8157,31 @@ msgstr "Fortgeschritten"
 msgid "experimental"
 msgstr "Experimentell"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Starte Server..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Konnte den Server nicht starten."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Sie müssen den Server von Hand starten, tut uns leid ..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Konnte Verbindung zum Server nicht herstellen."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Kann vermutlich nicht hier gestartet werden."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Wir kontrollieren den Server (Zugriffsberechtigung 'hack')"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "Kann Server nicht kontrollieren, versuche zu beenden."
 
@@ -8214,27 +8268,27 @@ msgstr "Betrifft nur %s.\n"
 msgid "Requires a minimum size of %d.\n"
 msgstr "Erfordert mindestens die Größe %d.\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Ermöglicht %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Ermöglicht %s (mit %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Flüsse"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Zum Thema %s ist leider keine Hilfe verfügbar.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8245,7 +8299,7 @@ msgstr ""
 "Diese Meldung wurde automatisch erzeugt.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
@@ -8253,79 +8307,79 @@ msgstr ""
 "Erfordert: nichts\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Die Entdeckung von %s wird %s überflüssig machen.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* Ermöglicht allen Spielern mit Kenntnis von %s den Bau von %s.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Ermöglicht %s (mit %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Ermöglicht %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Kann nur gebaut werden, wenn %s in der Stadt vorhanden ist.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Kann nur gebaut werden, wenn die Regierungsform %s ist.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Kann nicht in Städten gebaut werden.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* hat niemals eine Heimatstadt.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Der Verlust dieser Einheit bedeutet den Verlust des Spieles!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Jeder Spieler kann nur eine Einheit dieses Typs besitzen.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Benötigt %d Bürger zur Herstellung.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Kann %d Lufteinheit transportieren und betanken.\n"
 msgstr[1] "* Kann %d Lufteinheiten transportieren und betanken.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Kann %d Raketeneinheit transportieren und betanken.\n"
 msgstr[1] "* Kann %d Raketeneinheiten transportieren und betanken.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Kann 1 Bodeneinheit transportieren.\n"
 msgstr[1] "* Kann %d Bodeneinheiten transportieren.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8334,131 +8388,131 @@ msgstr ""
 "mindestens 9 Felder (in rechtwinkliger Entfernung) von seiner Heimatstadt "
 "entfernt ist.\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Kann beim Bau von Weltwundern helfen (liefert %d Schilder).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Kann nicht aufgelöst werden.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Kann in einer Stadt aufgelöst werden, um die Hälfte der Produktionskosten "
 "zu erhalten.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Kann neue Städte gründen.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 "* Kann einer Stadt %d Bürger hinzufügen, wenn die Stadtgröße %d nicht "
 "überschreitet.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Kann Straßen und Eisenbahnen bauen.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Kann Bergwerke errichten.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Kann Bewässerung anlegen.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Kann Ackerland erzeugen.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Kann Ackerland erzeugen (falls %s bekannt).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 "* Kann Ackerland erzeugen (wenn eine der folgenden Technologien bekannt ist: "
 "%s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Kann befestigte Stellungen bauen.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Kann Festungen errichten (falls %s bekannt).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Kann Festungen errichten (falls eines von %s bekannt).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Kann Umweltverschmutzung beseitigen.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Kann nuklearen Fallout beseitigen.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Kann Geländeveränderungen ausführen.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Kann Fliegerhorste errichten.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Kann sich eingraben, ergibt 50%% Verteidigungsbonus.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Kann brandschatzen, um Infrastruktur zu zerstören.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* Kann sowohl diplomatische als auch Spionagetätigkeiten erledigen.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Kann diplomatische Tätigkeiten erledigen.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Gewinnt jeden Kampf gegen einen Diplomaten.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Ist unbestechlich.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Kann feindliche Lufteinheiten angreifen.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* Unsichtbar, falls nicht direkt neben einer Feindeinheit oder Stadt.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 "* Kann nur Einheiten auf Ozeanfeldern angreifen (keine Landangriffe).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
@@ -8466,40 +8520,40 @@ msgstr ""
 "* Kann gegnerische Städte und Landfelder von Marine-Einheiten aus "
 "angreifen.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Kann von einer befreundeten Stadt aus abspringen (Reichweite: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* 2fache Verteidigung gegen 'berittene' Einheiten.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Wird als 'beritten' gewertet.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Raketeneinheiten zerstören sich beim Angriff.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Ein Angriff beendet die Runde für diese Einheit.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Die Attacke dieser Einheit bewirkt eine nukleare Explosion!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Hat doppelte Feuerkraft beim Angriff auf Städte.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignoriert den Effekt von Stadtmauern.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8509,48 +8563,48 @@ msgstr ""
 "Verteidiger nur beschädigen, nicht töten, sind aber ohne Risiko für den "
 "Angreifer.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* 5fache Verteidigung gegen Raketen und Lufteinheiten.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Ignoriert das Gelände (behandelt alle Felder wie Straßen).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignoriert Kontrollzonen.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* Nicht-militärische Einheit (Kein Angriff; kein Kriegsrecht).\n"
 
 # CK: 'field unit' refers to bombers and rocketry inside of cities
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "* Luftangriffseinheit: min. +1 Unzufriedener in einer Demokratie.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Kann keinen Veteranenstatus erhalten.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Kann durch Training oder Kampf zum Veteran werden.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
 "at sea.\n"
 msgstr "* 50%% Verlustrisiko, falls am Rundenende auf hoher See.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* Die Entdeckung von %s reduziert das Risiko auf 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s reduziert das Risiko auf 12%%.\n"
@@ -8559,15 +8613,15 @@ msgstr "* %s reduziert das Risiko auf 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " oder "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
@@ -8576,12 +8630,12 @@ msgstr[0] ""
 msgstr[1] ""
 "* Einheit muß nach %2$d Runden in einer Stadt oder auf einem %1$s sein.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Für die Erforschung von %s würden %d Punkte benötigt."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8590,94 +8644,94 @@ msgstr ""
 "Die Erforschung von %s erfordert zunächst den Abschluß von %d anderen "
 "Forschungsprojekten. Insgesamt werden %d Punkte benötigt."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Sie können diese Technologie nicht erforschen."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr " Diese Anzahl hängt davon ab, was die anderen Spieler erforschen.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* Der erste Spieler, der %s erforscht, macht sofort eine weitere "
 "Entdeckung.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 "* Reduziert die Gefahr, Schiffe auf hoher See zu verlieren, auf 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 "* Reduziert die Gefahr, Schiffe auf hoher See zu verlieren, auf 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr ""
 "* Vergrößert die durch die Bevölkerung verursachte Umweltverschmutzung\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* %s mit diesem Wissen können Straßen über Flüsse bauen.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* %s mit diesem Wissen können befestigte Stellungen bauen.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* %s mit diesem Wissen können Fliegerhorste bauen.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* %s mit diesem Wissen können Straßen zu Eisenbahnlinien machen.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* %s können bewässertes Land in Ackerland zu verwandeln.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Auf diesem Geländetyp gibt es keine Umweltverschmutzung."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Auf diesem Gelände können keine Städte gegründet werden."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Die Küstenlinie dieses Geländetyps ist unsicher."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Bewegung auf diesem Geländetyp ist unsicher."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Landeinheiten können sich nicht auf dem Ozean bewegen."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Besonderheiten:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr "Nichts"
 
 # CK: field units refer to bombers and rocketry inside of cities
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8692,7 +8746,7 @@ msgstr[1] ""
 "* Kampfeinheiten im Einsatz und Luftangriffseinheiten machen %d Bürger "
 "unzufrieden.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8702,48 +8756,48 @@ msgstr ""
 "Bürger.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* Du zahlst den %d-fachen %s-Unterhalt für deine Einheiten.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* Du zahlst den %d-fachen Unterhalt für deine Einheiten.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* Du zahlst keinen %s-Unterhalt für deine Einheiten.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* Du zahlst keinen Unterhalt für deine Einheiten.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr "* Jede Stadt erspart %d %s für den Unterhalt von Einheiten.\n"
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr "* Jede Stadt erspart %d Goldstücke für den Unterhalt von Einheiten.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "* %d%% Risiko eines Bürgerkriegs beim Verlust der Hauptstadt.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8753,7 +8807,7 @@ msgstr ""
 "%d Städten.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8762,16 +8816,16 @@ msgstr ""
 "* Wenn bereits ein Bürger aufgrund der Stadtgröße unzufrieden ist, wird für "
 "je %d zusätzliche Städte ein weiterer Bürger unzufrieden.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr "Die Höchstrate für Forschung, Steuern und Luxus beträgt %d%%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "Die Raten für Forschung, Steuern und Luxus sind frei wählbar.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8786,7 +8840,7 @@ msgstr[1] ""
 "* Ihre Einheiten können Kriegsrecht anwenden. Jede militärische Einheit in "
 "einer Stadt macht %d unzufriedene Bürger zufrieden.\n"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8795,7 +8849,7 @@ msgstr[1] ""
 "* Höchstens %d Einheiten in jeder Stadt können Kriegsrecht anwenden.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8804,15 +8858,15 @@ msgstr ""
 "* Deine Städte können wachsen, wenn sie feiern. Die Städte müssen mindestens "
 "die Größe %d haben, bevor sie auf diese Art wachsen können.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Deine Einheiten sind unbestechlich.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* In deinen Städten kann es keine Revolte geben.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8820,15 +8874,15 @@ msgstr ""
 "* Die Regierung fällt in Anarchie, wenn irgendeine Stadt sich mehr als zwei "
 "Runden nacheinander in Aufruhr befindet.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Es gibt einen Senat, der die Kriegserklärung verhindern kann.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr "* Von Feinden eroberte Städte können Partisanen bilden.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
@@ -8836,25 +8890,25 @@ msgstr ""
 "* Stadterweiterungen, die normalerweise die Zahl der unzufriedenen Bürger "
 "verringern, liefern stattdessen Goldstücke.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* Fanatiker benötigen keinen Unterhalt.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* Es gibt keine unzufriedenen Bürger.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* %s sind Veteranen.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Veteranen.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8864,7 +8918,7 @@ msgstr ""
 "von 1, wenn die Stadt nicht feiert.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8874,72 +8928,72 @@ msgstr ""
 "wenn die Stadt feiert.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 "* Jedes bearbeitete Feld mit mindestens 1 %s liefert %d davon zusätzlich.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* Der Ertrag von %s steigt um %d%%.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* Der Ertrag von %s verursacht große Mengen Müll.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* Der Ertrag von %s verursacht einigen Müll.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* Der Ertrag von %s verursacht geringe Mengen von Müll.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* %s-Müll nimmt mit der Entfernung von der Hauptstadt schnell zu.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* %s-Müll nimmt mit der Entfernung von der Hauptstadt zu.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr "* %s-Müll nimmt mit der Entfernung von der Hauptstadt langsam zu.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Ermöglicht den Bau von %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d Unzufriedene(r)"
@@ -9370,16 +9424,16 @@ msgstr "Server capability string: %s"
 msgid "Start of turn %d"
 msgstr "Beginn des %d. Zugs"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "KI Modus: %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "AN"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "AUS"
 
@@ -9410,13 +9464,13 @@ msgstr "Name"
 msgid "Username"
 msgstr "Benutzername"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Flagge"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9430,7 +9484,7 @@ msgstr "Grenze"
 msgid "Score"
 msgstr "Punkte"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Team"
 
@@ -9463,36 +9517,36 @@ msgstr "untätig"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Sie können keine Stadterweiterungen verkaufen"
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "%d %s für %d Goldstücke verkauft."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Es konnten keine %s verkauft werden."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "You cannot disband units."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s können nicht aufgelöst werden."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "%d %s aufgelöst."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Es konnten keine %s aufgelöst werden."
@@ -9802,64 +9856,68 @@ msgstr "Gold: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Ste: %d Lux: %d For: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+msgid "Moving: Nobody"
+msgstr "Am Zug: niemand"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Am Zug: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Klicken für mehr Inf.)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s Einwohner"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Zug: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Gold: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Nettoeinkommen: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Steuerquoten: Steuern: %d%% Luxus: %d%% Forschung: %d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Erforsche %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Gefahr der Globalen Erwärmung: %d%% (%+d%%/Runde)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Gefahr des Nuklearen Winters: %d%% (%+d%%/Runde)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Regierungsform: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9867,55 +9925,55 @@ msgstr[0] "%d Einheit"
 msgstr[1] "%d Einheiten"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr "Nicht erreichbar"
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Runden zum Ziel: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Runden zum Ziel: %d bis %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d Einheit ausgewählt"
 msgstr[1] "%d Einheiten ausgewählt"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Keine ausgewählt"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Andere: %d zivil, %d militärisch"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Andere: %d zivil"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Andere: %d militärisch"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Es konnten keine Einheiten erneuert werden."
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Keine dieser Einheiten können erneuert werden."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9930,72 +9988,72 @@ msgstr[1] ""
 "%d Einheiten für %d Goldstücke modernisieren?\n"
 "Die Schatzkammer enthält %d Goldstücke."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Zeigt den Stand der Erforschung der aktuellen Technologie."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "kein Forschungsziel"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Zeigt das Fortschreiten der Globalen Erwärmung an:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Umweltverschmutzung: %d %%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Risiko einer katastrophalen Erwärmung pro Runde: %d %%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Zeigt das Fortschreiten des Nuklearen Winters an:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Fallout-Rate: %d %%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Risiko eines katastrophalen nuklearen Winters pro Runde: %d %%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Gegenwärtige Regierungsform:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Bevölkerung:     %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Lebenshaltung:   %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energie:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -10003,96 +10061,96 @@ msgstr[0] "Gewicht:         %5d t"
 msgstr[1] "Gewicht:         %5d t"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Reisezeit:       %5.1f Jahre"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Reisezeit:          ?       "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Erfolgschance:   %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Ankunftsjahr:    %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:aus"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02dSek"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dMin %02dSek"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dStd %02dMin"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dTge %02dStd"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:überschritten"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "Die %s der %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Beobachter: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Gebäude: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Keine."
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Weltwunder: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Städte: %d insgesamt, %d über dem Grenzwert von %d Städten."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10100,7 +10158,7 @@ msgstr[0] "%d zufrieden; "
 msgstr[1] "%d zufrieden; "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10108,16 +10166,16 @@ msgstr[0] "%d zusätzlicher unzufriedener Bürger."
 msgstr[1] "%d zusätzliche unzufriedene Bürger."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Kriegsrecht in Kraft ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "Keine Obergrenze, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10125,20 +10183,20 @@ msgstr[0] "Maximal 1 Einheit, "
 msgstr[1] "Maximal %d Einheiten, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d pro Einheit)."
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Kampfeinheiten im Einsatz können zu Unzufriedenheit führen. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Kampfeinheiten wirken sich nicht auf die Zufriedenheit aus. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luxus: %d gesamt."
@@ -10189,12 +10247,12 @@ msgid ""
 msgstr ""
 "Der Bürgermeister von %s ist überfordert. Schau dir die Stadt einmal an."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "Nichts"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "individuell"
 
@@ -10248,11 +10306,13 @@ msgid "Ooops..."
 msgstr "Hoppla..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Diese Einheit ist unbestechlich!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10269,6 +10329,7 @@ msgstr "Feindliche Einheit bestechen"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10309,6 +10370,7 @@ msgstr "_Forschungsergebnisse:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Nach Wahl des Spions"
 
@@ -10333,12 +10395,13 @@ msgstr "_Stadterweiterungen:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Produktion ändern"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Es kann keine Revolte in %s eingeleitet werden."
@@ -10350,6 +10413,7 @@ msgstr "Eine Revolte ist hier z.Z. nicht möglich!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10366,6 +10430,7 @@ msgstr "Zu einer Revolte anstiften!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10375,6 +10440,7 @@ msgstr ""
 "Die Schatzkammer enthält %d Goldstücke."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10444,10 +10510,12 @@ msgid "Subvert Enemy Unit"
 msgstr "Feindliche Einheit unterwandern"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr "Der Diplomat erwartet deine Anweisungen"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr "Die Spionin erwartet deine Anweisungen"
 
@@ -10545,7 +10613,7 @@ msgstr "Verschmutzung:"
 msgid "_Overview"
 msgstr "_Ãœbersicht"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10570,11 +10638,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d Runden"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Kaufen"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr "_Produktion"
 
@@ -10693,7 +10761,7 @@ msgstr "Unterstützte Einheiten: %d"
 msgid "Present units %d"
 msgstr "Stationierte Einheiten: %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "_Zentrieren"
 
@@ -10782,31 +10850,31 @@ msgstr "Stadt umbenennen"
 msgid "What should we rename the city to?"
 msgstr "Wie soll die Stadt heißen?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_Ändern"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "_Vorne einfügen"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "_Einfügen"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "_Hinten anhängen"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Auswählen"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr "_Anzeige"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10816,12 +10884,12 @@ msgstr "_Anzeige"
 msgid "Cities"
 msgstr "Städte"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr "_Stadt ansehen"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10830,85 +10898,90 @@ msgstr "_Stadt ansehen"
 msgid "Improvements"
 msgstr "Stadterweiterungen"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Weltwunder"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Alle Städte"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Keine Städte"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Auswahl umkehren"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Einheiten im Bau "
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Stadterweiterungen im Bau"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Weltwunder im Bau"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Einheit im Bau "
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Stadterweiterung im Bau"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Weltwunder im Bau"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Küstenstädte"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Gleiche Insel"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "zu unterhaltende Einheiten"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "stationierte Einheiten"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Stadterweiterungen"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Weltwunder"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Mögliche Einheiten"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Mögliche Stadterweiterungen"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Mögliche Weltwunder"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Gesamtkosten: %d"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10978,121 +11051,121 @@ msgstr "Wie soll die Vorgabe heißen?"
 msgid "Remove this preset?"
 msgstr "Soll die Vorgabe entfernt werden?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "_Gehe nach"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr "_Stadt ansehen"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Wollen Sie wirklich eine Revolution?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revolution!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Was gebrandschatzt werden soll"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Wähle aus, was gebrandschatzt werden soll:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Einheit"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Name"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Einheit auswählen"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_Alle aktivieren"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "_Einheiten stationieren"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
 msgstr "_Nationengruppen:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Wählen Sie eine Nation!"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Wähle Nation"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
 msgstr "zufällige Auswahl"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Nation wählen"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Eigenschaften"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Anführer:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_weiblich"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_männlich"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
 msgstr "Bauwei_se:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 msgid "_Description"
 msgstr "_Legende"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Es MUSS ein Geschlecht gewählt werden."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Es MUSS eine Bauweise gewählt werden."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Bitte wählen Sie einen gültigen Namen."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Einheit modernisieren!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11351,60 +11424,65 @@ msgstr ""
 msgid "Not _ready"
 msgstr "Nicht _bereit"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Bereit"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Start"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+msgid "_Take Player"
+msgstr "Spieler übernehmen"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Wähle _Nation"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "Be_obachten"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr "Nicht be_obachten"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<KI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<Anfänger-KI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<Leichte KI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<Normale KI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<Schwere KI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Zufällig"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Beobachter"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Nicht verbunden"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Wollen Sie das Programm wirklich beenden?"
 
@@ -12316,214 +12394,214 @@ msgstr "Mit Netzwerkspiel _verbinden"
 msgid "Connect to Gaming _Zone"
 msgstr "Mit Gaming _Zone verbinden"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Keine Übereinstimmung, Paßwort eingeben."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Server"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Version"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Status"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Spieler"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Kommentar"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Lokales _Netzwerk"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Internet _Metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Server:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Port:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Name:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "_Paßwort:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Paßwort _wiederholen:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Verbindungsname: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Spielername: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Server: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Spieler/Verbindungsinfo"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s Info"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Spieler bereit / nicht bereit"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Wähle Nation"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Diesen Spieler beobachten"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Spieler übernehmen"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Verbindung trennen"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "KI ein/ausschalten"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Spieler entfernen"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Zugriffsberechtigung Info"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "Zugriffsberechtigung Ctrl"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "Zu %s hinzugefügt"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr "An_zahl der Spieler (einschließlich KI):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr "_KI Stärke:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
 msgstr "_Regelsatz:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Weitere Spiel_optionen..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Rekord"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Bewertung"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Bereit"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Anführer"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Wähle zu ladendes Spiel"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Wähle zu _ladendes Spiel:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Durchsuchen..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Szenario laden"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "_Szenario laden:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Bild"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Wählen Sie Ihre _Nation:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Verzeichnis auswählen zum Speichern"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Spiel speichern"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "_Gespeicherte Spiele:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "_Speichere Datei:"
 
@@ -12558,7 +12636,7 @@ msgstr "Bauwerk"
 msgid "Count"
 msgstr "Anzahl"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12803,28 +12881,28 @@ msgstr "_Arbeitslisten:"
 msgid "Edit Global _Worklists"
 msgstr "Bearbeite _generelle Arbeitsliste"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Runden"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "_Mögliche Aufgaben:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "_Zeige alle Aufträge"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Arbeits_liste:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "Neue _generelle Arbeitsliste"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Produktion _ändern"
 
@@ -13117,8 +13195,8 @@ msgid "City shrinks: %d %s"
 msgstr "Stadt schrumpft: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13220,11 +13298,11 @@ msgstr "Bericht über stationierte Einheiten"
 msgid "Maintenance Report"
 msgstr "Bericht über unterstützte Einheiten"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "Arbeitsliste"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -13655,22 +13733,22 @@ msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 "  -t,  --theme THEMA\tVerwendet THEMA als Thema der Benutzeroberfläche.\n"
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr "Erstelle Bildschirmfoto fc_%05d.bmp"
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Videoausgabe auf : %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Initialisiere Client"
 
 # CK: TECHNICAL
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Waiting for the beginning of the game"
 
@@ -14979,7 +15057,7 @@ msgstr "Bauweise:"
 msgid "Unit Selection"
 msgstr "Einheit auswählen"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "NICHTS"
 
diff --git a/po/el.gmo b/po/el.gmo
index 9ea22de..7a5c509 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index 4ad7c94..b3b0148 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2008-05-23 17:41+0200\n"
 "Last-Translator: Prekates Alexandros <aprekates at yahoo.gr>\n"
 "Language-Team: Greek translation team <gr at li.org>\n"
@@ -48,22 +48,22 @@ msgstr "
 msgid "Science"
 msgstr "ÅðéóôÞìç"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?êôßñéï:Ê"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?èáýìá:È"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?áðáñ÷áéùìÝíï:Á"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?ðëåïíÜæùí:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?êôßñéï:Ê"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?èáýìá:È"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -540,81 +540,81 @@ msgstr "
 msgid "AI Debug messages"
 msgstr "Ìçíýìáôá áðïóöáëìÜôùóçò ÔÍ (Ôå÷íçôÞò Íïçìïóýíçò)"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?óõìðåñéöïñÜ:Ãåíïêôïíéêüò"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?óõìðåñéöïñÜ:Åìðüëåìïò"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?óõìðåñéöïñÜ:Å÷èñéêüò"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?óõìðåñéöïñÜ:Ìç óõíåñãÜóéìïò"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?óõìðåñéöïñÜ:Ìç Âïëéêüò"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?óõìðåñéöïñÜ:ÏõäÝôåñïò"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?óõìðåñéöïñÜ:ÁîéïóÝâáóôïò"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?óõìðåñéöïñÜ:Âïçèçôéêüò"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?óõìðåñéöïñÜ:Åíèïõóéþäçò"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?óõìðåñéöïñÜ:Áîéïèáýìáóôïò"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?óõìðåñéöïñÜ:ÁîéïëÜôñåõôïò"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?äéðëùìáôéêÞ_êáôÜóôáóç:ÐñïóùñéíÞ êáôÜðáõóç ðõñüò"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?äéðëùìáôéêÞ_êáôÜóôáóç:Ðüëåìïò"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?äéðëùìáôéêÞ_êáôÜóôáóç:ÊáôÜðáõóç ðõñüò"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?äéðëùìáôéêÞ_êáôÜóôáóç:ÅéñÞíç"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?äéðëùìáôéêÞ_êáôÜóôáóç:Óõììá÷ßá"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?äéðëùìáôéêÞ_êáôÜóôáóç:Äåí Ý÷ïõí óõíáíôçèåß"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?äéðëùìáôéêÞ_êáôÜóôáóç:ÏìÜäá"
 
@@ -660,13 +660,13 @@ msgstr "%s 
 msgid "Size %d"
 msgstr "ÌÝãåèïò %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "ÌåëëïíôéêÞ ôå÷íïëïãßá  %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -678,65 +678,65 @@ msgstr "
 msgid "None"
 msgstr "Êáìßá"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "ÌåëëïíôéêÞ ôå÷íïëïãßá"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(¶ãíùóôç)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Äñüìïò"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "¾äñåõóç"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Óéäçñüäñïìïò"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Ïñõ÷åßï"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Ìüëõíóç"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Êáëýâá"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Öñïýñéï"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Ðïôáìüò"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Áãñüêôçìá"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "ÁåñïðïñéêÞ âÜóç"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 #, fuzzy
 msgid "Fallout"
 msgstr "ÑáäéåíåñãÜ êáôÜëïéðá"
@@ -843,11 +843,11 @@ msgstr "
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " êáé "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?êáé:, "
 
@@ -1008,84 +1008,84 @@ msgid_plural " (total %d repeats)"
 msgstr[0] "(óõíïëéêÜ %d åðáíÜëçøç)"
 msgstr[1] "(óõíïëéêÜ %d åðáíÜëçøåéò)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Êåíü üñéóìá ãéá  \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Ëåßðåé üñéóìá ãéá \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d Ð.×"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d Ì.×"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 #, fuzzy
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "\"%s\" Ý÷åé ôåèåß áëëÜ åßíáé êåíü; ÷ñçóéìïðïéåßôáé ôï ðñïêáèïñéóìÝíï \"%s\" ."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Äåí ìðïñåß íá ãßíåé áíÜãíùóç êáôáëÜãïõ äåäïìÝíùí %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 #, fuzzy
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "Ôï ìïíïðÜôé êáôáëüãïõ ìðïñåß íá ôåèåß ìÝóù ôçò \"%s\" ìåôáâëçôÞò "
 "ðåñéâÜëëïíôïò."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "ÔñÝ÷ùí ìïíïðÜôé äåäïìÝíùí åßíáé : \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Ôï \"%s\" áñ÷åßï áðáôåßôáé... Ýîïäïò!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: ÈáíÜóéìï óöÜëìá: ðñïóðáèåßò íá ìå åêôåëÝóåéò óáí õðåñ÷ñÞóôçò!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "×ñçóéìïðïéÞóå ìç-ðñïíïìéïý÷ï ëïãáñéáóìü.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "áêñéâÝò ôáßñéáóìá"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "áðëü ôáßñéáóìá"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "áìößóçìï"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "Üäåéï"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "ðïëý ìáêñý"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "ìç-ôáßñéáóìá"
 
@@ -1114,24 +1114,24 @@ msgstr "
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s ðïõëÜåé  %s (äåí ôï ÷ñåéÜæïìáóôå) ãéá %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 "*%s (AI)* Ç ÔÍ äåí ìðïñåß íá õðïãñÜøåé ìéá ôÝôïéá óõíèÞêç óå áðïìáêñõóìÝíç "
 "ëåéôïõñãßá"
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (AI)* Ðñþôá ôåñìÜôéóå ôç óõììá÷ßá ìå %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (AI)* Áò ôåñìáôßóïõìå ðñþôá ôéò å÷èñïðñáîßåò, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1140,50 +1140,50 @@ msgstr ""
 "*%s (AI)* Åý÷ïìáé íá äéáôçñÞóåéò ëßãï áêüìá ôçí ôùñéíÞ êáôÜðáõóç ðõñüòðñþôá, "
 "%s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 "*%s (AI)* ÁðëÜ äåí óå åìðéóôåýïìáé áñêåôÜ áêüìá ãéá íá óõììá÷Þóù ìáæß óïõ, %"
 "s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (AI)* Äåí ãíùñßæù ôçí ðüëç óôçí ïðïßá áíáöÝñåóáé"
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 "*%s (AI)* Óõãíþìç áëëÜ äåí åßíáé áóöáëÝò íá ìïéñÜæïìáé ïñáôüôçôá ìáæß óïõ"
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (AI)* Ç  óõìöùíßá äåí Þôáí ðïëý êáëÞ ãéá ìáò, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* Êáëþò Þñèåò óôç óõììá÷ßá ìáò %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* Íáé, åßèå íá åßìáóôå ðÜíôá åíùìÝíïé, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* Íáé, åéñÞíç óôçí åðï÷Þ ìáò!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)* Óýìöùíïé. ÔÝñìá ïé å÷èñïðñáîßåò, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1192,23 +1192,23 @@ msgstr ""
 "*%s (AI)* ÃåéÜ óïõ %s! Ôé èá Ýëåãåò ãéá êáôÜðáõóç ôïõ ðõñüò þóôå íá "
 "ãíùñéóôïýìåêáëýôåñá;"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* Ôï äéÜóôçìá äåí èá ãßíåé ðïôÝ äéêü óïõ. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "*%s (AI)* ÁñêåôÜ áíÝ÷ôçêá ôïõò áññùóôçìÝíïõò èåáôñéíéóìïýò óïõ! Ðüëåìïò!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (AI)* ÅéñÞíç... êÜðïéá Üëëç óôéãìÞ"
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1217,17 +1217,17 @@ msgstr ""
 "*%s (AI)* ÅðéôÝëïõò óå ôóÜêùóá! Ðßóôåøåò áëÞèåéá üôé ìðïñïýóåò íá ìåßíåéò "
 "áôéìþñçôïò ãéá ôá åãêëÞìáôÜ óïõ;"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (AI)* "
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)* Ç åðéèåôéêüôçôá åíáíôßïí %s Þôáí ôï ôåëåõôáßï óïõ ëÜèïò!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1242,7 +1242,7 @@ msgstr[1] ""
 "*%s (AI)* Èá îåêéíÞóïõìå Ýíáí ïëïêëçñùôéêü ðüëåìï åíáíôßïí %s óôáìáôþíôáò óå "
 "%d ãýñïõò."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1251,7 +1251,7 @@ msgstr ""
 "*%s (AI)* ÁíáìÝíïõìå ôç âïçèåéÜ óïõ óå áõôü ôï èÝìá. ×éëéü÷ñïíç ç äïîáóìÝíç "
 "óõììá÷ßá ìáò!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1270,7 +1270,7 @@ msgstr[1] ""
 "üöåëùò. ÈááðáíôÞóïõìå ìå éó÷ý óå %d ãýñï êáé ðåñéìÝíïõìå íá ôéìÞóåéò ôçí "
 "óõììá÷ßá óïõ ìáæß ìáò êáé ðñÜîåéò ðáñïìïßùò!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1285,7 +1285,7 @@ msgstr[1] ""
 "*%s (AI)* Óêïðåýïõìå íá ëåçëáôÞóïõìå êáé íá ëçóôåýóïõìå ôïí ðëïýóéï "
 "ðïëéôéóìü ôùí %sÈá êçñýîïõìå ðüëåìï óå %d ãýñïõò."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1293,7 +1293,7 @@ msgstr ""
 "*%s (AI)* Áí èåò ìåñßäéï áðü ôá ëÜöõñá, ìðïñåßò åëåýèåñá íá óõììåôÜó÷åéò óôç "
 "äñÜóç!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1308,12 +1308,12 @@ msgstr[1] ""
 "*%s (AI)* ÁñêåôÜ áíå÷ôÞêáìå ôïí %s. ÅðåôñåøÝ ìáò íá äéáëýóïõìå áõôüí ôïí "
 "ðáèçôéêü ðïëéôéóìü. Èá êçñýîïõìå ðüëåìï óå %d ãýñïõò."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr "*%s (AI)* "
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1328,7 +1328,7 @@ msgstr[1] ""
 "*%s (AI)* Èá ôéìßóïõìå ôç óõììá÷ßá ìáò êáé èá êçñýîïõìå ðüëåìï óôïí %s óå %d "
 "ãýñïõò. ÊñáôÞóïõ ãåñÜ - åñ÷üìáóôå!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1339,7 +1339,7 @@ msgid_plural ""
 msgstr[0] "*%s (AI)* "
 msgstr[1] "*%s (AI)* "
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1348,7 +1348,7 @@ msgstr ""
 "*%s (AI)* Ç ðñïóðÜèåéÜ óïõ íá êáôáêôÞóåéò ìüíïò óïõ ôï äéÜóôçìá ðñïäßäïõí "
 "ôéò ðñáãìáôéêÝò óïõ ðñïèÝóåéò. Ç óõììá÷ßá ìáò äåí õðÜñ÷åé ðëÝïí!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1357,7 +1357,7 @@ msgstr ""
 "*%s (AI)* Ç ðñïóðáèåéÜ óïõ íá êõñéáñ÷Þóåéò ìïíïìåñþò óôï äéÜóôçìá åßíáé "
 "áñêïýíôùò åðéèåôéêÞ. "
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1366,12 +1366,12 @@ msgstr ""
 "*%s (AI)* Áí äåí óôáìáôÞóåéò íá êáôáóêåõÜæåéò ôï äéáóôçìüðëïéï, ßóùò "
 "÷ñåéáóôåß íá ëÜâù ìÝôñá!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr "*%s (AI)* Óõãíþìç, áëëÜ ðëÝïí äåí åßíáé áóöáëÝò íá ìïéñáæüìáóôå üñáóç "
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1380,7 +1380,7 @@ msgstr ""
 "*%s (AI)* Èåñìïýò ÷áéñåôéóìïýò áîéüðéóôå óýììá÷å. Óå êáëïýìå ãéá íá "
 "êáôáóôñÝøïõìå ôïí å÷èñü ìáò, %s."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1389,7 +1389,7 @@ msgstr ""
 "*%s (AI)* ×áéñåôßóìáôá óýììá÷å, ÂëÝðù üôé äåí Ý÷åéò êçñýîåé ðüëåìï ìå ôïí "
 "å÷èñü ìáò, %s. Ãéáôß ðñÝðåé íá óïõ õðåíèõìßóù ôéò õðïó÷Ýóåéò óïõ;"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1400,7 +1400,7 @@ msgstr ""
 "åéñçíéêÝòó÷Ýóåéò ìå ôïí èáíÜóéìï å÷èñü ìáò, %s! Áõôü åßíáé áðáñÜäåêôï. Ç "
 "óõììá÷ßá ìáò äåí õðÜñ÷åé ðëÝïí!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1409,13 +1409,13 @@ msgstr ""
 "*%s (AI)* ÃåéÜ óïõ ößëå ìïõ, ôé èá Ýëåãåò íá ìïéñáóôïýìå Ýíáí êïéíü óôü÷ï "
 "êáé íá óõììá÷Þóïõìå;"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "*%s (AI)* ×áéñåôßóìáôá ãåßôïíá, Ôé èá Ýëåãåò ãéá ðïéü åéñçíéêÝò ó÷Ýóåéò;"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1424,7 +1424,7 @@ msgstr ""
 "*%s (AI)* ÊïõñáóôÞêáìå áðü áõôÞí ôç óõíå÷Þ áéìáôïóõ÷ßá. Íá ðñïôåßíïõìå ìéá "
 "äéáêïðÞ ôùí å÷èñïðñáîéþí;"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1434,59 +1434,64 @@ msgstr ""
 "Ôßìçóå ôçí äïîáóìÝíç óõììá÷ßá ìáò êáé ôï ïíïìÜ óïõ äåí èá îå÷áóôåß ðïôÝ!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "ÂÜëå óå %s"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr "ëåßðåé áðü ôï áñ÷åßï äéáìüñöùóçò (÷ñÞóç ðñïêáèïñéóìÝíïõ)"
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr "(ðñïêáèïñéóìÝíç)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr "(äéáìüñöùóç)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr "(ôßèåôáé)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "¼íïìá áñ÷åßï äéáìüñöùóçò ðñüóâáóéìüôçôáò \"%s\"  äåí åðéôñÝðåôáé!"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Äåí ìðüñåóá íá öïñôþóù áñ÷åßï óåíáñßïõ óõíüëïõ-êáíüíùí \"%s\"."
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 "Ðñïåéäïðïßçóç: ôï üíïìá åðéóêÝðôç '%s' Ý÷åé ðáñèåß, ìåôïíïìáóßá óå ÷ñÞóôç '%"
 "s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Äåí åðéôñÝðïíôáé åðéóêåðôåò óå áõôüí ôïí åîõðçñåôçôÞ. Óõãíþìç."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s áðïññßöèçêå: Äåí åðéôñÝðïíôáé ïé åðéóêÝðôåò."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1495,7 +1500,7 @@ msgstr ""
 "ÕðÞñ÷å Ýíá ëÜèïò êáôÜ ôçí áíÜãíùóç ôçò âÜóçò äåäïìÝíùí, óýíäåóç óáí "
 "åðéóêÝðôçò '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1503,41 +1508,41 @@ msgstr ""
 "ÕðÞñ÷å Ýíá ëÜèïò êáôÜ ôçí áíÜãíùóç ôçò âÜóçò äåäïìÝíùí ÷ñçóôþí êáé äåí "
 "åðéôñÝðïíôáé óõíäÝóåéò åðéóêåðôþí. Óõãíþìç."
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s áðïññßöèçêå: ËÜèïò âÜóçòäåäïìÝíùí êáé äåí åðéôñÝðïíôáé åðéóêÝðôåò."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "ÅéóÞãáãå óõíèçìáôéêü ãéá %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "ÅéóÞãáãå êáéíïýñãéï óõíèçìáôéêü (êáé áðïìíçìüíåõóÝ ôï)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 "Áõôüò ï åîõðçñåôçôÞò åðéôñÝðåé ìüíï ðñïêáèïñéóìÝíïõò ÷ñÞóôåò. Óõãíþìç. "
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, fuzzy, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s áðïññßöèçêå: Ìüíï ðñïêáèïñéóìÝíïé ÷ñÞóôåò åðéôñÝðïíôáé."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Óõãíþìç, ðïëëÝò ëáíèáóìÝíåò ðñïóðÜèåéåò..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 "%s áðïññßöèçêå: ÐïëëÝò ëáíèáóìÝíåò åðáëçèåýóåéò óõíèçìáôéêþí ãéá íÝï ÷ñÞóôç."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1545,32 +1550,32 @@ msgstr ""
 "Ðñïåéäïðïßçóç: ÕðÞñ÷å Ýíá ëÜèïò óôï óþóéìï ôçò âéâëéïèÞêçò. Óõíå÷ßæïõìå, "
 "áëëÜ ôá óôáôéóôéêÜ óïõ äåí èá óùèïýí."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s äåí Ýãéíå äåêôü: ÐïëëÝò áðïôõ÷çìÝíåò ðñïóðÜèåéåò óõíèçìáôéêïý."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Ôï óõíèçìáôéêü óïõ åßíáé ëáíèáóìÝíï. ÎáíáðñïóðÜèçóå."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Óõãíþìç, ç óýíäåóÞ óïõ Ýëëåéîå..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s áðïññßöèçêå: ÐÝñáóå ï ÷ñüíïò áíáìïíÞò ãéá óõíèçìáôéêü. "
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 "Ôï óõíèçìáôéêü óïõ åßíáé ðïëý ìéêñü, ôï åëÜ÷éóôï ìÞêïò åßíáé %d. "
 "ÎáíáðñïóðÜèçóå."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2385,16 +2390,14 @@ msgid "Cast a vote."
 msgstr "Ñß÷íåé ìéá øÞöï."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "¸íáò ðáß÷ôçò ìå åðßðåäï ðñüóâáóçò ðëçñïöïñéþí ðïõ åêäßäåé ìéá åíôïëÞ "
 "åðéðÝäïõ åëÝã÷ïõ áñ÷ßæåé ìéá íåá øçöïöïñßá ãéá ôçí åíôïëÞ. Ç /vote åíôïëÞ "
@@ -2405,19 +2408,19 @@ msgstr ""
 "ç èá áðïôý÷åé áììÝóùò áí ôïõëÜ÷éóôïí ïé ìéóïß øçößóïõí êáôÜ. Áí ðåñÜóåé Ýíáò "
 "ãýñïò ç øçöïöïñßá ìðïñåß íá ðåñÜóåé õðÝñ áí äåí øçößóåé êáíÝíáò êáôÜ."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr ""
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 "Åíåñãïðïéåß Þ áðáíåñãïðïéåß ôçí áðïóöáëìÜôùóç ôçò Ô.Í ãéá ìéá äïóìÝíç "
 "ïíôüôçôá."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2426,23 +2429,23 @@ msgstr ""
 "åíåñãïðïéåß Þ áðåíåñãïðïéåß  ôçí óõíå÷Þ åìöÜíéóç ðëçñïöïñéþí áðáóöáëìÜôùóçò "
 "ãéá áõôÞ ôçí ïíôüôçôá."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <üíïìá-åðéëïãÞò> <ôéìÞ>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "ÈÝôåé åðéëïãÞ åîõðçñåôçôÞ."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <ðáß÷ôçò> [ïìÜäá]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "ÁëëÜæåé, ðñïóèÝôåé Þ áöáéñåß ôçí ó÷Ýóç åíüò ðáß÷ôç ìå ìßá ïìÜäá."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2455,15 +2458,15 @@ msgstr ""
 "üñáóç êáé ðñåóâåßåò êáé ðïëåìÜ ìáæß ãéá íá ðåôý÷åé ôçí íßêç ôçò ïìÜäáò ìå "
 "êñéôÞñéï ôïí ìÝóï üñï ôùí âáèìïëïãéþí ôùí ìåëþí ôçò."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <êáôÜëïãïò>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "ÅðÝëåîå íÝï óýíïëï êáíüíùí Þ ðáêÝôï ôñïðïðïéÞóåùí."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2473,15 +2476,15 @@ msgstr ""
 "êáíüíùí."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <ìåôÜ-ãñáììÞ>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "ÈÝôåé ãñáììÞ ðëçñïöïñéþí ôïõ ìåôÜ-åîõðçñåôçôÞ."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2496,19 +2499,19 @@ msgstr ""
 "áíôß ãéá áõôüìáôá ðáñáãþìåíá ìçíýìáôá, áí åßíáé äéáèÝóéìá."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <meta-line>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "ÈÝóå ôçí åðéäéïñèùôéêÞ ãñáììÞ ôïõ ìåôáåîõðçñåôçôÞ."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "¸ëåíîå ôç óýíäåóç ôïõ ìåôáåîõðçñåôçôÞ."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2516,33 +2519,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <äéåýèõíóç>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "ÈÝóå äéåýèõíóç (URL) óôçí ïðïßá èá áíáöÝñåé ï ìåôáåîõðçñåôçôÞò."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <üíïìá-ðáß÷ôç>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "ÅíáëëáãÞ êáôÜóôáóçò Ô.Í ôïõ ðáß÷ôç."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [ïíïìá-óýíäåóçò] <üíïìá-ðáß÷ôç>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "ÐÜñå ôç èÝóç åíüò ðáß÷ôç óôï ðáé÷íßäé."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2557,15 +2560,15 @@ msgstr ""
 "äçìéïõñãåßôáé  Ýíáò êáé áíáôßèåôáé óôç óýíäåóç."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [üíïìá-óýíäåóçò] [üíïìá-ðáß÷ôç]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "ÐáñáôÞñçóå Ýíá ðáß÷ôç ãéá üëï ôï ðáé÷íßäé."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2580,15 +2583,15 @@ msgstr ""
 "ðñïóêïëëåßôáé óå Ýíáí êáèïëéêü ðáñáôçñçôÞ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <üíïìá-óýíäåóçò>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "áðïêüëëçóç áðü Ýíá ðáß÷ôç"
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2597,39 +2600,39 @@ msgstr ""
 "óõíäÝóåéò íá áðïêïëëçèïýí áðü Ýíáí ðáß÷ôç"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <üíïìá-ðáß÷ôç>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Äçìéïõñãåß Ýíáí ðáß÷ôç ÔÍ ìå ôï äùèÝí üíïìá."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 "Ç åíôïëÞ 'create' (äçìéïýñãçóå) åßíáé äéáèÝóéìç ìüíï ðñéí áñ÷ßóåé ôï "
 "ðáé÷íßäé."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
 msgstr ""
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 "ÈÝóå ôïí åõáôü óïõ óå áðïìáêñõóìÝíï ôñüðï ðáé÷íéäéïý. Ç ÔÍ èá êáëýøåé ôç "
 "èÝóç óïõ!"
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "Ç ÔÍ èá êõâåñíÜ ôï Ýèíïò óïõ áëëÜ êÜíïíôáò ëßãåò áëëáãÝò."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2637,11 +2640,11 @@ msgstr ""
 "novice\n"
 "novice <üíïìá-ðáß÷ôç>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "ÈÝóå Ýíáí Þ üëïõò ôïõ ðáß÷ôåò ÔÍ óå 'áñ÷Üñéïõò'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2652,7 +2655,7 @@ msgstr ""
 "üñéóìá , èÝôåé  ôï åðßðåäï éêáíüôçôáò ìüíï ãéá áõôüí ôïí ðáß÷ôç. "
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2660,11 +2663,11 @@ msgstr ""
 "easy\n"
 "easy <üíïìá-ðáß÷ôç>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "ÈÝôåé Ýíáí Þ üëïõò ôïõ ðáß÷ôåò ÔÍ óå åðßðåäï éêáíïôÞôùí 'åýêïëç'"
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2675,7 +2678,7 @@ msgstr ""
 "üñéóìá , èÝôåé  ôï åðßðåäï éêáíüôçôáò ìüíï ãéá áõôüí ôïí ðáß÷ôç. "
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2683,11 +2686,11 @@ msgstr ""
 "normal\n"
 "normal <üíïìá-ðáß÷ôç>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "ÈÝôåé Ýíáí Þ üëïõò ôïõ ðáß÷ôåò ÔÍ óå åðßðåäï éêáíïôÞôùí 'êáíïíéêÞ'"
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2699,7 +2702,7 @@ msgstr ""
 "ôïí ðáß÷ôç. "
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2707,11 +2710,11 @@ msgstr ""
 "hard\n"
 "hard <üíïìá-ðáß÷ôç>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "ÈÝôåé Ýíáí Þ üëïõò ôïõ ðáß÷ôåò ÔÍ óå åðßðåäï éêáíïôÞôùí 'äýóêïëç'"
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2723,7 +2726,7 @@ msgstr ""
 "ðáß÷ôç. "
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2731,11 +2734,11 @@ msgstr ""
 "experimental\n"
 "experimental <üíïìá-ðáß÷ôç>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "ÈÝôåé Ýíáí Þ üëïõò ôïõ ðáß÷ôåò ÔÍ óå åðßðåäï éêáíïôÞôùí 'ðåéñáìáôéêÞ'"
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2750,7 +2753,7 @@ msgstr ""
 "åðéëïãÞ äåí Ý÷åé êáíÝíá áðïôÝëåóìá."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2764,11 +2767,11 @@ msgstr ""
 "cmdlevel <åðßðåäï> first\n"
 "cmdlevel <åðßðåäï> <üíïìá-óýíäåóçò>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "ÈÝôåé Þ äéáâÜæåé åðßðåäá ðñüóâáóçò åíôïëþí."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2811,21 +2814,21 @@ msgstr ""
 "üíïìá. Áò óçìåéùèåß üôé ç åíôïëÞ ðÝñíåé ðëåüí ïíüìáôá óõíäÝóåùíü÷é ïíüìáôá "
 "ðáé÷ôþí. "
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 "Áí äåí õðÜñ÷å êáíÝíáò, ãßíå ï ïñãáíùôÞò ôïõ ðáé÷íéäßïõ ìå áõîçìÝíåò Üäåéåò."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <ãýñïò> <áýîçóç-ãýñïõ> <ôéìÞ> <ðïëëáðëáóéáóôÞò-ôéìÞò>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Äåò \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2837,41 +2840,41 @@ msgstr ""
 "\"timeout\".  ÐñïêáèïñéóìÝíåò ôéìÝò: 0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 #, fuzzy
 msgid "endgame"
 msgstr "Ðñéí ôï ðáé÷íßäé"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "ÔåñìÜôéóå ôï ðáé÷íßäé Üììåóá ìå éóïðáëßá."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 #, fuzzy
 msgid "surrender"
 msgstr "ÓöåôåñéóôÞò"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr ""
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <üíïìá-ðáß÷ôç>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Áöáßñåóå ðëÞñùò ôïí ðáß÷ôç áðü ôï ðáé÷íßäé."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2881,7 +2884,7 @@ msgstr ""
 "×ñçóéìïðïéÞóå ôçí åíôïëÞ ìå ðñïóï÷Þ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2889,11 +2892,11 @@ msgstr ""
 "save\n"
 "save <üíïìá-áñ÷åßïõ>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Óþóéìï ôïõ ðáé÷íéäßïõ óå áñ÷åßï."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2911,7 +2914,7 @@ msgstr ""
 "êáé ÷ñçóéìïðïßçóå ôçí åíôïëÞ 'start' üôáí óõíäåèïýí îáíÜ ïé ðáß÷ôåò."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2919,11 +2922,11 @@ msgstr ""
 "load\n"
 "load <üíïìá-áñ÷åßïõ>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Öüñôùóå ðáé÷íßäé áðü áñ÷åßï."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2933,28 +2936,28 @@ msgstr ""
 "÷áèïýí. \n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <üíïìá-áñ÷åßïõ>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "ÅðåîåñãÜóïõ åðéëïãÝò åîõðçñåôçôÞ áðü áñ÷åßï."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <üíïìá-áñ÷åßïõ>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "ÃñÜøå ôñÝ÷ïõóåò ñõèìßóåéò óáí åíôïëÝò åîõðçñåôçôÞ óå áñ÷åßï."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "ÅíáëëáãÞ åîüäïõ åîõðçñåôçôÞ áíÜìåóá óå óôõë RFC êáé êáíïíéêü óôõë."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "ÁðëÜ åðÝóôñåøå ôï id ôïõ åîõðçñåôçôÞ."
 
@@ -3459,25 +3462,34 @@ msgstr ""
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr ""
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr ""
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr ""
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3520,44 +3532,44 @@ msgstr ""
 msgid "There is no player nor connection by the name %s."
 msgstr ""
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr ""
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr ""
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr ""
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr ""
@@ -3620,27 +3632,27 @@ msgstr "
 msgid "You should choose a new government from the government menu."
 msgstr "ÐñÝðåé íá åðéëÝîåéò ìéá íÝá êõâÝñíçóç áðü ôï ìåíïý ôùí ðïëéôåõìÜôùí."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Ôï ðïóïóôü åðéóôÞìçò ðïõ õðåñâáßíå ôï ìÝãéóôï üñéï ãéá %s ñõèìßóôçêå."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Ôï ðïóïóôü áíÝóåùí ðïõ õðåñâáßíå ôï ìÝãéóôï üñéï ãéá %s ñõèìßóôçêå."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s äåí óïõ äßíåé ðëÝïí êïéíÞ ïñáôüôçôá!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3649,7 +3661,7 @@ msgstr ""
 "Ç ãåñïõóßá äåí èá óïõ åðéôñÝøåé íá áêõñþóåéò ôç óõíèÞêç  ìå ôïí %s. ÐñÝðåé "
 "åßôå íá äéáëýóåéò ôç ãåñïõóßá åßôå íá ðåñéìÝíåéò ìéá ðïéü êáôÜëëçëç óôéãìÞ."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
@@ -3657,7 +3669,7 @@ msgstr ""
 "Ç ãåñïõóßá èá øçößóåé ôçí ðñïôáóÞ óïõ åîáéôßáò ôùí óõíå÷þí ðñïêëÞóåùí ôïõ %"
 "s. "
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3666,12 +3678,12 @@ msgstr ""
 "Ç ãåñïõóßá áñíåßôáé íá áêõñþóåé ôç óõíèÞêç ìå ôïí %s, áëëÜ åóõ äåí Ý÷åéò "
 "ðñüâëçìá "
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Ç äéðëùìáôéêÞ êáôÜóôáóç áíÜìåóá óå %s êáé óå %s åßíáé ôþñá %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3680,7 +3692,7 @@ msgstr ""
 " %s áêýñùóå ôç äéðëùìáôéêÞ óõìöùíßá! ÐëÝïí ç äéðëùìáôéêÞ êáôÜóôáóç áíÜìåóá "
 "óôï %s êáé óôïí %s åßíáé ôþñá  %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
@@ -3688,7 +3700,7 @@ msgstr ""
 "%s åðéôÝèçêå óôïí óýììá÷ü óïõ %s! Áêõñþíåéò ôç óõììá÷ßá óïõ ìå ôïí "
 "åðéôéèÝìåíï."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3697,26 +3709,26 @@ msgstr ""
 "Ï ößëïò %s ôçò ïìÜäáò óïõ êÞñõîå ðüëåìï óôïí %s. Õðï÷ñåþíåóáé íá áêõñþóåéò "
 "óõììá÷ßá ìå ôïí %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Áðïìáêñýíåôáé ï ðáß÷ôçò %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Áðïìáêñýíèçêåò áðü ôï ðáé÷íßäé!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s áðïìáêñýíèçêå áðü ôï ðáé÷íßäé."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "¸êáíåò åðáöÞ ìå ôïõò %s ðïõ êõâåñíþíôáé áðü ôïí %s  "
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3724,17 +3736,17 @@ msgstr ""
 "%s êáé %s óõíáíôÞèçêáí êáé ðÜíå óå Üììåóï ðüëåìï. Áêõñþíåéò ôç óõììá÷ßá óïõ "
 "êáé ìå ôïõò äýï."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Äåí ìðïñþ íá ðñïêáëÝóù åìöýëéï ðüëåìï óôïí %s - ðïëý ðáß÷ôåò"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Äåí ìðïñþ íá ðñïêáëÝóù åìöýëéï ðüëåìï óôïí %s - ðïëý ðáß÷ôåò"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, fuzzy, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3743,12 +3755,12 @@ msgstr ""
 "Óôï Ýèíïò óïõ îÝóðáóå åìöýëéïò ðüëåìïò, o %s áíáêõñçñß÷ôçêå çãÝôçò ôùí "
 "åðáíáóôáôçìÝíùí êñáôþí."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, fuzzy, c-format
 msgid "%s declares allegiance to %s."
 msgstr "Ï %s äçëþíåé ðßóôç óôïí  %s"
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3996,21 +4008,21 @@ msgstr "
 msgid "th"
 msgstr "ïò"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Ôï äçìïãñáöéêü áëöáñéèìçôéêü ðåñéÝ÷åé Üêõñïõò ÷áñáêôÞñåò. Äþóå åíôïëÞ \"help "
 "demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "ÄçìïãñáöéêÞ ÁíáöïñÜ:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Óõãíþìç, áëëÜ ç ÄçìïãñáöéêÞ áíáöïñÜ äåí åßíáé äéáèÝóéìç"
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "Ï %s ôïõ %s (%s)"
@@ -4021,11 +4033,11 @@ msgstr "
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr ""
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr ""
 
@@ -4037,7 +4049,7 @@ msgid ""
 "risk."
 msgstr ""
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
 
@@ -4055,13 +4067,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4096,7 +4108,7 @@ msgstr "
 msgid "Networking"
 msgstr "Äéêôýïõ"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "¼ëá"
@@ -4117,34 +4129,34 @@ msgstr "
 msgid "Changed"
 msgstr "¶ëëáãìÝíï"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
 msgstr ""
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
 msgstr ""
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -4153,11 +4165,15 @@ msgstr ""
 "Ï áñéèìüò ôùí ðáé÷ôþí åßíáé õøçëüôåñïò áðü ôçí æçôïýìåíç ôéìÞ. ÊñáôéÝôáé ç "
 "ðáëéÜ ôéìÞ"
 
-#: server/settings.c:236
+#: server/settings.c:181
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr ""
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "ÌÝãåèïò ÷Üñôç (óå ÷éëéÜäåò ðëáêÜêéá)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4168,12 +4184,12 @@ msgstr ""
 "ôéìÞ)\n"
 "  ìÝãåèïò = 20 åßíáé Ýíáò ôåñÜóôéïò ÷Üñôçò áðü 20.000 ðëáêÜêéá"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Åõñåôçñéï ôïðïëïãßùí ÷Üñôç"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4242,11 +4258,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "ÌÝèïäïò ðïõ ÷ñçóéìïðïéåßôáé ãéá ôç äçìéïõñãßá ôïõ ÷Üñôç"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4267,11 +4283,11 @@ msgstr ""
 "ôüôå èá åðéëå÷ôåß ìéá ñýèìéóç ôïðïè-åêêßíçóçò âáóéóìÝíç óôçí áõôüìáôç "
 "äçìéïõñãßá.Äåò êáé ôçí ñýèìéóç \"ôïðïè-åêêßíçóçò\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "ÌÝèïäïò ðïõ ÷ñçóéìïðïéåßôáé ãéá ôçí áñ÷éêÞ ôïðïèÝôçóç ôùí ðáé÷ôþí"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4294,37 +4310,37 @@ msgstr ""
 "áíáëïãéêÜ ìå ôçí åðéëïãÞ ôïõ ðëÞèïò ôùí ðáé÷ôþí êáé ôïõ ôñüðïõ áñ÷éê."
 "ôïðïèÝôçóçò ðïõ Ýãéíáí."
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Ðáñïõóßá íçóéþí 1x1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = ü÷é íçóßá 1x1, 1 = ìåñéêÜ íçóßá 1x1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "ÅÜí ïé ðüëïé åßíáé îå÷ùñéóôïß Þðåéñïé"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = ïé Þðåéñïé ìðïñåß íá åíþíïíôáé óôïõò ðüëïõò, 1 = ïé ðüëïé åßíáé óõíÞèùò "
 "îå÷ùñéóìÝíïé"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "¼ëïò ï ÷Üñôçò åßíá åýêñáôïò"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = ðëáíÞôçò ðáñüìïéïò ìå ôç Ãç, 1 = üëïò ï ðëáíÞçôçò åßíáé åýêñáôïò "
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "ÌÝóç èåñìïêñáóßá óôïí ðëáíÞôç"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4356,22 +4372,22 @@ msgstr ""
 "0 óçìáßíåé Ýíáò ðïëý êñýïò ðëáíÞôçò ìå ìåãÜëåò ðïëéêÝò æþíåò êáé êáèüëïõ "
 "ôñïðéêÝò ðåñéï÷Ýò"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Ðïóïóôü ôïõ ÷Üñôç ðïõ åßíáé îçñÜ"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 "ÁõôÞ ç ñýèìéóç äßíåé êáôÜ ðñïóÝããéóç ôï ðïóïóôü ôïõ ÷Üñôç ðïõ èá åßíáé îçñÜ."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "¸êôáóç ëüöùí/âïõíþí"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4379,11 +4395,11 @@ msgstr ""
 "ÌéêñÝò ôéìÝò äßíïõí åðßðåäïõò ÷Üñôåò, åíþ ìåãÜëåò ôéìÝò äßíïõí ðïéü "
 "åðéêëéíåßò ìå ðåñéóóüôåñá âïõíÜ êáé ëüöïõò."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Ðïóüôçôá íåñþí óôç îçñÜ"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4392,11 +4408,11 @@ msgstr ""
 "ôéìÝò äßíïõí Ýíáí ðïéü õäÜôéíï ÷Üñôç ìå ðïëëïýò âÜëôïõò , æïýãêëåò êáé "
 "ðïôÜìéá."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Ôõ÷áßïò óðüñïò äçìéïõñãßáò ÷Üñôç"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4407,11 +4423,11 @@ msgstr ""
 "÷Üñôç. ÁõôÞ ç ñýèìéóç åßíáé ÷ñÞóéìç ìüíï êáôÜ ôçí áðïóöáëìÜôùóç ôïõ "
 "ðáé÷íéäßïõ."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Óðüñïò ôõ÷áßïõ ðáé÷íéäßïõ"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4420,11 +4436,11 @@ msgstr ""
 "÷ñüíï. ÁõôÞ ç ñýèìéóç åßíáé ÷ñÞóéìÞ ìüíï êáôÜ ôçí áðïóöáëìÜôùóç ôïõ "
 "ðáé÷íéäßïõ."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Ðïóüôçôá \"åéäéêþí\" ðüñùí ôåôñáãþíùí"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4433,11 +4449,11 @@ msgstr ""
 "âñßóêïíôáé.Ï åîõðçñåôçôÞò ÷ñçóéìïðïéåß ìéá ìåôáâëçôÞ ìå êëßìáêá ôéìÞò  ìÝñç "
 "áíÜ ÷éëéÜäá."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Ðïóüôçôá áðü êáëýâåò (ìéêñÜ ÷ùñéÜ áðü öõëÝò)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 #, fuzzy
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
@@ -4447,23 +4463,24 @@ msgstr ""
 "óå üëï ôïí ÷Üñôç. Ïé êáëýâåò áíôéóôïé÷ïýí óå ìéêñÜ ÷ùñßá öõëþí ðïõ ìðïñïýí "
 "íá åñåõíçèïýí áðü ìïíÜäåò"
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "ÅëÜ÷éóôïò áñéèìüò ðáé÷ôþí"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "ÐñÝðåé íá õðÜñ÷åé ôïõëÜ÷éóôïí ôüóïé ðáß÷ôåò (óõíäåäåìÝíïé áíèñþðïé ïé "
 "åëåã÷üìåíïé áðü ÔÍ) ðñßí îåêéíÞóåé ôï ðáé÷íßäé."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "ÌÝãéóôïò áñéèìüò ðáé÷ôþí"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4473,11 +4490,11 @@ msgstr ""
 "õðÜñ÷ïõí óôï ðáé÷íßäé. ¼ôáí áõôüò ï áñéèìüò ðáé÷ôþí õðÜñ÷åé ðñéí îåêéíÞóåé "
 "ôï ðáé÷íßäé ôüôå áßôçóåéò ãéá óýíäåóç áðü íÝïõò ðáß÷ôåò èá áðïññßðôïíôáé."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Óõíïëéêüò áñéèìüò ðáé÷ôþí (óõìðåñéëáìâáíïìÝíïõ ðáé÷ôþí ÔÍ)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 #, fuzzy
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
@@ -4487,11 +4504,11 @@ msgstr ""
 "áðáéôïýìåíïò áñéèìüò ðáé÷ôþí ÔÍ ðñïêåéìÝíïõ ï óõíïëéêüò áñéèìüò ðáé÷ôþí íá "
 "åßíáé áõôüò ðïõ êáèïñßóôçêå."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Ëßóôá áñ÷éêþí ìïíÜäùí ðáé÷ôþí"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4519,28 +4536,28 @@ msgstr ""
 "    a   = ÃñÞãïñç åðéèåôéêÞ ìïíÜäá (ð÷., ÊáâáëÜñçäåò)\n"
 "    A   = ÄõíáôÞ åðéèåôéêÞ ìïíÜäá  (ð÷., ÊáôáðÝëôçò)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Ðåñéï÷Þ üðïõ èá âñßóêïíôáé áñ÷éêÜ ïé ìïíÜäåò"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "ÁõôÞ åßíáé ç áêôßíá ìÝóá óôçí ïðïßá èá äéáóêïñðéóèïýí áñ÷éêÜ ïé ìïíÜäåò."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Áñ÷éêüò ÷ñõóüò áíÜ ðáß÷ôç"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Óôçí áñ÷Þ ôïõ ðáé÷íéäßïõ äßíåôáé ôüóïò ÷ñõóüò óôïí êÜèå ðáß÷ôç."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Áñ÷éêüò áñéèìüò ôå÷íïëïãéþí áíÜ ðáß÷ôç"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4552,11 +4569,11 @@ msgstr ""
 "êüóôïò_ôå÷íïëïãßáò_óôõë óôï óýíïëï êáíüíùí, ìéá ìåãÜëç ôéìÞ ìðïñåß íá êÜíåé "
 "ôéò åðüìåíåò ôå÷íïëïãßåò áñêåôÜ áêñéâÝò."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "ÐïëëáðëáóéáóôÞò ðïóïóôïý êüóôïõò ôå÷íïëïãßáò"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4567,11 +4584,11 @@ msgstr ""
 "ôçí ôéìÞ (óáí ðïóïóôü). Ôá âáóéêÜ êüóôç ôùí ôå÷íïëïãéþí êáèïñßæïíôáé áðü ôï "
 "óýíïëï-êáíüíùí Þ Üëëåò ñõèìßóåéò óôï ðáé÷íßäé."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Ðïóïóôü ðïéíÞò ìå áëëáãÞ ôå÷íïëïãßáò"
 
-#: server/settings.c:501
+#: server/settings.c:492
 #, fuzzy
 msgid ""
 "If you change your current research technology, and you have positive "
@@ -4582,11 +4599,11 @@ msgstr ""
 "÷Üíåéò ðïóïóôü áõôþí ðïõ êáèïñßæåôáé óôç ñýèìéóç áõôÞ. Áõôü äåí éó÷ýåé áí "
 "ìüëéò áðÝêôçóåò ìéá ôå÷íïëïãßá áõôüí ôïí ãýñï."
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "ÐïéíÞ üôáí áðïêôÜò ìéá ôå÷íïëïãßá ìå óõíèÞêç Þ ÷ñõóü"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4600,11 +4617,11 @@ msgstr ""
 "Ýñåõíáò áí áõôÞ ç ñýèìéóç åßíáé èåôéêÞ. Åðßóçò ðáñüìïéá åðéâáñýíïíôáé "
 "ìåôáöïñÝò ÷ñõóïý êáôÜ ôéò äéðëùìáôéêÝò óõìöùíßåò."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "ÐïéíÞ üôáí áðï÷ôÜò ôå÷íïëïãßá ìå êáôáêôÞóåéò"
 
-#: server/settings.c:522
+#: server/settings.c:513
 #, fuzzy
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
@@ -4616,11 +4633,11 @@ msgstr ""
 "êüóôïõò Ýñåõíáò ìéáò íÝáò ôå÷íïëïãßáò . Ìðïñåßò íá êáôáëÞîåéò ìå áñíçôéêïýò "
 "ðüíôïõò Ýñåõíáò áí áõôÞ ç ñýèìéóç åßíáé èåôéêÞ."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "ÐïéíÞ üôáí áðï÷ôÜò ìéá äùñåÜí ôå÷íïëïãßá"
 
-#: server/settings.c:533
+#: server/settings.c:524
 #, fuzzy
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
@@ -4634,11 +4651,11 @@ msgstr ""
 "ç ñýèìéóç) ôïõ êüóôïõò Ýñåõíáò ìéáò íÝáò ôå÷íïëïãßáò . Ìðïñåßò íá êáôáëÞîåéò "
 "ìå áñíçôéêïýò ðüíôïõò Ýñåõíáò áí áõôÞ ç ñýèìéóç åßíáé èåôéêÞ."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Öáãçôü ðïõ ÷ñåéÜæåôáé ìéá ðüëç ãéá íá áõîçèåß"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4648,12 +4665,12 @@ msgstr ""
 "ÁõôÞ ç ôéìÞ ðïëëáðëáóéÜæåôáé ìå Ýíá Üëëï ðáñÜãïíôá áðü ôï óýíïëï-êáíüíùí êáé "
 "åîáñôÜôáé áðü ôï ìÝãåèïò ôçò ðüëçò."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Ðïóïóôü öáãçôïý ðïõ ÷Üíåôáé üôáí áðáéôåßôáé õäñáãùãåßï"
 
-#: server/settings.c:554
+#: server/settings.c:545
 #, fuzzy
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
@@ -4664,11 +4681,11 @@ msgstr ""
 "÷ñåéÜæåôáé õäñáãùãåßï (Þ óýóôçìá õðïíüìùí), ôüôå ÷Üíåé áõôü ôï ðïóïóôü áðü "
 "ôï êïõôß ôùí ôñïößìùí (ç ìéóü áðü áõôü áí Ý÷åé óéôáðïèÞêç)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Ðïóïóôü ðïëëáðëáóéáóôÞò  ãéá êüóôç ðáñáãùãÞò"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4676,11 +4693,11 @@ msgstr ""
 "Áõôü åðçñåÜæåé ðüóï ãñÞãïñá ìïíÜäåò êáé êôÞñéá ìðïñïýí íá ðáñá÷èïýí. Ôá "
 "âáóéêÜ êüóôç ðïëëáðëáóéÜæïíôáé ìå áõôÞ ôçí ôéìÞ (óáí ðïóïóôü)."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "ÅëÜ÷éóôï ìÝãåèïò ðüëçò ãéá íá áðïêôÞóåé ðëÞñåò åìðüñéï"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4692,11 +4709,11 @@ msgstr ""
 "(äåò ñýèìéóçìÝãåèïò¼÷éÅìðüñéïõ  ), êáé ìåéþíåôáé óôáäéáêÜ óôï 0% (êáìéÜ "
 "ðïéíÞ åêôüò áðü äéáöèïñÜ) ãéá ìÝãåèïò=ìÝãåèïòÐëÞñåòÅìðüñéïõ."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "ÌÝãéóôï ìÝãåèïò ðüëçò ÷ùñßò åìðüñéï"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4707,21 +4724,21 @@ msgstr ""
 "ðüëåéò ìåãáëýôåñåò áðü ìÝãåèïò¼÷éÅìðüñéïõ êáé ìéêñüôåñåò áðü "
 "ìÝãåèïòÐëÞñåòÅìðüñéïõ. Äåò êáé ñýèìéóç ìÝãåèïòÐëÞñåòÅìðüñéïõ."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr ""
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
 msgstr ""
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr ""
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4729,11 +4746,11 @@ msgid ""
 "numbers of cities."
 msgstr ""
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "ÅëÜ÷éóôç áðüóôáóç ìåôáîý ðüëåùí"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4744,11 +4761,11 @@ msgstr ""
 "¼ôáí Ýíáò ðáß÷ôçò éäñýåé ìéá íÝá ðüëç, ãßíåôáé Ýëåã÷ïò áí õðÜñ÷åé Üëëç ðüëç "
 "óå áõôÞ ôçí áðüóôáóç."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Áñéèìüò ãýñùí ìåôáîý áðïôåëåóìÜôùí áãáëëßáóçò"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4756,11 +4773,11 @@ msgstr ""
 "ÈÝôåé ôïí áñéèìü ôùí ãýñùí ìåôáîý áýîçóç ëüãù áãáëëßáóçò.Áí ôåèåß óå í ôüôå "
 "ìéá ðüëç èá áõîçèåß ìåôÜ áðü åïñôáóìü í+1 ãýñùí."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Ðéèáíüôçôá êáôáóôñïöÞò êáôáêôçìÝíïõ êôéñßïõ"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4768,11 +4785,11 @@ msgstr ""
 "¼ôáí Ýíáò ðáß÷ôçò êáôáêôÜ ìéá ðüëç, ôüôå êÜèå õðïäïìÞ ôçò ðüëçò Ý÷åé áõôÞ "
 "ôçí ðéèáíüôçôá íá êáôáóôñáöåß."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Ðéèáíüôçôá íá ìåôáêéíçèåßò óå Ýíá ðëáêßäéï ìåôÜ áðü åðßèåóç"
 
-#: server/settings.c:648
+#: server/settings.c:639
 #, fuzzy
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
@@ -4787,11 +4804,11 @@ msgstr ""
 "äåí ðáñáìÝíïõí å÷èñéêÝò ìïíÜäåò óôï ôåôñÜãùíï).Áí ôåèåß óå ìéá ôéìÞ ìåôáîý 0 "
 "êáé 100, áõôÞ èá ÷ñçóéìïðïéçèåß óáí ðéèáíüôçôá íá \"êáôáëçöèåß\" ôï ôåôñÜãùíï"
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Åíåñã/Áðåíåñã áõôüìáôç åðßèåóç"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4800,11 +4817,11 @@ msgstr ""
 "êßíçóåéò èá õðÜñ÷åé ç ðéèáíüôçôá íá åðéôåèïýí óå ìïíÜäåò ðïõ ðåñíïýí áðü "
 "ãåéôïíéêÜ ôåôñÜãùíá."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Ìåßùóå ôïí ðëçèõóìü ðüëçò ðïõ äÝ÷åôáé åðßèåóç"
 
-#: server/settings.c:667
+#: server/settings.c:658
 #, fuzzy
 msgid ""
 "This flag indicates whether city population is reduced after successful "
@@ -4821,11 +4838,11 @@ msgstr ""
 "  4 = åëéêüðôåñï\n"
 "  8 = áÝñá"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Áêôßíá åèíéêþí óõíüñùí"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4836,21 +4853,21 @@ msgstr ""
 "ùêåáíþí Þ ðëáêßäéá ðïõ âñßóêïíôáé ôáõôü÷ñïíá óôçí áêôßíá ðüëåùí áðü "
 "äéáöïñåôéêÜ Ýèíç."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "ÌïíÜäåò ìÝóá óôá óýíïñá äåí ðñïêáëïýí äõóôõ÷ßá"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr "Áí ôåèåß ôüôå ìïíÜäåò ìÝóá óôá óõíïñÜ óïõ äåí èá ðñïêáëïýí äõóôõ÷ßá."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Äõíáôüôçôá ãéá äéðëùìáôßá ìå Üëëïõò ðáß÷ôåò"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4864,11 +4881,11 @@ msgstr ""
 "3 = ç äéðëùìáôßá ðåñéïñßæåôáé óôéò ïìÜäåò.\n"
 "4 = ç äéðëùìáôßá åßíáé áðåíåñãïðïéçìÝíç ãéá üëïõò."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Åðéôñåðüìåíá ïíüìáôá ðüëåùí"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4895,11 +4912,11 @@ msgstr ""
 "ðñïêáèïñéóìÝíï üíïìá ðüëçò áðü Ýíá Üëëï Ýèíïò åêôüò áí åßíáé ôï "
 "ðñïêáèïñéóìÝíï êáé ãéá ôï äéêü ôïõ Ýèíïò."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Óõ÷íüôçôá åìöÜíéóçò âáñâÜñùí"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4913,19 +4930,19 @@ msgstr ""
 "3 = óõ÷íÜ îåóçêþìáôá âáñâÜñùí \n"
 "4 = ïñãéóìÝíåò ïñäÝò âáñâÜñùí, ðïëëïß âÜñâáñïé"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "¸ôïò åìöÜíéóçò âáñâÜñùí"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "ÂÜñâáñïé äåí èá åìöáíéóôïýí ðñéí áðü áõôü ôï Ýôïò"
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "ÄéÜñêåéá åðáíÜóôáóçò óå ãýñïõò"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4933,11 +4950,11 @@ msgstr ""
 "¼ôáí áëëÜæåéò êõâÝñíçóç, ðñïêýðôåé ìéá ðåñßïäïò áíáñ÷ßáò ðïõ äéáñêåß ôüóïõò "
 "ãýñïõò. ÔéìÞ 0 èá äþóåé ìéá ôõ÷áßá äéÜñêåéá 1-6 ãýñùí."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Åíåñã/Áðåíåñã ïìß÷ëçò ðïëÝìïõ"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4948,11 +4965,11 @@ msgstr ""
 "ôõ÷þí íÝåò ðüëåéò ,ìïíÜäåò Þ áëëáãÝò óôï Ýäáöïò ðëáêéäßùí ðïõ äåí åßíáé "
 "ðáñáôçñÞóéìá."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "ÂáóéêÞ ðéèáíüôçôá ãéá äéðëùìÜôåò êáé êáôáóêüðïõò íá ðåôý÷ïõí."
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4961,19 +4978,19 @@ msgstr ""
 "Ç ðéèáíüôçôá åíüò êáôáóêüðïõ íá åðéóôñÝøåé åðéôõ÷þò áðü ìéá áðü áðïóôïëÞ êáé "
 "ç âáóéêÞ ðéèáíüôçôá åðéôõ÷ßáò äéðëùìáôþí êáé êáôáóêüðùí."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Åíåñã/Áðåñã äéáóôçìéêÞò êïýñóáò"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Áí ôåèåß óå 1 ,ôüôå ïé ðáß÷ôåò ìðïñïýí íá ÷ôßóïõí äéáóôçìüðëïéá"
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "ÅëÜ÷éóôïò áñéèìüò ðüëåùí ãéá åìöýëéï ðüëåìï"
 
-#: server/settings.c:790
+#: server/settings.c:781
 #, fuzzy
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
@@ -4984,11 +5001,11 @@ msgstr ""
 "ðüëåéò êáé ç ðñùôåýïõóÜ ôïõ áé÷ìáëùôéóôåß. Áí áõôÞ ç åðéëïãÞ ôåèåß óôçí "
 "ìÝãéóôÞ ôçò ôéìÞ ôüôå áðåíåñãïðïéïýíôáé ðëÞñùò ïé åìöýëéïé ðüëåìïé."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Ãýñïé êáôÜ ôïõò ïðïßïõò ÷Üíåôáé åðáöÞ ìå ðáß÷ôç"
 
-#: server/settings.c:800
+#: server/settings.c:791
 #, fuzzy
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
@@ -4999,12 +5016,12 @@ msgstr ""
 "ãýñï ðïõ óõíáíôÞèçêáí ãéá ôåëåõôáßá öïñÜ, áêüìá êáé áí äåí Ý÷ïõí ðñåóâåßá. "
 "Áí ôåèåß óå 0 ôüôå ïé ðáß÷ôåò ðñÝðåé íá Ý÷ïõí ðñåóâåßá ãéá íá óõíáíôçèïýíå. "
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Åðáíá÷ôßóéìï ðáëáôßïõ áí êáôáêôçèåß "
 
-#: server/settings.c:811
+#: server/settings.c:802
 #, fuzzy
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
@@ -5016,11 +5033,11 @@ msgstr ""
 "áõôüìáôá ÷ùñßò êüóôïò óå êÜðïéá ôõ÷áßá åðéëåãìÝíç ðüëç. Áõôü åßíáé óçìáíôéêü "
 "áöïý èá áãíïçèåß ç ðñïáðáéôïýìåíç ôå÷íïëïãßá ãéá ôï ÷ôéóéìü ôïõ. "
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Åíåñã/Áðåíåñ öõóéêÜ ïíüìáôá ðüëåùí"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -5028,11 +5045,11 @@ msgstr ""
 "Áí åíåñãïðïéçèåß ôüôå ôá ðñïôåéíüìåíá ïíüìáôá ðüëåùí èá êáèïñéóèïýí áíÜëïãá "
 "ìå ôï Ýäáöïò ðïõ ôéò ðåñéâÜëëåé."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Ðáß÷ôåò ðïõ ïé ðáß÷ôåò åðéôñÝðïíôáé íá ðÜñïõí"
 
-#: server/settings.c:835
+#: server/settings.c:826
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
@@ -5101,11 +5118,11 @@ msgstr ""
 "4 = ÅëåêôÞò äåí åðéôñÝðåôáé, ðáñáôçñçôÝò åðéôñÝðïíôáé.\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Êáôáðüóï êáôÜóôáóç ÔÍ åíåñã/áðåíåñ ìå ôç óýíäåóç"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5113,24 +5130,27 @@ msgstr ""
 "Áí ôåèåß óå 1, ôüôå ç êáôÜóôáóç ÔÍ áðåíåñãïðïéåßôáé üôáí Ýíáò ðáß÷ôçò "
 "óõíäÝåôáé êáé åíåñãïðïéåßôáé üôáí áðïóõíäÝåôáé."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "×ñüíïò ðïõ ôåëåéþíåé ôï ðáé÷íßäé"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Ôï ðáé÷íßäé èá ôåëåéþóåé ôï ôÝëïò áõôïý ôïõ Ýôïõò."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "ÌÝãéóôç äéÜñêåéá óå äåõôåñüëåðôá êÜèå ãýñïõ"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Áí äåí Ý÷ïõí üëïé ïé ðáß÷ôåò ðáôÞóåé ôï êïõìðß \"ÔÝëïò ãýñïõ\" ðñßí "
 "ôåëåßùóåé áõôüò ï ÷ñüíïò ôüôå ï ãýñïò ôåëåßùíåé áõôüìáôá. ÌçäÝí óçìáßíåé üôé "
@@ -5138,11 +5158,11 @@ msgstr ""
 "ãéá ôÝóô. ×ñçóéìïðïßçóå áõôÞ ôçí ñýèìéóç ìáæß ìå ôçí åíôïëÞ "
 "\"áýîçóç×ñïíéêïýÏñßïõ\" ãéá íá áðïêôÞóåéò Ýíá äõíáìéêü ÷ñïíüìåôñï."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "×ñïíéêü üñéï í äåõôåñïëÝðôùí ôïõëÜ÷éóôïí üôáí ìåôáêéíåßôáé ï å÷èñüò"
 
-#: server/settings.c:896
+#: server/settings.c:889
 #, fuzzy
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
@@ -5151,11 +5171,11 @@ msgstr ""
 "¼ðïéá ÷ñïíéêÞ óôéãìÞ ìåôáêéíåßôáé ìéá ìïíÜäá óôçí èÝá å÷èñéêïý ðáß÷ôç, ï "
 "åíáðïìåßíùí ÷ñüíïò ôßèåôáé óå áõôÞ ôçí ôéìÞ áí Þôáí ÷áìçëüôåñïò. "
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Áí èá åðéôñáðïýí öÜóåéò ôáõôü÷ñïíïõ ðáé÷íéäéïý."
 
-#: server/settings.c:906
+#: server/settings.c:899
 #, fuzzy
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
@@ -5164,12 +5184,12 @@ msgstr ""
 "Áí ôåèåß óå áëçèÝò ôüôå üëåò ïé êéíÞóåéò ôùí ðáé÷ôþí èá ãßíïõí ôáõôü÷ñïíá, "
 "åíþ åáí åßíáé øåõäÝò ôüôå ïé ðáß÷ôåò èá ìåôáêéíçèïýí ìå ôç óåéñÜ."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr ""
 "Äåõôåñüëåðôá ðïõ åðéôñÝðåôáé ç óýíäåóç äéêôýïõ ôïõ ðåëÜôç íá ìðëïêáñéóôåß"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5179,11 +5199,11 @@ msgstr ""
 "ôçí ôéìÞ ôüôå êëåßíåé ç óýíäåóç. ÌçäÝí óçìáßíåé üôé äåí õðÜñ÷åé üñéï (áí êáé "
 "óõíäÝóåéò èá áðïóõíäÝïíôáé áõôüìáôá ôåëéêÜ)."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "ÌÝã äåõô. ãéá Üäåéáóìá äéêôõáê ìðáöåñ"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5193,11 +5213,11 @@ msgstr ""
 "ôùí óõíäÝóåùí ôùí ðåëáôþí ãéá íá îåìðëïêáñéóôïýí. ÌçäÝí óçìáßíåé üôé äåí èá "
 "ðåñéìÝíåé êáèüëïõ."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Äåõô. áíÜìåóá óå PINGs"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5205,22 +5225,22 @@ msgstr ""
 "Ï civserver (civ-åîõðçñåôçôÞò) èá êÜíåé äåéãìáôïëçøßá æçôþíôáò PING êÜèå "
 "öïñÜ ðïõ ôåëåéþíåé áõôÞ ç ðåñéüäïò."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "×ñüíïò äéáêïðÞò ðåëÜôç"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "¸áí ï ðåëÜôçò äåí áðáíôÞóåé ìå Ýíá PING ìÝóá óå áõôüí ôï ÷ñüíï ï ðåëÜôåò "
 "áðïóõíäÝåôáé."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Ðáé÷íßäé ìå ìðëïêÜñéóìá-ãýñùí"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5229,11 +5249,11 @@ msgstr ""
 "Ý÷ïõí ôåëåéþóåé ôïõò ãýñïõò ôïõò, óõìðåñéëáìâáíïìÝíïõ ôùí áðïóõíäåäåìÝíùí "
 "ðáé÷ôþí."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Ðáé÷íßäé ãýñùí óôáèåñÞò äéÜñêåéáò"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5242,11 +5262,11 @@ msgstr ""
 "ÅÜí ôåèåß óå 1 ôüôå ï ãýñïò äåí èá ôåñìáôßóåé ðáñÜ áöïý ôåëåéþóåé ôï ÷ñïíéêü "
 "üñéï , áêüìá êáé áí üëïé ïé ðáß÷ôåò Ý÷ïõí ðáôÞóåé \"ÔÝëïò ãýñïõ\" ."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Ôé åßíáé ìÝóá óôçí äçìïãñáöéêÞ áíáöïñÜ"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5286,11 +5306,11 @@ msgstr ""
 "    b = ðñïâïëÞ óôÞëç \"êáëýôåñï Ýèíïò\" \n"
 "Ç óåéñÜ ôùí ãñáììÜôùí äåí Ý÷åé óçìáóßá áëëÜ ôï áí åßíáé êåöáëáßá Ý÷åé."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Ãýñïé áíÜ áõôüìáôç áðïèÞêåõóç"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5298,11 +5318,11 @@ msgstr ""
 "Ôï ðáé÷íßäé èá áðïèçêåõôåß áõôüìáôá áíÜ ôüóïõò ãýñïõò. ÌçäÝí óçìáßíåé üôé "
 "äåí ãßíïíôáé áõôüìáôåò áðïèçêåýóåéò."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Åðßðåäï óõìðßåóçò áðïèçêåõìÝíïõ ðáé÷íéäßïõ"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 #, fuzzy
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
@@ -5314,11 +5334,11 @@ msgstr ""
 "üìùò ðåñéóóüôåñï, Áí ôï ìÝãéóôï åßíáé ìçäÝí ôüôå ï åîõðçñåôçôÞò äåí "
 "ìåôáãëùôßóôçêå ìå ôç zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Ðñüèåìá ïíüìáôïò áõôüìáôçò áðïèÞêåõóçò"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5326,11 +5346,11 @@ msgstr ""
 "Áõôüìáôá áðïèçêåõìÝíá ðáé÷íßäéá èá Ý÷ïõí ôï üíïìá \"<ðñüèåìá><Ýôïò>.sav\". Ç "
 "åðéëïãÞ áõôÞ êáèïñßæåé ôï ôìÞìá <ðñüèåìá>."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Åáí èá êáôáãñÜöïíôáé ôá óôáôéóôéêÜ ðáé÷ôþí"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5344,7 +5364,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr ""
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr ""
@@ -5475,106 +5495,106 @@ msgstr "
 msgid "Game saved as %s"
 msgstr "Ôï ðáé÷íßäé óþèçêå óáí %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Ôï ðáé÷íßäé ôñÝ÷åé Þäç."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%s Ý÷áóå Ýëåã÷ï cmdlevel êáôÜ ôçí åêêßíçóç ôïõ ðáé÷íéäßïõ. ×ñçóéìïðïßçóå "
 "øçöïöïñßá áðü äþ êáé ðÝñá."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Áñ÷ßæåé ôï ðáé÷íßäé. "
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "áßôçóç ãéá áãíþóôç áíáöïñÜ (ôýðïõ %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Ðñïåéäïðïßçóç: áðïññßðôåôáé ï ðáëéüò ðåëÜôçò %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "¸ëáâá ðáêÝôï ôýðïõ  %d áðü íåêñü Þ ðáñáêïëïõèçôÝï ðáß÷ôç"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "[áñáêáëþ åðéëÝîôå Ýíá ìç êåíü üíïìá"
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Áõôü ôï Ýèíïò ÷ñçóéìïðïéåßôáé Þäç."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "¶ëëïò ðáß÷ôçò Ý÷åé ôï üíïìá '%s'.Ðáñáêáëþ åðéëÝîôå Üëëï üíïìá."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Ðáñáêáëþ åðéëÝîôå Ýíá üíïìá ðïõ íá ðåñéÝ÷åé ìüíï ASCII ÷áñáêôÞñåò."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "ôï %s Ýèíïò äåí åßíáé äéáèÝóéìï óå áõôü ôï óåíÜñéï."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "ôï %s Ýèíïò ÷ñçóéìïðïéåßôáé Þäç."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s åßíáé ï %s çãÝôçò %s"
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr ""
 "ÐåñéìÝíïíôáò íá áñ÷ßóåé ôï ðáé÷íßäé: %d áðü ôïõò %d ðáß÷ôåò åßíáé Ýôïéìïé íá "
 "áñ÷ßóïõí. "
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s ðñïóôÝèçêå óáí  %s åðéðÝäïõ ðáß÷ôçò åëåã÷üìåíïò áðü ÔÍ."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Ðáß÷ôçò %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s êõâåñíÜåé ôïõò %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr ""
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Ôï ðáé÷íßäé ôåëåßùóå..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Ôþñá áðïäÝ÷ïìáé óõíäÝóåéò ðåëÜôç."
 
@@ -5595,7 +5615,7 @@ msgstr ""
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5769,7 +5789,7 @@ msgstr ""
 msgid "Removed player %s from the game."
 msgstr ""
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5841,702 +5861,726 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr ""
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr ""
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr ""
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr ""
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 #, fuzzy
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "timeoutincrease <ãýñïò> <áýîçóç-ãýñïõ> <ôéìÞ> <ðïëëáðëáóéáóôÞò-ôéìÞò>"
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr ""
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 #, fuzzy
 msgid "Option:"
 msgstr "ÅðéëïãÝò"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr ""
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr ""
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr ""
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr ""
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr ""
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr ""
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr ""
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr ""
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr ""
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr ""
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr ""
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr ""
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr ""
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr ""
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr ""
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr ""
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr ""
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr ""
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr ""
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr ""
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr ""
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr ""
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr ""
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr ""
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr ""
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 #, fuzzy
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "vote yes|no [øÞöïò áñéèìüò]"
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr ""
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr ""
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr ""
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr ""
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr ""
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr ""
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr ""
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr ""
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr ""
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr ""
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr ""
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr ""
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr ""
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr ""
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr ""
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr ""
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr ""
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+msgid "You cannot take a new player at this time."
+msgstr ""
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr ""
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 #, fuzzy
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "observe [üíïìá-óýíäåóçò] [üíïìá-ðáß÷ôç]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 #, fuzzy
 msgid "Usage: observe [player-name]"
 msgstr "remove <üíïìá-ðáß÷ôç>"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr ""
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr ""
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr ""
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr ""
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 #, fuzzy
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "take [ïíïìá-óýíäåóçò] <üíïìá-ðáß÷ôç>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 #, fuzzy
 msgid "Usage: take <player-name>"
 msgstr "create <üíïìá-ðáß÷ôç>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 #, fuzzy
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "take [ïíïìá-óýíäåóçò] <üíïìá-ðáß÷ôç>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
-msgstr ""
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
+msgstr "%s ÷Üèçêáí ìáæß ìå ôïí Ýëåã÷ï ôçò %s."
 
-#: server/stdinhand.c:2965
+#: server/stdinhand.c:3024
 #, c-format
-msgid "There is no free player slot for %s"
+msgid "There is no free player slot for %s."
 msgstr ""
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, fuzzy, c-format
 msgid "being detached from %s."
 msgstr "%s áðïêôÞèçêå áðü %s!"
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
-msgstr ""
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
+msgstr "ï %s êõâåñíÜåé ôþñá ôïõò %s óáí %s."
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr ""
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr ""
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr ""
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr ""
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr ""
 
-#: server/stdinhand.c:3088
-#, c-format
-msgid "%s failed to attach to any player"
-msgstr ""
+#: server/stdinhand.c:3147
+#, fuzzy, c-format
+msgid "%s failed to attach to any player."
+msgstr "áðïêüëëçóç áðü Ýíá ðáß÷ôç"
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 #, fuzzy
 msgid "Usage: detach <connection-name>"
 msgstr "detach <üíïìá-óýíäåóçò>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr ""
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr ""
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr ""
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr ""
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr ""
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr ""
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr ""
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr ""
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr ""
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr ""
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr ""
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr ""
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr ""
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr ""
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr ""
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr ""
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr ""
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+msgid "Not enough human players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+msgid "No players, game will not start."
+msgstr ""
+
+#: server/stdinhand.c:3892
 msgid "Not enough nations for all players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "¼ëïé ïé ðáß÷ôåò åßíáé Ýôïéìïé, áñ÷ßæåé ôï ðáé÷íßäé."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr ""
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr ""
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6575,124 +6619,124 @@ msgstr ""
 "  save   - ãéá íá óþóåé ôï ôñÝ÷ùí ðáé÷íßäé\n"
 "  quit    -  ãéá Ýîïäï"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 #, fuzzy
 msgid "Command:"
 msgstr "Êïììïõíéóìüò"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr ""
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr ""
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr ""
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr ""
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr ""
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr ""
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr ""
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr ""
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr ""
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ""
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ""
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, fuzzy, c-format
 msgid "?clistmore:, %s"
 msgstr "Åéäéêïß ðüñïé"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ""
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ""
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr ""
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr ""
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr ""
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr ""
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr ""
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr ""
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr ""
 
@@ -6761,17 +6805,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr ""
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr ""
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr ""
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr ""
@@ -7278,20 +7322,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr ""
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr ""
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr ""
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr ""
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr ""
@@ -7377,120 +7421,121 @@ msgstr ""
 msgid "Cannot find audio file %s"
 msgstr "Äåí ìðüñåóá íá öïñôþóù áñ÷åßï óåíáñßïõ óõíüëïõ-êáíüíùí \"%s\"."
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr ""
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d ÷ñõóÜ áíÜ ãýñï"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d ãýñïò"
 msgstr[1] "%3d ãýñïé"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "ðïôÝ"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, fuzzy, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%d/ãýñï"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, fuzzy, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%d/%d %d ãýñïé"
 msgstr[1] "%d/%d %d ãýñïé"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Áðáñ÷áéùìÝíï"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "×ôßæù"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "ÌåãÜëï Èáýìá"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Ìéêñü Èáýìá"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/ãýñï"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Ðïëßôåò\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : öüñïé áðü åìðüñéï\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : ÅìðïñéêÞ äéáäñïìÞ ìå  %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : ×ôßæåôáé  äåêÜôç\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -7602,8 +7647,8 @@ msgid "Best defending units"
 msgstr "Êáëýôåñåò áìõíôéêÝò ìïíÜäåò"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7781,8 +7826,8 @@ msgstr "?pollution [short]:
 msgid "?cma:Governor"
 msgstr "?cma:ÊõâåñíÞôçò"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -8038,22 +8083,22 @@ msgid ""
 "%d times"
 msgstr ""
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 #, fuzzy
 msgid "novice"
 msgstr "áñ÷Üñéï"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 #, fuzzy
 msgid "easy"
 msgstr "åýêïëï"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 #, fuzzy
 msgid "normal"
 msgstr "êáíïíéêü"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 #, fuzzy
 msgid "hard"
 msgstr "äýóêïëï"
@@ -8063,32 +8108,32 @@ msgstr "
 msgid "experimental"
 msgstr "ðåéñáìáôéêü"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Åêêßíçóç åîõðçñåôçôÞ..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Äåí ìðüñåóá íá áñ÷ßóù åîõðçñåôçôÞ."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "ÐñÝðåé íá ôïí îåêéíÞóåéò ìüíïò óïõ. Óõãíþìç..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Äåí ìðüñåóá íá óõíäåèþ ìå ôïí åîõðçñåôçôÞ."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Ðéèáíþò äåí ìðïñïýìå íá ôï îåêéíÞóïõìå áðü åäþ."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr ""
 "¸÷ïõìå ôïí Ýëåã÷ï ôïõ åîõðçñåôçôÞ (ðåßñáãìá åðéðÝäïõ ðñüóâáóçò åíôïëþí)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 "Äåí ìðïñïýìå íá ðÜñïõìå ôïí Ýëåã÷ï ôïõ åîõðçñåôçôÞ, ðñïóðÜèåéá åêôÝëåóÞò ôïõ."
@@ -8192,27 +8237,27 @@ msgstr ""
 "Áðáéôåß Ýíá åëÜ÷éóôï ìÝãåèïò áðü %d.\n"
 "\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "ÅðéôñÝðåé %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "ÅðéôñÝðåé %s (ìå %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Ðïôáìïß"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Óõãíþìç, äåí õðÜñ÷åé èÝìá âïÞèåéáò ãéá %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8223,7 +8268,7 @@ msgstr ""
 "ÁõôÞ ç óåëßäá äçìéïõñãÞèçêå áõôüìáôá.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
@@ -8232,59 +8277,59 @@ msgstr ""
 "Áðáéôåß ôï êôßñéï %s .\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Ç áíáêÜëõøç ôïõ  %s èá êÜíåé áðáñ÷áéùìÝíï ôï %s .\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 "* ÅðéôñÝðåé óå üëïõò ôïõò ðáß÷ôåò ìå ãíþóç %s íá ÷ôßóïõí ìïíÜäåò %s .\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* ÅðéôñÝðåé %s (ìå %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* ÅðéôñÝðåé %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, fuzzy, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Ìðïñåß íá ÷ôéóôåß ìüíï ìå êõâÝñíçóç %s.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Ìðïñåß íá ÷ôéóôåß ìüíï ìå êõâÝñíçóç %s.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Äåí ìðïñåß íá ÷ôéóôåß óå ðüëåéò.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Äåí Ý÷åé ðüëç áíáöïñÜò.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Áí ÷áèåß áõôÞ ç ìïíÜäá èá ÷áèåß ôï ðáé÷íßäé!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* ÊÜèå ðáß÷ôçò ìðïñåß íá Ý÷åé ìüíï ìéá ìïíÜäá áõôïý ôïõ ôýðïõ.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Áðáéôåß %d ðëçèõóìü ãéá íá ÷ôéóôåß.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, fuzzy, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
@@ -8293,7 +8338,7 @@ msgstr[0] ""
 msgstr[1] ""
 "* Äåí ìðïñåß íá ìåôáöÝñåé êáé íá áíåöïäéÜóåé %d ìïíÜäåò áðü ôéò êëÜóåéò:\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, fuzzy, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -8302,7 +8347,7 @@ msgstr[0] ""
 msgstr[1] ""
 "* Äåí ìðïñåß íá ìåôáöÝñåé êáé íá áíåöïäéÜóåé %d ìïíÜäåò áðü ôéò êëÜóåéò:\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, fuzzy, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
@@ -8311,7 +8356,7 @@ msgstr[0] ""
 msgstr[1] ""
 "* Äåí ìðïñåß íá ìåôáöÝñåé êáé íá áíåöïäéÜóåé %d ìïíÜäåò áðü ôéò êëÜóåéò:\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8320,211 +8365,211 @@ msgstr ""
 "óôü÷ï êáé ðñÝðåé íá åßíáé 9 ôåôñÜãùíá [óå áðüóôáóç Ìáí÷Üôáí] áðü ôçí ðüëç "
 "áíáöïñÜò ôçò ìïíÜäáò)\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr ""
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr ""
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr ""
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Äåí ìðïñïýí íá ÷ôéóôïýí äñüìïé êáé óéäçñüäñïìïé .\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Ìðïñåßò íá ÷ôßóåéò ïñõ÷åßá óôï ôåôñÜãùíï.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Ìðïñåßò íá ÷ôßóåéò ýäñåõóç óå ôåôñÜãùíá .\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr ""
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr ""
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 #, fuzzy
 msgid "* Can build airbases.\n"
 msgstr "* Ìðïñåßò íá ÷ôßóåéò ïñõ÷åßá óôï ôåôñÜãùíï.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr ""
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr ""
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr ""
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr ""
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr ""
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr ""
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr ""
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 #, fuzzy
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "  * Êáôáíáëþíåôáé óôçí åêôÝëåóç ôçò åðßèåóçò .\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr ""
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr ""
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr ""
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr ""
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr ""
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr ""
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr ""
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
 "at sea.\n"
 msgstr ""
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, fuzzy, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* Ç áíáêÜëõøç ôïõ  %s èá êÜíåé áðáñ÷áéùìÝíï ôï %s .\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr ""
@@ -8533,115 +8578,115 @@ msgstr ""
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr ""
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr ""
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr ""
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
 "will require %d bulbs to complete."
 msgstr ""
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr ""
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr ""
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr ""
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, fuzzy, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Óïõ åðéôñÝðåé íá ÷ôßóåéò  %s.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, fuzzy, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Óïõ åðéôñÝðåé íá ÷ôßóåéò  %s.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr ""
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr ""
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr ""
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr ""
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr ""
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8652,7 +8697,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8660,48 +8705,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8709,23 +8754,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8736,7 +8781,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8744,60 +8789,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr ""
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr ""
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8805,7 +8850,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8813,37 +8858,37 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, fuzzy, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* %s ðáñáãùãÞ èá áíôÝîåé êÜðïéá áðüâëçôá.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* %s ðáñáãùãÞ èá áíôÝîåé êÜðïéá áðüâëçôá.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* %s ðáñáãùãÞ èá áíôÝîåé êÜðïéá ìéêñÞ ðïóüôçôá áðü áðüâëçôá.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
@@ -8851,37 +8896,37 @@ msgstr ""
 "ðñùôåýïõóá. \n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 "* %s áðüâëçôá èá áõîçèïýí áíÜëïãá ìå ôçí áðüóôáóç áðü ôçí ðñùôåýïõóá. \n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 "* %s áðüâëçôá èá áõîçèïýí áñãÜ áíÜëïãá ìå ôçí áðüóôáóç áðü ôçí ðñùôåýïõóá. \n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Óïõ åðéôñÝðåé íá ÷ôßóåéò  %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr ""
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ""
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d äõóôõ÷éóìÝíïé"
@@ -9273,16 +9318,16 @@ msgstr "
 msgid "Start of turn %d"
 msgstr "Áñ÷Þ %d ãýñïõ"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "ÔÍ åßíáé ôþñá %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "Áíïé÷ôü"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "Êëåéóôü"
 
@@ -9314,13 +9359,13 @@ msgstr "?Player:
 msgid "Username"
 msgstr "¼íïìá ÷ñÞóôç"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Óçìáßá"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9334,7 +9379,7 @@ msgstr "
 msgid "Score"
 msgstr "Âáèìïëïãßá"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "ÏìÜäá"
 
@@ -9367,36 +9412,36 @@ msgstr "?Player_dlg:
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Äåí ìðïñåßò íá ðïõëÞóåéò õðïäïìÝò."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "ÐïõëÞèçêå %d %s ãéá %d ÷ñõóÜ"
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "ÊáíÝíá %s äåí ìðüñåóå íá ðïõëçèåß"
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Äåí ìðïñåßò íá áðïëýóåéò ìïíÜäåò"
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s äåí ìðïñåß íá áðïëõèåß"
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Áðïëýèçêå %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "ÊáíÝíá %s äåí åãêáôáëåßöèçêå."
@@ -9705,64 +9750,69 @@ msgstr "
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Öïñ: %d Áíó: %d Åðó: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Ìåôáêéíåßôáé: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Ìåôáêéíåßôáé: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Êëßê ãéá ðåñéóóüôåñåò ðëçñïöïñßåò)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s ¶íèñùðïé"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Ãýñïò: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "×ñõóüò: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Êáèáñü åéóüäçìá: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Tax rates: ×ñõóüò:%d%% ÁíÝóåéò:%d%% ÅðéóôÞìç:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "ÅñåõíÜôáé %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Ðéèáíüôçôá ðáãêüóìéáò õðåñèÝñìáíóçò: %d%% (%+d%%/ãýñï)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Ðéèáíüôçôá ðõñçíéêïý ÷åéìþíá: %d%% (%+d%%/ãýñï)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Ðïëßôåõìá: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9770,55 +9820,55 @@ msgstr[0] "%d 
 msgstr[1] "%d ìïíÜäåò"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Ãýñïé ãéá óôü÷ï: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Ãýñïé ãéá óôü÷ï: %d ìÝ÷ñé %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d ìïíÜäá åðéëåãìÝíç"
 msgstr[1] "%d ìïíÜäåò åðéëåãìÝíåò"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Êáìßá ìïíÜäá åðéëåãìÝíç."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "¶ëëïé: %d ðïëßôåò,%d óôñáôéùôéêïß"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "¶ëëïé: %d ðïëßôåò"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "¶ëëïé: %d óôñáôéùôéêïß"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Êáìßá ìïíÜäá ãéá áíáâÜèìéóç!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Êáìßá áðï áõôÝò ôéò ìïíÜäåò äåí áíáâáèìßæåôáé."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9833,72 +9883,72 @@ msgstr[1] ""
 "ÁíáâÜèìéóç  %d ìïíÜäùí ãéá %d ÷ñõóÜ;\n"
 "Ôï èçóáõñïöõëÜêéï ðåñéÝ÷åé %d ÷ñõóÜ."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Äåß÷íåé ôçí ðñïïäü óïõ óôçí áíáæÞôçóç ôçò ôñÝ÷ïõóáò ôå÷íïëïãßáò"
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "êáíÝíáò óôü÷ïò Ýñåõíáò"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr ""
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Ðïóïóôü ìüëõíóçò: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Ðéèáíüôçôá êáôáóôñïöéêÞò èÝñìáíóçò êÜèå ãýñï: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Äåß÷íåé ôçí ðñüïäï ôïõ ðõñçíéêïý ÷åéìþíá:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Ðïóïóôü ðõñçí.êáôáë:%d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Ðéèáíüôçôá êáôáóôñïöéêïý ÷åéìþíá êÜèå ãýñïõ: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Äåß÷íåé ôçí ôùñéíÞ óïõ êõâÝñíçóç:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Ðëçèõóìüò:       %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "ÓõíôÞñçóç: %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "ÅíÝñãåéá:        %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9906,96 +9956,96 @@ msgstr[0] "
 msgstr[1] "ÌÜæá:\t\t%5d ôüíïé"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "×ñüíïò ôáîéäßïõ: %5.1f ÷ñüíéá"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "×ñüíïò ôáîéäßïõ:    ;   "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Ðéèáíüôçôá åðéô.:%5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "×ñüíïò Üöéîçò: %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:êëåéóôü"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02dä"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dë %02dä"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?þñåò/ëåðôÜ:%02dù %02dë"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr ""
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr ""
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr ""
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s ôùí %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "ÐáñáôçñçôÞò: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "ÊôÞñéá: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "ÊáíÝíá. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr ""
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Èáýìáôá: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, fuzzy, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Ðüëåéò: %d óýíïëï, %d ðÜíù áðü üñéï áðü  %d ðüëåéò.\n"
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10003,7 +10053,7 @@ msgstr[0] "%d 
 msgstr[1] "%d éêáíïðïéçìÝíïé ðñßí áðü ðïéíÞ áðü "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10011,16 +10061,16 @@ msgstr[0] "%d 
 msgstr[1] "%d åðéðñüóèåôïé äõóôõ÷éóìÝíïé ðïëßôåò."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Óôñáôéùôéêüò íüìïò óå éó÷ý ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "ü÷é ìÝãéóôï,"
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10028,20 +10078,20 @@ msgstr[0] "%d 
 msgstr[1] "%d ìïíÜäåò ìÝãéóôï,"
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d áíÜ ìïíÜäá). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "ÓôñáôéùôéêÝò ìïíÜäåò óôï ðåäßï ßóùò ðñïêáëÝóïõí äõóôõ÷ßá"
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "ÓôñáôéùôéêÝò ìïíÜäåò äåí Ý÷ïõí åðßäñáóç óôçí åõôõ÷ßá"
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "ÁíÝóåéò: %d óýíïëï"
@@ -10086,12 +10136,12 @@ msgstr ""
 "Ï êõâåñíÞôåò Ý÷åé ìðåñäåõôåß áó÷ïëïýìåíïò ìå %s. ºóùò èÝëåéò íá ôï ñßîåéò "
 "ìéá ìáôéÜ."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "êáìßá"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "ñõèìéæüìåíï"
 
@@ -10145,11 +10195,13 @@ msgid "Ooops..."
 msgstr "¼ðá..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "ÁõôÞ ç ìïíÜäá äåí ìðïñåß íá äùñïäïêçèåß!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10166,6 +10218,7 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10207,6 +10260,7 @@ msgstr "_
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Óôç äéáêñéôéêüôçôá ôïõ Êáôáóêüðïõ"
 
@@ -10231,12 +10285,13 @@ msgstr "_
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "ÐáñáãùãÞ ðüëçò"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Äåí ìðïñåßò íá õðïêéíÞóåéò áíôáñóßá óôçí %s"
@@ -10248,6 +10303,7 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10264,6 +10320,7 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10273,6 +10330,7 @@ msgstr ""
 "Ôï èçóáõñïöõëÜêéï ðåñéÝ÷åé %d ÷ñõóÜ."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10342,11 +10400,13 @@ msgid "Subvert Enemy Unit"
 msgstr "ÖÝñå ìå ôï ìÝñïò óïõ å÷èñéêÞ ìïíÜäá"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Êýñéå, ï äéðëùìÜôçò ðåñéìÝíåé ôéò äéáôáãÝò óáò"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Êýñéå, ï êáôÜóêïðïò ðåñéìÝíåé ôéò äéáôáãÝò óáò"
@@ -10447,7 +10507,7 @@ msgstr "
 msgid "_Overview"
 msgstr "_ÃåíéêÞ åéêüíá"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10472,11 +10532,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d ãýñïé"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Áãüñáóå"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "ÐáñáãùãÞ"
@@ -10596,7 +10656,7 @@ msgstr "
 msgid "Present units %d"
 msgstr "Ðáñüíôåò %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "_ÊÝíôñÜñéóå"
 
@@ -10685,32 +10745,32 @@ msgstr "
 msgid "What should we rename the city to?"
 msgstr "Ðïéü èá åßíáé ôï íÝï üíïìá ôçò ðüëçò;"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "¶_ëëáîå"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Ðñüóèåóå _Ðñþôç"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Ðñüóèåóå _Åðüìåíç"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Ðñüóèåóå _Ôåëåõôáßá"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "ÅðÝëå_îå"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "_Äéðëùìáôßá"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10720,13 +10780,13 @@ msgstr "_
 msgid "Cities"
 msgstr "Ðüëåéò"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "_Óýíäåóå"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10735,86 +10795,91 @@ msgstr "_
 msgid "Improvements"
 msgstr "ÕðïäïìÝò"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Èáýìáôá"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "¼ëåò ïé ðüëåéò"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Êáìßá ðüëç"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "ÁíôÝóôñåøå åðéëïãÞ"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "ÌïíÜäåò õðü ðáñáãùãÞ"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Õðïäïìþí õðü ðáñáãùãÞ"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Èáýìáôá õðü ðáñáãùãÞ"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "ÌïíÜäá õðü ðáñáãùãÞ"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "ÕðïäïìÞ õðü ðáñáãùãÞ"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Èáýìá õðü ðáñáãùãÞ"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "ÐáñáëéáêÝò ðüëåéò"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 #, fuzzy
 msgid "Same Island"
 msgstr "ºäéï Íçóß"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Óõíôçñïýìåíåò"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Ðáñüíôåò"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "ÕðïäïìÝò óôçí ðüëç"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Èáýìáôá óôçí ðüëç"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "ÄéáèÝóéìåò ìïíÜäåò"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "ÄéáèÝóéìåò õðïäïìÝò"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "ÄéáèÝóéìá èáýìáôá"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Óõíïëéêü êüóôïò: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10880,127 +10945,127 @@ msgstr "
 msgid "Remove this preset?"
 msgstr "Íá áöáéñåèåß áõôüò ï êõâåñíçôéêüò óôü÷ïò;"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "ÐÞãáéíå óå ðåñéï÷Þ"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "_Åñåýíçóå ôçí ðüëç"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "ËÝò üôé èÝëåéò åðáíÜóôáóç;"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "ÅðáíÜóôáóç!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Ôß íá ëåçëáôçèåß"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "ÅðÝëåîå ôß íá ëåçëáôçèåß:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "ÌïíÜäá"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "¼íïìá"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "ÅðéëïãÞ ìïíÜäáò"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_¸ôïéìåò üëåò"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "_Öñïõñüò áäñáíÞò"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_¸èíç"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Ðïéü Ýèíïò èá åßóáé;"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "ÅðÝëåîå Ýèíïò"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Ôõ÷áßï Ýèíïò"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "ÄéÜëåîå Ýíá Ýèíïò"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Éäéüôçôåò"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_ÇãÝôçò"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Ãõíáßêá"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_¶íäñáò"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "_Óôõë ðüëçò"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "Óôñáôïëïãßá"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "ÐñÝðåé íá åðéëÝîåéò öýëï"
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "ÐñÝðåé íá åðéëÝîåéò óôõë ðüëçò."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "ÐñÝðåé íá ôõðþóåéò Ýíá íüìéìï üíïìá."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "ÁíáâÜèìéóå ìïíÜäá!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11264,62 +11329,68 @@ msgstr ""
 msgid "Not _ready"
 msgstr "¼÷é Ý_ôïéìïò"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_¸ôïéìïò"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Åêêßíçóç"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "ÅðÝëåîå áõôüí ôïí ðáß÷ôç"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "ÄéÜëåîå _Åèíïò"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_Ðáñáêïëoýèçóå"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "_Ìçí ðáñáêïëïõèåßò"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<ÔÍ>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<Áñ÷Üñéá ÔÍ>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 #, fuzzy
 msgid "<Easy AI>"
 msgstr "<Åýêïëç ÔÍ>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<Äýóêïëç ÔÍ>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<ÓêëçñÞ ÔÍ>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Ôõ÷áßï"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Ðáñáêïëïýèçóå"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "ÁðïêïììÝíï"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Åßóáé óßãïõñïò üôé èÝëåéò íá ôåñìáôßóåéò;"
 
@@ -12235,220 +12306,220 @@ msgstr "_
 msgid "Connect to Gaming _Zone"
 msgstr "Óýíäåóç óå æþíç ðáé÷íéäßùí"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Ôá óõíèçìáôéêÜ äåí ôáéñéÜæïõí, ðáñáêáëþ åéóÞãáãå óõíèçìáôéêü"
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "¼íïìá åîõðçñåôçôÞ"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Èýñá"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "¸êäïóç"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "ÊáôÜóôáóç"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Ðáß÷ôåò"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Ó÷üëéï"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Ôïðéêü _äßêôõï"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "_ÌåôÜÅîõðçñåôçôÞò äéáäéêôýïõ"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_ÕðïëïãéóôÞò:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Èýñá"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Åßóïäïò"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Óõí_èçìáôéêü"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Åðé_âåâáßùóå óõíèçìáôéêü"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "Ó_ýíäåóç"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "¼íïìá óýíäåóçò: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "¼íïìá ðáß÷ôç: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "ÕðïëïãéóôÞò: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Ðëçñïöïñßåò ðáß÷ôç/óýíäåóçò"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s ðëçñïöïñßåò"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "ÊÜíå ðáß÷ôç åíåñãü"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "ÅðÝëåîå Ýèíïò"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "ÐáñáôÞñçóå áõôüí ôïí ðáß÷ôç"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "ÅðÝëåîå áõôüí ôïí ðáß÷ôç"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "ÄéÝêïøå óýíäåóç"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "¶ëëáîå ÔÍ ðáß÷ôç"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Áöáßñåóå ðáß÷ôç"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Äþóå ðñüóâáóç óå ðëçñïöïñßá"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 #, fuzzy
 msgid "Give ctrl access"
 msgstr "Äþóå ðñüóâáóç åëÝã÷ïõ"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "ÂÜëå óå %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "_Áñéèìüò ðáé÷ôþí (óõìðåñéëáìâáíïìÝíùí ÔÍ):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "Åðßðåäï åðéäåîéüôçôáò _ÔÍ"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "_ÓýíïëïÊáíüíùí"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 #, fuzzy
 msgid "_More Game Options..."
 msgstr "Ðåñéóóüôåñåò åðé_ëïãÝò ðáé÷íéäßïõ..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 #, fuzzy
 msgid "Record"
 msgstr "ÊáôáãñáöÞ"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Âáèìïëïãßá"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "¸ôïéìïò"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "ÇãÝôçò"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "ÄéÜëåîå áðïèçêåõìÝíï ðáé÷íßäé ãéá öüñôùìá"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "ÄéÜëåîå áðïèçêåõìÝíï ðáé÷íßäé ãéá _öüñôùìá"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_ÐåñéçãÞóïõ"
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "ÅðÝëåîå Ýíá óåíÜñéï"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "ÅðÝëåîå _óåíÜñéï"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Ôýðïò"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "ÅðÝëåîå ôï _Ýèíïò óïõ:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "ÅðÝëåîå êáôÜëïãï áðïèÞêåõóçò"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "ÁðïèÞêåõóç ðáé÷íßäé"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "ÁðïèçêåõìÝíá _Ðáé÷íßäéá"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "ÁðïèÞêåõóç _¼íïìáÁñ÷åßïõ"
 
@@ -12484,7 +12555,7 @@ msgstr "?Building:
 msgid "Count"
 msgstr "ÌÝôñçìá"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12733,28 +12804,28 @@ msgstr "_
 msgid "Edit Global _Worklists"
 msgstr "Äéüñèùóå êáèïëéêÝò ë_ßóôåò åñãáóéþí"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Ãýñïé"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "ÄéáèÝóéìåò _åñãáóßåò"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "_Äåßîå üëåò ôéò åñãáóßåò"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Åñãáóßåò óå áíáìïíÞ"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "Ðñüó_èåóå êáèïëéêÞ ëßóôá åñãáóéþí"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "¶ëëá_îå ðáñáãùãÞ"
 
@@ -13052,8 +13123,8 @@ msgid "City shrinks: %d %s"
 msgstr "Óõññßêíùóç ðüëçò: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13155,11 +13226,11 @@ msgstr "
 msgid "Maintenance Report"
 msgstr "ÁíáöïñÜ óõíôçñÞóåùò."
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "ëßóôá åñãáóéþí"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13583,21 +13654,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Áñ÷éêïðïßçóç ðåëÜôç"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "ÁíáìïíÞ ãéá ôçí åêêßíçóç ôïõ ðáé÷íéäßïõ"
 
@@ -14870,7 +14941,7 @@ msgstr ""
 msgid "Unit Selection"
 msgstr ""
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr ""
 
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 7e555d2..85a83a8 100644
Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ
diff --git a/po/en_GB.po b/po/en_GB.po
index 86d4d11..4a17a41 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-09-09 07:42+0900\n"
 "Last-Translator: Daniel Markstedt <himasaram at spray.se>\n"
 "Language-Team: \n"
@@ -50,20 +50,20 @@ msgstr ""
 msgid "Science"
 msgstr ""
 
-#: common/city.c:352
-msgid "?obsolete:O"
+#: common/city.c:350
+msgid "?built:B"
 msgstr ""
 
-#: common/city.c:355
-msgid "?redundant:*"
+#: common/city.c:352
+msgid "?wonder:w"
 msgstr ""
 
-#: common/city.c:360
-msgid "?built:B"
+#: common/city.c:359
+msgid "?obsolete:O"
 msgstr ""
 
 #: common/city.c:362
-msgid "?wonder:w"
+msgid "?redundant:*"
 msgstr ""
 
 #: common/connection.c:515
@@ -484,81 +484,81 @@ msgstr ""
 msgid "AI Debug messages"
 msgstr ""
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr ""
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr ""
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr ""
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr ""
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr ""
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr ""
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr ""
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr ""
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr ""
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr ""
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr ""
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr ""
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr ""
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr ""
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr ""
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr ""
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr ""
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr ""
 
@@ -604,13 +604,13 @@ msgstr ""
 msgid "Size %d"
 msgstr ""
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr ""
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -622,65 +622,65 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr ""
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr ""
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr ""
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr ""
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Railway"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr ""
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr ""
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr ""
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr ""
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr ""
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr ""
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr ""
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr ""
 
@@ -782,11 +782,11 @@ msgstr ""
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr ""
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr ""
 
@@ -937,79 +937,79 @@ msgid_plural " (total %d repeats)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr ""
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr ""
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr ""
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr ""
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr ""
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr ""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr ""
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr ""
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr ""
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr ""
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr ""
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr ""
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr ""
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr ""
 
@@ -1038,108 +1038,108 @@ msgstr ""
 msgid "%s is selling %s (not needed) for %d."
 msgstr ""
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr ""
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr ""
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr ""
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr ""
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
 "away with your crimes?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1150,14 +1150,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1170,7 +1170,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1181,13 +1181,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1198,12 +1198,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1214,7 +1214,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1225,47 +1225,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
 "intentions, and I will have no more of our alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr ""
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
 "our enemy, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
 "s. Why do I need to remind you of your promises?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1273,26 +1273,26 @@ msgid ""
 "more!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
 "cessation of hostilities?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1300,131 +1300,136 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, c-format
 msgid "Auth option \"%s\":"
 msgstr ""
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr ""
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr ""
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr ""
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr ""
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr ""
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr ""
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr ""
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr ""
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr ""
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr ""
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr ""
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
 msgstr ""
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr ""
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr ""
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr ""
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2143,44 +2148,42 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr ""
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr ""
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr ""
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr ""
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr ""
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2188,30 +2191,30 @@ msgid ""
 "to achieve team victory with averaged individual scores."
 msgstr ""
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr ""
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr ""
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr ""
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr ""
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2220,19 +2223,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr ""
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr ""
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr ""
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2240,33 +2243,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr ""
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr ""
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr ""
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr ""
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr ""
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2276,15 +2279,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr ""
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr ""
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2294,60 +2297,60 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr ""
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr ""
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr ""
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr ""
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
 msgstr ""
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
 msgstr ""
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr ""
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2355,17 +2358,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
 msgstr ""
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr ""
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2373,17 +2376,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
 msgstr ""
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr ""
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2391,17 +2394,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
 msgstr ""
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr ""
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2409,17 +2412,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
 msgstr ""
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr ""
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2428,7 +2431,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2437,11 +2440,11 @@ msgid ""
 "cmdlevel <level> <connection-name>"
 msgstr ""
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr ""
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2463,20 +2466,20 @@ msgid ""
 "now takes connection names, not player names."
 msgstr ""
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr ""
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr ""
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2484,56 +2487,56 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr ""
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr ""
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr ""
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr ""
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr ""
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
 msgstr ""
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr ""
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2544,45 +2547,45 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
 msgstr ""
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr ""
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr ""
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr ""
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr ""
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr ""
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr ""
 
@@ -3088,25 +3091,34 @@ msgstr ""
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr ""
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr ""
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr ""
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3149,25 +3161,25 @@ msgstr ""
 msgid "There is no player nor connection by the name %s."
 msgstr ""
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr ""
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr ""
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3177,7 +3189,7 @@ msgstr ""
 "is announced.\n"
 "      Workers spontaneously gather and upgrade all cities with railways."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3187,12 +3199,12 @@ msgstr ""
 "railways.\n"
 "      Workers spontaneously gather and upgrade all cities with railways."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr ""
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr ""
@@ -3251,52 +3263,52 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr ""
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr ""
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr ""
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3305,67 +3317,67 @@ msgstr ""
 " %s cancelled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr ""
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr ""
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr ""
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr ""
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr ""
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr ""
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr ""
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr ""
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr ""
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3598,19 +3610,19 @@ msgstr ""
 msgid "th"
 msgstr ""
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr ""
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr ""
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr ""
@@ -3621,11 +3633,11 @@ msgstr ""
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr ""
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr ""
 
@@ -3637,7 +3649,7 @@ msgid ""
 "risk."
 msgstr ""
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
 
@@ -3655,13 +3667,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3696,7 +3708,7 @@ msgstr ""
 msgid "Networking"
 msgstr ""
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr ""
@@ -3717,56 +3729,60 @@ msgstr ""
 msgid "Changed"
 msgstr ""
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
 msgstr ""
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
 msgstr ""
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr ""
 
-#: server/settings.c:236
+#: server/settings.c:181
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr ""
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr ""
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
 "  size = 20 is a huge map of 20,000 tiles"
 msgstr ""
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr ""
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -3802,11 +3818,11 @@ msgid ""
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 msgstr ""
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr ""
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -3818,11 +3834,11 @@ msgid ""
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr ""
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr ""
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -3835,35 +3851,35 @@ msgid ""
 "of start pos and to the number of players"
 msgstr ""
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr ""
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr ""
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr ""
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr ""
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr ""
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr ""
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -3881,113 +3897,113 @@ msgid ""
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr ""
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr ""
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr ""
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
 msgstr ""
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr ""
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
 msgstr ""
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr ""
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
 "usually only of interest while debugging the game."
 msgstr ""
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr ""
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr ""
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr ""
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
 msgstr ""
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr ""
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
 msgstr ""
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr ""
 
-#: server/settings.c:419
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr ""
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
 "try to connect will be rejected."
 msgstr ""
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr ""
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
 msgstr ""
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr ""
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4003,27 +4019,27 @@ msgid ""
 "    A   = Strong attack unit (eg., Catapult)\n"
 msgstr ""
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr ""
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr ""
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr ""
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4031,33 +4047,33 @@ msgid ""
 "next techs really expensive."
 msgstr ""
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
 "determined by the ruleset or other game settings."
 msgstr ""
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr ""
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
 "does not apply when you have just gained a technology this turn."
 msgstr ""
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr ""
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4065,22 +4081,22 @@ msgid ""
 "to gold transfers in diplomatic treaties."
 msgstr ""
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr ""
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
 "this is non-zero, you can end up with negative research points."
 msgstr ""
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr ""
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4089,43 +4105,43 @@ msgid ""
 "points."
 msgstr ""
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr ""
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
 "the size of the city."
 msgstr ""
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr ""
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
 "it has a Granary)."
 msgstr ""
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr ""
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4133,32 +4149,32 @@ msgid ""
 "also notradesize."
 msgstr ""
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr ""
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
 "notradesize and smaller than fulltradesize. See also fulltradesize."
 msgstr ""
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr ""
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
 msgstr ""
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr ""
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4166,11 +4182,11 @@ msgid ""
 "numbers of cities."
 msgstr ""
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr ""
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4178,31 +4194,31 @@ msgid ""
 "(default), the ruleset value will be used."
 msgstr ""
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr ""
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
 msgstr ""
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr ""
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr ""
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr ""
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4211,21 +4227,21 @@ msgid ""
 "\"occupying\" territory."
 msgstr ""
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr ""
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4235,32 +4251,32 @@ msgid ""
 "  8 = air"
 msgstr ""
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr ""
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
 "tiles or tiles within range of more than one nation's cities."
 msgstr ""
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr ""
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr ""
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4269,11 +4285,11 @@ msgid ""
 "4 = diplomacy is disabled for everyone."
 msgstr ""
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr ""
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4288,11 +4304,11 @@ msgid ""
 "another nations unless it is a default for their nation also."
 msgstr ""
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr ""
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4301,81 +4317,81 @@ msgid ""
 "4 = raging hordes, lots of barbarians"
 msgstr ""
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr ""
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr ""
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr ""
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
 msgstr ""
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr ""
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
 "cities or terrain changes in tiles not observed."
 msgstr ""
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr ""
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr ""
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr ""
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
 "civil wars are turned off altogether."
 msgstr ""
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr ""
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
 "players cannot meet unless they have an embassy."
 msgstr ""
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr ""
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4383,21 +4399,21 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr ""
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr ""
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr ""
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4431,122 +4447,124 @@ msgid ""
 "\n"
 msgstr ""
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr ""
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
 msgstr ""
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr ""
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr ""
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr ""
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr ""
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr ""
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
 "connections will be automatically disconnected eventually)."
 msgstr ""
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr ""
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
 "not wait at all."
 msgstr ""
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr ""
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr ""
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr ""
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr ""
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
 msgstr ""
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr ""
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
 msgstr ""
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr ""
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -4568,42 +4586,42 @@ msgid ""
 "The order of characters is not significant, but their capitalization is."
 msgstr ""
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr ""
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
 msgstr ""
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr ""
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
 "this server was not compiled to use zlib."
 msgstr ""
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr ""
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
 msgstr ""
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr ""
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -4614,7 +4632,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr ""
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr ""
@@ -4743,102 +4761,102 @@ msgstr ""
 msgid "Game saved as %s"
 msgstr ""
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr ""
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr ""
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr ""
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr ""
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr ""
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr ""
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr ""
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr ""
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr ""
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr ""
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr ""
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr ""
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr ""
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr ""
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr ""
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr ""
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr ""
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr ""
 
@@ -4859,7 +4877,7 @@ msgstr ""
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5033,7 +5051,7 @@ msgstr ""
 msgid "Removed player %s from the game."
 msgstr ""
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5105,693 +5123,717 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr ""
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr ""
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr ""
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr ""
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr ""
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr ""
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr ""
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr ""
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr ""
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr ""
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr ""
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr ""
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr ""
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr ""
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr ""
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr ""
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr ""
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr ""
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr ""
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr ""
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr ""
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr ""
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr ""
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr ""
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr ""
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr ""
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr ""
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr ""
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr ""
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr ""
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr ""
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr ""
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr ""
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr ""
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr ""
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr ""
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr ""
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr ""
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr ""
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr ""
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr ""
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr ""
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr ""
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr ""
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr ""
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr ""
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr ""
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr ""
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr ""
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+msgid "You cannot take a new player at this time."
+msgstr ""
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr ""
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr ""
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr ""
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr ""
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr ""
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr ""
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr ""
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2951
+#: server/stdinhand.c:3010
 #, c-format
-msgid "%s already controls %s"
+msgid "%s already controls %s."
 msgstr ""
 
-#: server/stdinhand.c:2965
+#: server/stdinhand.c:3024
 #, c-format
-msgid "There is no free player slot for %s"
+msgid "There is no free player slot for %s."
 msgstr ""
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr ""
 
-#: server/stdinhand.c:3076
+#: server/stdinhand.c:3135
 #, c-format
-msgid "%s now controls %s (%s, %s)"
+msgid "%s now controls %s (%s, %s)."
 msgstr ""
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr ""
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr ""
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr ""
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr ""
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr ""
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr ""
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr ""
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr ""
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr ""
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr ""
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr ""
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr ""
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr ""
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr ""
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr ""
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr ""
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr ""
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr ""
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Your new vote cancelled your previous vote."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr ""
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr ""
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr ""
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr ""
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr ""
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+msgid "Not enough human players, game will not start."
+msgstr ""
+
+#: server/stdinhand.c:3888
+msgid "No players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 msgid "Not enough nations for all players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr ""
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr ""
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr ""
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -5812,123 +5854,123 @@ msgid ""
 "  quit   -  to exit"
 msgstr ""
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr ""
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr ""
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr ""
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr ""
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr ""
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr ""
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr ""
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr ""
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr ""
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr ""
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ""
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ""
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ""
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ""
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr ""
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr ""
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr ""
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr ""
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr ""
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr ""
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr ""
 
@@ -5995,17 +6037,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr ""
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr ""
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr ""
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr ""
@@ -6512,20 +6554,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr ""
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr ""
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr ""
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr ""
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr ""
@@ -6611,119 +6653,120 @@ msgstr ""
 msgid "Cannot find audio file %s"
 msgstr ""
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr ""
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr ""
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr ""
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr ""
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr ""
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr ""
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] ""
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr ""
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr ""
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr ""
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr ""
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr ""
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr ""
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr ""
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr ""
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -6835,8 +6878,8 @@ msgid "Best defending units"
 msgstr ""
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7006,8 +7049,8 @@ msgstr ""
 msgid "?cma:Governor"
 msgstr ""
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7259,19 +7302,19 @@ msgid ""
 "%d times"
 msgstr ""
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr ""
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr ""
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr ""
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr ""
 
@@ -7279,31 +7322,31 @@ msgstr ""
 msgid "experimental"
 msgstr ""
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr ""
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr ""
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr ""
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr ""
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr ""
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr ""
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 
@@ -7388,27 +7431,27 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr ""
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr ""
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr ""
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr ""
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -7416,293 +7459,293 @@ msgid ""
 "\n"
 msgstr ""
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr ""
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr ""
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr ""
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr ""
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr ""
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr ""
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr ""
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr ""
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr ""
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr ""
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr ""
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr ""
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Can build roads and railways.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr ""
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr ""
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr ""
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr ""
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr ""
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr ""
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr ""
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr ""
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr ""
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr ""
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr ""
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr ""
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr ""
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr ""
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr ""
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Gets quintuple defence against missiles and aircraft.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr ""
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr ""
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
 "at sea.\n"
 msgstr ""
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr ""
@@ -7711,115 +7754,115 @@ msgstr ""
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr ""
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr ""
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr ""
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
 "will require %d bulbs to complete."
 msgstr ""
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr ""
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr ""
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr ""
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr ""
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr ""
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Allows %s to upgrade roads to railways.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr ""
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr ""
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr ""
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr ""
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -7830,7 +7873,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7838,48 +7881,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -7887,23 +7930,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -7914,7 +7957,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -7922,60 +7965,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr ""
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr ""
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -7983,7 +8026,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -7991,71 +8034,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr ""
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr ""
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr ""
@@ -8458,16 +8501,16 @@ msgstr ""
 msgid "Start of turn %d"
 msgstr ""
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr ""
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr ""
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr ""
 
@@ -8498,13 +8541,13 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr ""
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -8518,7 +8561,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr ""
 
@@ -8551,36 +8594,36 @@ msgstr ""
 msgid "Ping"
 msgstr ""
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr ""
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr ""
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr ""
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr ""
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr ""
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr ""
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr ""
@@ -8887,64 +8930,68 @@ msgstr ""
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr ""
 
-#: client/text.c:606
+#: client/text.c:607
+msgid "Moving: Nobody"
+msgstr ""
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr ""
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr ""
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr ""
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr ""
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr ""
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr ""
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr ""
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr ""
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -8952,55 +8999,55 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr ""
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr ""
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr ""
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr ""
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr ""
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9011,72 +9058,72 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr ""
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr ""
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr ""
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr ""
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr ""
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9084,96 +9131,96 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr ""
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr ""
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr ""
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr ""
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr ""
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr ""
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr ""
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr ""
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr ""
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr ""
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr ""
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr ""
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "?clistend:."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr ""
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr ""
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9181,7 +9228,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9189,16 +9236,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr ""
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr ""
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9206,20 +9253,20 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr ""
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr ""
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr ""
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr ""
@@ -9260,12 +9307,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr ""
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr ""
 
@@ -9311,11 +9358,13 @@ msgid "Ooops..."
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -9330,6 +9379,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -9368,6 +9418,7 @@ msgstr ""
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr ""
 
@@ -9392,12 +9443,13 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr ""
@@ -9409,6 +9461,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -9423,6 +9476,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -9430,6 +9484,7 @@ msgid ""
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -9497,10 +9552,12 @@ msgid "Subvert Enemy Unit"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr ""
 
@@ -9598,7 +9655,7 @@ msgstr ""
 msgid "_Overview"
 msgstr ""
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -9623,11 +9680,11 @@ msgid "%d/%d %d turns"
 msgstr ""
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr ""
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr ""
 
@@ -9746,7 +9803,7 @@ msgstr ""
 msgid "Present units %d"
 msgstr ""
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr ""
 
@@ -9831,31 +9888,31 @@ msgstr ""
 msgid "What should we rename the city to?"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -9865,12 +9922,12 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -9879,85 +9936,90 @@ msgstr ""
 msgid "Improvements"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr ""
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, c-format
+msgid "Total Buy Cost: %d"
+msgstr ""
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10019,121 +10081,121 @@ msgstr ""
 msgid "Remove this preset?"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 msgid "_Description"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -10376,60 +10438,65 @@ msgstr ""
 msgid "Not _ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr ""
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+msgid "_Take Player"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr ""
 
@@ -11334,214 +11401,214 @@ msgstr ""
 msgid "Connect to Gaming _Zone"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr ""
 
@@ -11576,7 +11643,7 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -11800,28 +11867,28 @@ msgstr ""
 msgid "Edit Global _Worklists"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr ""
 
@@ -12110,8 +12177,8 @@ msgid "City shrinks: %d %s"
 msgstr ""
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12211,11 +12278,11 @@ msgstr ""
 msgid "Maintenance Report"
 msgstr ""
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr ""
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -12628,21 +12695,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -13864,7 +13931,7 @@ msgstr ""
 msgid "Unit Selection"
 msgstr ""
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr ""
 
diff --git a/po/eo.gmo b/po/eo.gmo
new file mode 100644
index 0000000..992ffb8
Binary files /dev/null and b/po/eo.gmo differ
diff --git a/po/lt.po b/po/eo.po
similarity index 74%
copy from po/lt.po
copy to po/eo.po
index 91ff8ae..0544207 100644
--- a/po/lt.po
+++ b/po/eo.po
@@ -1,584 +1,676 @@
-# Andrius Å tikonas <stikonas at gmail.com>, 2006, 2007.
-# Mindaugas Å ukys  <ateivis at gmail.com>, 2006, 2007.
-# Tomas Kuliavas <tokul at users.sourceforge.net>, 2006.
-msgid ""
-msgstr ""
-"Project-Id-Version: freeciv\n"
+# translation of eo.po to Freeciv
+#
+# KEEP UTF-8, PLEASE !!!
+# |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|
+# |La ĉefa celo estis igi Freeciv esperantlingve ludebla. La dua paŝo estos pli bone aranĝi |
+# |la tradukadon kun la helpo de la ludantoj, ĉar la ludo entenas frazajn skemojn kaj vari- |
+# |ablojn kiuj ne estas plene esperantigeblaj. Poste oni tradukos ankaÅ­ la ceteran parton.  |
+# -------------------------------------------------------------------------------------------
+# This translation is covered by the GNU General Public License Version 2.
+# Copyright: Antonio C. Codazzi <f_sophia at libero.it>, 2008.
+#
+# Esperanto special letters: ĉŝĝĥĵŭ
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
-"PO-Revision-Date: 2007-12-16 11:12+0300\n"
-"Last-Translator: Andrius Å tikonas <stikonas at gmail.com>\n"
-"Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: KBabel 1.0.2\n"
 
 #: common/city.c:56 client/gui-gtk-2.0/repodlgs.c:938
 #: client/gui-win32/repodlgs.c:700
 msgid "Food"
-msgstr "Maistas"
+msgstr "Nutraĵo"
 
 #: common/city.c:57 client/gui-gtk-2.0/repodlgs.c:937
 #: client/gui-win32/repodlgs.c:699
 msgid "Shield"
-msgstr "Skydas"
+msgstr "Produktado"
 
 #: common/city.c:58 data/Freeciv.in:3060 data/default/techs.ruleset:734
 #: data/civ2/techs.ruleset:719 data/civ1/techs.ruleset:715
 msgid "Trade"
-msgstr "Prekyba"
+msgstr "Komerco"
 
 #: common/city.c:59 client/gui-gtk-2.0/repodlgs.c:939
 #: data/default/terrain.ruleset:672 data/civ2/terrain.ruleset:603
 #: data/civ1/terrain.ruleset:542
 msgid "Gold"
-msgstr "Auksas"
+msgstr "Oro"
 
 #: common/city.c:60 server/plrhand.c:193 client/gui-gtk-2.0/gamedlgs.c:262
 #: client/gui-win32/ratesdlg.c:315
+#, fuzzy
 msgid "Luxury"
-msgstr "Prabanga"
+msgstr "Lukso"
 
 #: common/city.c:61 server/plrhand.c:195 client/gui-gtk-2.0/gamedlgs.c:282
 #: client/gui-win32/ratesdlg.c:321
 msgid "Science"
-msgstr "Mokslas"
+msgstr "Scienco"
+
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:K"
 
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:m"
+
+#: common/city.c:359
 msgid "?obsolete:O"
-msgstr "?obsolete:S"
+msgstr "?obsolete:A"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:P"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:s"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
-msgstr "%s iš %s"
+msgstr "%s el %s"
 
 #: common/connection.c:521
 msgid " (connection incomplete)"
-msgstr " (nebaigta jungtis)"
+msgstr " (nekompleta konekto)"
 
 #: common/connection.c:525
 #, c-format
 msgid " (player %s)"
-msgstr " (žaidėjas %s)"
+msgstr " (ludanto %s)"
 
 #: common/connection.c:529
 msgid " (observer)"
-msgstr " (stebÄ—tojas)"
+msgstr " (observanto)"
 
 #: common/events.c:42
+#, fuzzy
 msgid "City: Building Unavailable Item"
-msgstr "Miestas: Stato neprieinamą dalinį ar patobulinimą"
+msgstr "Neniu disponebla konstruaĵon"
 
 #: common/events.c:43
+#, fuzzy
 msgid "City: Captured/Destroyed"
-msgstr "Miestas: Užgrobtas/Sunaikintas"
+msgstr "Konkerita/Detruita"
 
 #: common/events.c:44
+#, fuzzy
 msgid "City: Celebrating"
-msgstr "Miestas: Å ventÄ—"
+msgstr "Celebrado"
 
 #: common/events.c:45
+#, fuzzy
 msgid "City: Civil Disorder"
-msgstr "Miestas: Neramumai"
+msgstr "Insurekcio"
 
 #: common/events.c:46
+#, fuzzy
 msgid "City: Famine"
-msgstr "Miestas: Badas"
+msgstr "Urbonomo"
 
 #: common/events.c:47
+#, fuzzy
 msgid "City: Famine Feared"
-msgstr "Miestas: Laukiamas badas"
+msgstr "Timo pri malsatmisero"
 
 #: common/events.c:48
+#, fuzzy
 msgid "City: Growth"
-msgstr "Miestas: Augimas"
+msgstr "Urba pliiĝo"
 
 #: common/events.c:49
+#, fuzzy
 msgid "City: May Soon Grow"
-msgstr "Miestas: Gali greitai išaugti"
+msgstr "Ebla baldaŭa pliiĝo"
 
 #: common/events.c:50
+#, fuzzy
 msgid "City: Needs Aqueduct"
-msgstr "Miestas: Reikia akveduko"
+msgstr "Necesas akvokondukilo"
 
 #: common/events.c:51
+#, fuzzy
 msgid "City: Needs Aqueduct Being Built"
-msgstr "Miestas: Reikia akveduko, kuris jau statomas"
+msgstr "Necesas konstruota akvokondukilo"
 
 #: common/events.c:52
+#, fuzzy
 msgid "City: Normal"
-msgstr "Miestas: Normalus"
+msgstr "Urba mapo"
 
 #: common/events.c:53
+#, fuzzy
 msgid "City: Nuked"
-msgstr "Miestas: BranduolinÄ— ataka"
+msgstr "Urbonomo"
 
 #: common/events.c:54
+#, fuzzy
 msgid "City: Released from citizen governor"
-msgstr "Miestas: Išlaisvintas nuo piliečių gubernatoriaus"
+msgstr "Äœi estas liberigita el civita reganto"
 
 #: common/events.c:55
+#, fuzzy
 msgid "City: Suggest Growth Throttling"
-msgstr "Miestas: Siūloma pagerinti augimą"
+msgstr "Oni konsilas kreskoreguladon"
 
 #: common/events.c:56
+#, fuzzy
 msgid "City: Transfer"
-msgstr "Miestas: Perkelta"
+msgstr "Transigo"
 
 #: common/events.c:57
+#, fuzzy
 msgid "City: Was Built"
-msgstr "Miestas: Buvo pastatytas"
+msgstr "Estis konstruita"
 
 #: common/events.c:58
+#, fuzzy
 msgid "City: Worklist Events"
-msgstr "Miestas: Darbų sąrašo įvykiai"
+msgstr "Agoj en la laborlisto"
 
 #: common/events.c:59
+#, fuzzy
 msgid "City: Production changed"
-msgstr "Miestas: Pakeista produkcija"
+msgstr "Produktado estis ŝanĝita"
 
 #: common/events.c:60
+#, fuzzy
 msgid "Civ: Barbarian Uprising"
-msgstr "Civ: Barbarų iškilimas"
+msgstr "Rabkuro de Barbaroj"
 
 #: common/events.c:61
+#, fuzzy
 msgid "Civ: Civil War"
-msgstr "Civ: Pilietinis karas"
+msgstr " Intercivitana milito"
 
 #: common/events.c:62
+#, fuzzy
 msgid "Civ: Collapse to Anarchy"
-msgstr "Civ: Nusirito iki anarchijos"
+msgstr "Anarĥio"
 
 #: common/events.c:63
+#, fuzzy
 msgid "Civ: First Contact"
-msgstr "Civ: Pirmasis kontaktas"
+msgstr "Unua ekkontakto"
 
 #: common/events.c:64
+#, fuzzy
 msgid "Civ: Learned New Government"
-msgstr "Civ: Atrasta nauja valdymo forma"
+msgstr "Nova speco de regado estas eltrovita"
 
 #: common/events.c:65
+#, fuzzy
 msgid "Civ: Low Funds"
-msgstr "Civ: Mažai lėšų"
+msgstr "Malabundo da mono"
 
 #: common/events.c:66
+#, fuzzy
 msgid "Civ: Pollution"
-msgstr "Civ: Tarša"
+msgstr "Poluado"
 
 #: common/events.c:67
+#, fuzzy
 msgid "Civ: Revolt Ended"
-msgstr "Civ: Sukilimo pabaiga"
+msgstr "Ribelo ĉesis"
 
 #: common/events.c:68
+#, fuzzy
 msgid "Civ: Revolt Started"
-msgstr "Civ: Sukilimo pradžia"
+msgstr "Ribelo komencis"
 
 #: common/events.c:69
+#, fuzzy
 msgid "Civ: Spaceship Events"
-msgstr "Civ: Erdvėlaivio įvykiai"
+msgstr "Kosmaŝipaj okazoj"
 
 #: common/events.c:70
+#, fuzzy
 msgid "Diplomat Action: Bribe"
-msgstr "Diplomatinis veiksmas: Papirko"
+msgstr "Diplomacia ago: %s"
 
 #: common/events.c:71
+#, fuzzy
 msgid "Diplomat Action: Caused Incident"
-msgstr "Diplomatinis veiksmas: SukÄ—lÄ— incidentÄ…"
+msgstr "Diplomacia ago: %s"
 
 #: common/events.c:72
+#, fuzzy
 msgid "Diplomat Action: Escape"
-msgstr "Diplomatinis veiksmas: PabÄ—go"
+msgstr "Diplomacia ago: %s"
 
 #: common/events.c:73
+#, fuzzy
 msgid "Diplomat Action: Embassy"
-msgstr "Diplomatinis veiksmas: Ambasada"
+msgstr "Diplomacia ago: %s"
 
 #: common/events.c:74
+#, fuzzy
 msgid "Diplomat Action: Failed"
-msgstr "Diplomatinis veiksmas: Nepavyko"
+msgstr "Diplomacia ago: %s"
 
 #: common/events.c:75
+#, fuzzy
 msgid "Diplomat Action: Incite"
-msgstr "Diplomatinis veiksmas: Sukilimas"
+msgstr "Diplomacia ago: %s"
 
 #: common/events.c:76
+#, fuzzy
 msgid "Diplomat Action: Poison"
-msgstr "Diplomatinis veiksmas: Užteršė"
+msgstr "Diplomacia ago: %s"
 
 #: common/events.c:77
+#, fuzzy
 msgid "Diplomat Action: Sabotage"
-msgstr "Diplomatinis veiksmas: Sabotažas"
+msgstr "Diplomacia ago: %s"
 
 #: common/events.c:78
+#, fuzzy
 msgid "Diplomat Action: Theft"
-msgstr "Diplomatinis veiksmas: VagystÄ—"
+msgstr "Diplomacia ago: %s"
 
 #: common/events.c:79
+#, fuzzy
 msgid "Enemy Diplomat: Bribe"
-msgstr "Priešo diplomatas: Papirko"
+msgstr "Malamika diplomacia ago: %s"
 
 #: common/events.c:80
+#, fuzzy
 msgid "Enemy Diplomat: Embassy"
-msgstr "Priešo diplomatas: Ambasada"
+msgstr "Malamika diplomacia ago: %s"
 
 #: common/events.c:81
+#, fuzzy
 msgid "Enemy Diplomat: Failed"
-msgstr "Priešo diplomatas: Nepavyko"
+msgstr "Malamika diplomacia ago: %s"
 
 #: common/events.c:82
+#, fuzzy
 msgid "Enemy Diplomat: Incite"
-msgstr "Priešo diplomatas: Sukilimas"
+msgstr "Malamika diplomacia ago: %s"
 
 #: common/events.c:83
+#, fuzzy
 msgid "Enemy Diplomat: Poison"
-msgstr "Priešo diplomatas: Teršimas"
+msgstr "Malamika diplomacia ago: %s"
 
 #: common/events.c:84
+#, fuzzy
 msgid "Enemy Diplomat: Sabotage"
-msgstr "Priešo diplomatas: Sabotažas"
+msgstr "Malamika diplomacia ago: %s"
 
 #: common/events.c:85
+#, fuzzy
 msgid "Enemy Diplomat: Theft"
-msgstr "Priešo diplomatas: Vagystė"
+msgstr "Malamika diplomacia ago: %s"
 
 #: common/events.c:86
 msgid "Caravan actions"
-msgstr "Karavano veiksmai"
+msgstr "Agoj de Karavano"
 
 #: common/events.c:87
 msgid "Tutorial message"
-msgstr "Apmokomoji žinutė"
+msgstr ""
 
 #: common/events.c:88
-#, fuzzy
 msgid "Broadcast Report"
-msgstr "Prekybos ataskaita..."
+msgstr "Raporto en lineo"
 
 #: common/events.c:89
 msgid "Game Ended"
-msgstr "Žaidimas pasibaigė"
+msgstr "La ludo ĉesis"
 
 #: common/events.c:90
 msgid "Game Started"
-msgstr "Žaidimas prasidėjo"
+msgstr "La ludo komencis"
 
 #: common/events.c:91
+#, fuzzy
 msgid "Message from Server Operator"
-msgstr "Pranešimas nuo serverio operatoriaus"
+msgstr "Mesaĝo el operatoro de la gastiga komputilo"
 
 #: common/events.c:92
 msgid "Nation Selected"
-msgstr "Pasirinkta tauta"
+msgstr "La nacio estas elektita"
 
 #: common/events.c:93
 msgid "Player Destroyed"
-msgstr "Žaidėjas sunaikintas"
+msgstr "La ludanto estas detruito"
 
 #: common/events.c:94
 msgid "Report"
-msgstr "Ataskaita"
+msgstr "Raporto"
 
 #: common/events.c:95
 msgid "Turn Bell"
-msgstr "Ä–jimo skambutis"
+msgstr "Sonorilo je vico"
 
 #: common/events.c:96
-#, fuzzy
 msgid "Year Advance"
-msgstr "Pasiekimai"
+msgstr "Jaro"
 
 #: common/events.c:97
+#, fuzzy
 msgid "Global: Eco-Disaster"
-msgstr "Globalus: EkologinÄ— katastrofa"
+msgstr "Ekologia katastrofo"
 
 #: common/events.c:98
+#, fuzzy
 msgid "Global: Nuke Detonated"
-msgstr "Globalus: Branduolinis sprogimas"
+msgstr "Atombombo estis eksplodinta"
 
 #: common/events.c:99
+#, fuzzy
 msgid "Hut: Barbarians in a Hut Roused"
-msgstr "Namelis: Pažadinti namelyje gyvenantys barbarai"
+msgstr "Barbaroj en kabano vekiĝis"
 
 #: common/events.c:100
+#, fuzzy
 msgid "Hut: City Founded from Hut"
-msgstr "Namelis: Iš namelio gyventojų įkurtas miestas"
+msgstr "Urbo estas fondita el kabano"
 
 #: common/events.c:101
+#, fuzzy
 msgid "Hut: Gold Found in Hut"
-msgstr "Namelis: Namelyje rastas auksas"
+msgstr "Oro estas trovita en kabano"
 
 #: common/events.c:102
+#, fuzzy
 msgid "Hut: Killed by Barbarians in a Hut"
-msgstr "Namelis: Nužudytas namelyje buvusių barbarų"
+msgstr "Mortigita de barbaroj en kabano"
 
 #: common/events.c:103
+#, fuzzy
 msgid "Hut: Mercenaries Found in Hut"
-msgstr "Namelis: Namelyje aptikti samdiniai"
+msgstr "Dungosoldatoj estas trovitaj en kabano"
 
 #: common/events.c:104
+#, fuzzy
 msgid "Hut: Settler Found in Hut"
-msgstr "Namelis: Namelyje aptikti naujakuriai"
+msgstr "Farmisto estas trovita en kabano"
 
 #: common/events.c:105
+#, fuzzy
 msgid "Hut: Tech Found in Hut"
-msgstr "Namelis: Namelyje aptikta technologija"
+msgstr "Teĥnologio estas trovita en kabano"
 
 #: common/events.c:106
+#, fuzzy
 msgid "Hut: Unit Spared by Barbarians"
-msgstr "Namelis: Barbarai pasigailÄ—jo dalinio"
+msgstr "Unuo estas indulgita de Barbaroj"
 
 #: common/events.c:107
+#, fuzzy
 msgid "Improvement: Bought"
-msgstr "Patobulinimas: Nupirktas"
+msgstr "Plibonigo: %s"
 
 #: common/events.c:108
+#, fuzzy
 msgid "Improvement: Built"
-msgstr "Patobulinimas: Pastatytas"
+msgstr "Plibonigo: %s"
 
 #: common/events.c:109
+#, fuzzy
 msgid "Improvement: Forced to Sell"
-msgstr "Patobulinimas: Priversti parduoti"
+msgstr "Deviga vendo"
 
 #: common/events.c:110
+#, fuzzy
 msgid "Improvement: New Improvement Selected"
-msgstr "Patobulinimas: Pasirinktas naujas patobulinimas"
+msgstr "Nova plibonigo estis elektita"
 
 #: common/events.c:111
+#, fuzzy
 msgid "Improvement: Sold"
-msgstr "Patobulinimas: Parduotas"
+msgstr "Plibonigo: %s"
 
 #: common/events.c:112
+#, fuzzy
 msgid "Tech: Learned From Great Library"
-msgstr "Tech: Didžiojoje bibliotekoje išmokta nauja technologija"
+msgstr "Äœi estis lernita el Granda Biblioteko"
 
 #: common/events.c:113
+#, fuzzy
 msgid "Tech: Learned New Tech"
-msgstr "Tech: Atrasta nauja technologija"
+msgstr "Nova teĥnologio estis lernita"
 
 #: common/events.c:114
+#, fuzzy
 msgid "Treaty: Alliance"
-msgstr "Sutartis: Aljansas"
+msgstr "Alianco"
 
 #: common/events.c:115
+#, fuzzy
 msgid "Treaty: Broken"
-msgstr "Sutartis: Nutraukta"
+msgstr "Traktado: %s"
 
 #: common/events.c:116
+#, fuzzy
 msgid "Treaty: Cease-fire"
-msgstr "Sutartis: Ugnies nutraukimas"
+msgstr "Pafĉesigo"
 
 #: common/events.c:117
+#, fuzzy
 msgid "Treaty: Peace"
-msgstr "Sutartis: Taika"
+msgstr "Traktado: %s"
 
 #: common/events.c:118
+#, fuzzy
 msgid "Treaty: Shared Vision"
-msgstr "Sutartis: Bendra regÄ—jimo laukas"
+msgstr "Komuna vido"
 
 #: common/events.c:119
+#, fuzzy
 msgid "Unit: Attack Failed"
-msgstr "Dalinys: Ataka nepavyko"
+msgstr "La atako malsukcesis"
 
 #: common/events.c:120
+#, fuzzy
 msgid "Unit: Attack Succeeded"
-msgstr "Dalinys: Ataka pavyko"
+msgstr "La atako sukcesis"
 
 #: common/events.c:121
+#, fuzzy
 msgid "Unit: Bought"
-msgstr "Dalinys: Nupirktas"
+msgstr "Aĉetita"
 
 #: common/events.c:122
+#, fuzzy
 msgid "Unit: Built"
-msgstr "Dalinys: Pastatytas"
+msgstr "Listo pri unuoj"
 
 #: common/events.c:123
+#, fuzzy
 msgid "Unit: Defender Destroyed"
-msgstr "Dalinys: GynÄ—jas sunaikintas"
+msgstr "Defenda unuo estas detruita"
 
 #: common/events.c:124
+#, fuzzy
 msgid "Unit: Defender Survived"
-msgstr "Dalinys: Gynėjas išgyveno"
+msgstr "Defenda unuo estas ankoraÅ­ viva"
 
 #: common/events.c:125
+#, fuzzy
 msgid "Unit: Promoted to Veteran"
-msgstr "Dalinys: Paaukštintas iki veterano"
+msgstr "Unuo estas promociita al rango de Veterano"
 
 #: common/events.c:126
+#, fuzzy
 msgid "Unit: Production Upgraded"
-msgstr "Dalinys: Produkcija modernizuota"
+msgstr "La produktado estas ĝisdatigita"
 
 #: common/events.c:127
+#, fuzzy
 msgid "Unit: Relocated"
-msgstr "Dalinys: Perkeltas"
+msgstr "Relokita"
 
 #: common/events.c:128
+#, fuzzy
 msgid "Unit: Orders / goto events"
-msgstr "Dalinys: Nurodymai ir perėjimo įvykiai"
+msgstr "Ordonoj / iru al okazoj"
 
 #: common/events.c:129
+#, fuzzy
 msgid "Wonder: Finished"
-msgstr "Stebuklas: Pastatytas"
+msgstr "Mirindaĵo: %s"
 
 #: common/events.c:130
+#, fuzzy
 msgid "Wonder: Made Obsolete"
-msgstr "Stebuklas: Paseno"
+msgstr "Kreu arkaikaĵojn"
 
 #: common/events.c:131
+#, fuzzy
 msgid "Wonder: Started"
-msgstr "Stebuklas: PradÄ—ta statyba"
+msgstr "La ludo komencis"
 
 #: common/events.c:132
+#, fuzzy
 msgid "Wonder: Stopped"
-msgstr "Stebuklas: Sustabdyta statyba"
+msgstr "Mirindaĵoj: "
 
 #: common/events.c:133
+#, fuzzy
 msgid "Wonder: Will Finish Next Turn"
-msgstr "Stebuklas: Bus užbaigtas kito ėjimo metu."
+msgstr "Kompleta plenumo estos je sekva vico"
 
 #: common/events.c:134
 msgid "Diplomatic Message"
-msgstr "Diplomatinis pranešimas"
+msgstr "Diplomatia mesaĝo"
 
 #: common/events.c:135
+#, fuzzy
 msgid "Treaty: Embassy"
-msgstr "Sutartis: Ambasada"
+msgstr "Traktado: %s"
 
 #: common/events.c:136
 msgid "Error message from bad command"
-msgstr "Blogų komandų klaidų pranešimai"
+msgstr ""
 
 #: common/events.c:137
 msgid "Server settings changed"
-msgstr "Pakeisti serverio nustatymai"
+msgstr "Agordoj de gastiga komputilo estas ŝanĝitaj"
 
 #: common/events.c:138
 msgid "Chat messages"
-msgstr "Pokalbių pranešimai"
+msgstr "Mesaĝoj de babillineo"
 
 #: common/events.c:139
 msgid "Chat error messages"
-msgstr "Pokalbių klaidų pranešimai"
+msgstr ""
 
 #: common/events.c:140
 msgid "Connect/disconnect messages"
-msgstr "Prisijungimo/atsijungimo pranešimai"
+msgstr "Mesaĝoj de (mal)konektado."
 
 #: common/events.c:141
 msgid "AI Debug messages"
-msgstr "DI testavimo pranešimai"
+msgstr ""
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
-msgstr "?attitude:Genocidas"
+msgstr "?attitude:Genocida"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
-msgstr "?attitude:Karingas"
+msgstr "?attitude:Milita"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
-msgstr "?attitude:Priešiškas"
+msgstr "?attitude:Malamika"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
-msgstr "?attitude:Nekooperatyvus"
+msgstr "?attitude:Malkoopera"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
-msgstr "?attitude:Neramus"
+msgstr "?attitude:Malfacila"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
-msgstr "?attitude:Neutralus"
+msgstr "?attitude:NeÅ­trala"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
-msgstr "?attitude:Pagarbus"
+msgstr "?attitude:Respekta"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
-msgstr "?attitude:Paslaugus"
+msgstr "?attitude:Koopera"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
-msgstr "?attitude:Entuziastingas"
+msgstr "?attitude:Entuziasma"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
-msgstr "?attitude:Žavisi"
+msgstr "?attitude:Admiranta"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
-msgstr "?attitude:Garbinantis"
+msgstr "?attitude:Adoranta"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
-msgstr "?diplomatic_state:Paliaubos"
+msgstr "?diplomatic_state:Armistica"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
-msgstr "?diplomatic_state:Karas"
+msgstr "?diplomatic_state:Milita"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
-msgstr "?diplomatic_state:Laikinos paliaubos"
+msgstr "?diplomatic_state:Pafĉesiga"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
-msgstr "?diplomatic_state:Taika"
+msgstr "?diplomatic_state:Paca"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
-msgstr "?diplomatic_state:SÄ…junga"
+msgstr "?diplomatic_state:Alianca"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
-msgstr "?diplomatic_state:Niekada nesusitiko"
+msgstr "?diplomatic_state:Nekonata"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
-msgstr "?diplomatic_state:Komanda"
+msgstr "?diplomatic_state:Grupa"
 
 #. TRANS: Obscure ruleset error.
 #: common/requirements.c:456 common/requirements.c:471
 msgid "World-ranged requirements are only supported for wonders."
-msgstr "Pasaulį apimantys reikalavimai naudojami tik su stebuklais."
+msgstr ""
 
 #. TRANS: Obscure ruleset error.
 #: common/requirements.c:512
 msgid "Player-ranged requirements are only supported for wonders."
-msgstr "Žaidėjui taikomi reikalavimai naudojami tik su stebuklais,"
+msgstr ""
 
 #. TRANS: Obscure ruleset error.
 #: common/requirements.c:533
 msgid "Island-ranged requirements are only supported for wonders."
-msgstr "SalÄ… apimantys reikalavimai naudojami tik su stebuklais."
+msgstr ""
 
 #. TRANS: Obscure ruleset error.
 #: common/requirements.c:581
 msgid "Surviving requirements are only supported at world range."
-msgstr "IÅ¡gyvenimo reikalavimai galioja tik visam pasauliui."
+msgstr ""
 
 #. TRANS: missing value
 #. TRANS: "Resources: (none)"
@@ -590,25 +682,25 @@ msgstr "IÅ¡gyvenimo reikalavimai galioja tik visam pasauliui."
 #: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
 #, c-format
 msgid "(none)"
-msgstr "(nÄ—ra)"
+msgstr "(nenio)"
 
 #: common/requirements.c:1038 common/requirements.c:1042
 #, c-format
 msgid "%s units"
-msgstr "%s dalinių"
+msgstr "%s unuoj"
 
 #: common/requirements.c:1052
 #, c-format
 msgid "Size %d"
-msgstr "Dydis %d"
+msgstr "Grando %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
-msgstr "Ateities technologija. %d"
+msgstr "Estonta teĥnologio %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -618,111 +710,111 @@ msgstr "Ateities technologija. %d"
 #: client/gui-xaw/helpdlg.c:817 client/gui-xaw/helpdlg.c:861
 #: client/gui-xaw/helpdlg.c:880 manual/civmanual.c:327 manual/civmanual.c:333
 msgid "None"
-msgstr "Jokia"
+msgstr "Neniu"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
-msgstr "Ateities technologija"
+msgstr "Estonta teĥnologio"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
-msgstr "(Nežinoma)"
+msgstr "(Nekonata)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
-msgstr "Kelias"
+msgstr "Vojo"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
-msgstr "DrÄ—kinimas"
+msgstr "Irigacio"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
-msgstr "Geležinkelis"
+msgstr "Fervojo"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
-msgstr "Kasykla"
+msgstr "Minejo"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
-msgstr "Tarša"
+msgstr "Poluado"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
-msgstr "Namelis"
+msgstr "Kabano"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
-msgstr "TvirtovÄ—"
+msgstr "Fortreso"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
-msgstr "UpÄ—"
+msgstr "Rivero"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
-msgstr "Ferma"
+msgstr "Farmo"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
-msgstr "Oro bazÄ—"
+msgstr "Avia bazo"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
-msgstr "Radiacijos padidÄ—jimas"
+msgstr "Radioaktiveco"
 
 #: common/unit.c:546 client/gui-win32/plrdlg.c:337
 msgid "Idle"
-msgstr "Laisvas"
+msgstr "Nenifaro"
 
 #: common/unit.c:556
 msgid "Fortifying"
-msgstr "Įtvirtinama"
+msgstr "Fortigado"
 
 #: common/unit.c:558
 msgid "Fortified"
-msgstr "Įtvirtinta"
+msgstr "Fortigita"
 
 #: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
 msgid "Sentry"
-msgstr "Sargyba"
+msgstr "Gardosoldato"
 
 #: common/unit.c:566 client/gui-gtk-2.0/menu.c:851 client/gui-sdl/menu.c:648
 #: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
 msgid "Pillage"
-msgstr "PlÄ—Å¡imas"
+msgstr "Disrabado"
 
 #: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
 msgid "Goto"
-msgstr "Eiti į"
+msgstr "Iru al"
 
 #: common/unit.c:570
 msgid "Explore"
-msgstr "TyrinÄ—ti"
+msgstr "Esploru"
 
 #: common/unit.c:572 manual/civmanual.c:224
 msgid "Transform"
-msgstr "Keisti"
+msgstr "Transformu"
 
 #: common/unit.c:584 client/text.c:106 client/gui-sdl/citydlg.c:1972
 #: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
 msgid "Unknown"
-msgstr "Nežinoma"
+msgstr "Nekonata"
 
 #: common/unit.c:1022
 msgid "Moves"
-msgstr "Ä–jimai"
+msgstr "Movoj"
 
 #: common/unit.c:1571
 #, c-format
@@ -730,13 +822,13 @@ msgid ""
 "Upgrade %s to %s for %d gold?\n"
 "Treasury contains %d gold."
 msgstr ""
-"Patobulinti %s į %s už %d aukso?\n"
-"Ižde yra %d aukso."
+"Ĉu vi dezira ĝisdatigi %s al %s per %d oraj moneroj?\n"
+"La ŝtata kaso entenas %d orajn monerojn."
 
 #: common/unit.c:1579
 #, c-format
 msgid "Sorry, cannot upgrade %s (yet)."
-msgstr "Atsiprašau, kol kas negalima modernizuoti %s."
+msgstr "Bedaŭrinde, estas neeble ĝisdatigi %s (ankoraŭ)."
 
 #: common/unit.c:1585
 #, c-format
@@ -744,138 +836,138 @@ msgid ""
 "Upgrading %s to %s costs %d gold.\n"
 "Treasury contains %d gold."
 msgstr ""
-"%s modernizacija iki %s kainuoja %d aukso.\n"
-"Ižde yra %d aukso."
+"Äœisdatigo de %s al %s necesigas %d orajn monerojn.\n"
+"La ŝtata kaso entenas %d orajn monerojn."
 
 #: common/unit.c:1594
 msgid "You can only upgrade units in your cities."
-msgstr "Patobulinti dalinius gali tik savo miestuose."
+msgstr "Vi povas ĝisdatigi nur unuojn en viaj urboj."
 
 #: common/unit.c:1598
 #, c-format
 msgid "Upgrading this %s would strand units it transports."
-msgstr "%s modernizacija sunaikins gabenamus dalinius."
+msgstr ""
 
 #: common/unittype.c:61
 msgid "Missile"
-msgstr "Raketa"
+msgstr "Misiloj"
 
 #: common/unittype.c:62
 msgid "Land"
-msgstr "Žemė"
+msgstr "Tera"
 
 #: common/unittype.c:63
 msgid "Sea"
-msgstr "JÅ«ra"
+msgstr "Maro"
 
 #: common/unittype.c:64 data/default/units.ruleset:1106
 #: data/civ2/units.ruleset:1057
 msgid "Helicopter"
-msgstr "Sraigtasparnis"
+msgstr "Helikopteroj"
 
 #: common/unittype.c:65
 msgid "Air"
-msgstr "Oras"
+msgstr ""
 
 #: common/unittype.c:66 data/default/units.ruleset:1625
 #: data/civ2/units.ruleset:1576 data/civ1/units.ruleset:920
 msgid "Nuclear"
-msgstr "Branduolinis_ginklas"
+msgstr "Atombomboj"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
-msgstr " ir "
+msgstr " kaj "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?and:, "
 
 #: common/version.c:34
 #, c-format
 msgid "Freeciv version %s %s"
-msgstr "Freeciv versija %s %s"
+msgstr "Freeciv versio %s %s"
 
 #: common/version.c:35
 msgid "(beta version)"
-msgstr "(beta versija)"
+msgstr "(versio beta)"
 
 #: common/version.c:37
 #, c-format
 msgid "Freeciv version %s"
-msgstr "Freeciv %s"
+msgstr "Freeciv versio %s"
 
 #: common/version.c:50
 msgid "betatest version "
-msgstr "beta versija testavimui "
+msgstr "versio beta "
 
 #: common/version.c:52
 msgid "version "
-msgstr "versija "
+msgstr "versio "
 
 #: common/version.c:67
 msgid "January"
-msgstr "sausį"
+msgstr "Januaro"
 
 #: common/version.c:68
 msgid "February"
-msgstr "vasarį"
+msgstr "Februaro"
 
 #: common/version.c:69
 msgid "March"
-msgstr "kovÄ…"
+msgstr "Marto"
 
 #: common/version.c:70
 msgid "April"
-msgstr "balandį"
+msgstr "Aprilo"
 
 #: common/version.c:71
 msgid "May"
-msgstr "gegužę"
+msgstr "Majo"
 
 #: common/version.c:72
 msgid "June"
-msgstr "birželį"
+msgstr "Junio"
 
 #: common/version.c:73
 msgid "July"
-msgstr "liepÄ…"
+msgstr "Julio"
 
 #: common/version.c:74
 msgid "August"
-msgstr "rugpjūtį"
+msgstr "AÅ­gusto"
 
 #: common/version.c:75
 msgid "September"
-msgstr "rugsėjį"
+msgstr "Septembro"
 
 #: common/version.c:76
 msgid "October"
-msgstr "spalį"
+msgstr "Oktobro"
 
 #: common/version.c:77
 msgid "November"
-msgstr "lapkritį"
+msgstr "Novembro"
 
 #: common/version.c:78
 msgid "December"
-msgstr "gruodį"
+msgstr "Decembro"
 
 #: common/version.c:81
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "THIS IS A BETA VERSION\n"
 "Freeciv %s will be released in\n"
 "%s, at %s"
 msgstr ""
-"TAI YRA BETA VERSIJA\n"
-"Freeciv %s bus išleistas\n"
-"%s %s"
+"TIU ĈI ESTAS BETA VERSIO\n"
+"Freeciv %s estos publikigita\n"
+"%s, ĉe %s"
 
 #: common/version.c:103
 msgid "'Cause civilization should be free!"
-msgstr "Kadangi civilizacija turi būti laisva!"
+msgstr "Ĉar la civiliziĝo devas esti libera!"
 
 #: utility/fciconv.c:146
 #, c-format
@@ -885,286 +977,277 @@ msgid ""
 "may not be displayed properly.  You can download iconv\n"
 "at http://gnu.org/.\n"
 msgstr ""
-"JÅ«s naudojate Freeciv be iconv bibliotekos. Jei JÅ«s nenaudojate\n"
-"latin1 simbolių koduotės, dalis simbolių gali būti atvaizduojami\n"
-"neteisinngai. Iconv galima rasti http://gnu.org/ adresu.\n"
+"Vi estas uzanta Freeciv sen iconv.  Sen tio, vi estas\n"
+"uzanta nur latin1 kodigo, kaj do kelkaj tiparoj ne estas\n"
+"bone videbligitaj.  Vi povas elŝuti iconv\n"
+"ĉe http://gnu.org/.\n"
 
 #. TRANS: "Could not convert text from <encoding a> to <encoding b>:"
 #. * TRANS: <error string>."
 #: utility/fciconv.c:219
 #, c-format
 msgid "Could not convert text from %s to %s: %s"
-msgstr "Negaliu konvertuoti teksto iš %s į %s: %s"
+msgstr "Estas neeble konverti tekston el %s en %s: %s"
 
 #: utility/log.c:84
 #, c-format
 msgid "Bad log level \"%s\".\n"
-msgstr "Netinkamas registravimo lygis „%s“.\n"
+msgstr ""
 
 #: utility/log.c:90
 #, c-format
 msgid "Bad log level %d in \"%s\".\n"
-msgstr "Netinkamas registravimo lygis %d tarp \"%s\".\n"
+msgstr ""
 
 #: utility/log.c:92 utility/log.c:103
 #, c-format
 msgid "Freeciv must be compiled with the DEBUG flag to use debug level %d.\n"
 msgstr ""
-"Freeciv turi būti sukompiliuotas su DEBUG parametru, jei norite naudoti %d "
-"derinimo lygį.\n"
 
 #: utility/log.c:108 utility/log.c:120 utility/log.c:161
 #, c-format
 msgid "Badly formed log level argument \"%s\".\n"
-msgstr "Klaidingai suformuotas registravimo lygio parametras \"%s\".\n"
+msgstr ""
 
 #: utility/log.c:138 utility/log.c:143
 #, c-format
 msgid "Not an integer: '%s'\n"
-msgstr "Ne sveikasis skaičius: '%s'\n"
+msgstr ""
 
 #: utility/log.c:150
 #, c-format
 msgid "Empty filename in log level argument \"%s\".\n"
-msgstr "Nenurodytas failo vardas tarp registravimo lygio parametro \"%s\".\n"
+msgstr ""
 
 #: utility/log.c:276
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't open logfile: %s for appending \"%s\".\n"
-msgstr "Nepavyko atverti registravimo failo: %s rašymo teisėmis \"%s\".\n"
+msgstr ""
 
 #: utility/log.c:290 utility/log.c:309
 #, c-format
 msgid "last message repeated %d time"
 msgid_plural "last message repeated %d times"
-msgstr[0] "pakutinė žinutė pakartota %d kartą"
-msgstr[1] "pakutinė žinutė pakartota %d kartus"
-msgstr[2] "pakutinė žinutė pakartota %d kartų"
+msgstr[0] "lasta mesaĝo estis ripetita por %d fojo"
+msgstr[1] "lasta mesaĝo estis ripetita por %d fojoj"
 
 #: utility/log.c:295 utility/log.c:314
 #, c-format
 msgid " (total %d repeat)"
 msgid_plural " (total %d repeats)"
-msgstr[0] " (iš viso %d pakartojimas)"
-msgstr[1] " (iš viso %d pakartojimai)"
-msgstr[2] " (iš viso %d pakartojimų)"
+msgstr[0] " (sume %d ripeto)"
+msgstr[1] " (sume %d ripetoj)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
-msgstr "Nenurodytas \"%s\" parametras.\n"
+msgstr "Malplena operando por \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
-msgstr "Trūksta \"%s\" parametro.\n"
+msgstr "Mankanta operando por \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
-msgstr "%d pr. Kr."
+msgstr "%d A.K."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
-msgstr "%d po Kr."
+msgstr "%d P.K."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
-"FREECIV_PATH yra nustatytas į tuščią reikšmę. Naudojamas standartinis kelio "
-"nustatymas."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
-msgstr "Nepavyko perskaityti duomenų katalogo %s: %s."
+msgstr ""
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
-"Duomenų katalogas gali būti nustatytas FREECIV_PATH aplinkos kintamuoju."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
-msgstr "Dabartinis duomenų kelias yra: „%s“"
+msgstr ""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
-msgstr "Reikalingas failas „%s“ ... nutraukiama!"
+msgstr ""
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
-"%s: KritinÄ— klaida: bandoma paleisti programÄ… administracinio vartotojo "
-"teisÄ—mis!\n"
+"%s: Neriparebla eraro: Freeciv ne povas esti lanĉita de la ĉefuzanto!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
-msgstr "Naudokite neprivilegijuotÄ… vartotojÄ….\n"
+msgstr "Uzu normala uzanto.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
-msgstr "tiksliai atitinka"
+msgstr "ekzakta kongruo"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
-msgstr "tikslus atitikmuo"
+msgstr "nur simpla kongruo"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
-msgstr "dviprasmiškas"
+msgstr "ambigua"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
-msgstr "tuščias"
+msgstr "malplena"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
-msgstr "per ilgas"
+msgstr "tro longa"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
-msgstr "neatitinka"
+msgstr "neniu kongruo"
 
 #: utility/support.c:219
 #, c-format
 msgid "error %ld (failed FormatMessage)"
-msgstr "klaida %ld (nepavyko paleisti FormatMessage)"
+msgstr "eraro %ld (FormatMessage malsukcesis)"
 
 #: utility/support.c:232
 #, c-format
 msgid "error %d (compiled without strerror)"
-msgstr "klaida %d (kompiliuotas be strerror)"
+msgstr "eraro %d (kompilumita sen strerror)"
 
 #: ai/aicity.c:1043 server/citytools.c:1932
 #, c-format
 msgid "The %s have stopped building The %s in %s."
-msgstr "%s nutraukÄ— %s statybÄ… tarp %s."
+msgstr "La %s ĉesis la preparadon de la %s en %s."
 
 #: ai/aicity.c:1054 server/citytools.c:1973
 #, c-format
 msgid "The %s have started building The %s in %s."
-msgstr "%s pradÄ—jo statyti %s tarp %s."
+msgstr "La %s komencis la preparadon de la %s en %s."
 
 #: ai/aicity.c:1381
 #, c-format
 msgid "%s is selling %s (not needed) for %d."
-msgstr "%s parduoda %s (nereikalinga) už %d."
+msgstr "%s plenumas la vendon de %s (ne plu necesa) por %d oraj moneroj."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
-msgstr ""
-"*%s (DI)* DI esantis nutolusiame režime negali pasirašyti tokios sutarties."
+msgstr "*%s (IA)* En \"for\" moduso, la AI ne povas subskribi traktaton."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
-msgstr "*%s (DI)* Pirma nutrauk sÄ…junga su %s, %s."
+msgstr "*%s (IA)* AntaÅ­e rompu aliancon kun %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
-msgstr "*%s (DI)* Pirmiau nutraukime priešiškus veiksmus, %s."
+msgstr "*%s (IA)* Antaŭe ĉesigu ni la militon, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr ""
-"*%s (DI)* Norėčiau ilgiau išlaikyti esamą ugnies nutraukimo statusą, %s."
+"*%s (IA)* Antaŭe mi deziras konstati se vi tenos la nunan pafĉesigon plue, %"
+"s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
-msgstr ""
-"*%s (DI)* Aš vis dar nepasitikiu jumis, kad galėčiau sudaryti sąjungą, %s."
+msgstr "*%s (IA)* Mi ne kredas ankoraÅ­ je alianco kun vi, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
-msgstr "*%s (DI)* Nežinau miesto, kurį paminėjai."
+msgstr "*%s (AI)* Mi ne konas la urbon kiun vi citis."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
-msgstr "*%s (DI)* Atsiprašau, dalijimasis regėjimo lauku su Jumis nesaugus."
+msgstr "*%s (IA)* Mi bedaŭras, sed komuna vido kun vi ne estas sendanĝera."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
-msgstr "*%s (DI)* Šis pasiūlymas yra mums per prastas, %s!"
+msgstr "*%s (AI)* Tiu ĉi renkontiĝo ne estis tre bona por vi, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
-msgstr "*%s (DI)* Sveikas atvykęs į mūsų sąjungą %s!"
+msgstr "*%s (IA)* Bonvenon en nia alianco, %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
-msgstr "*%s (DI)* Taip, amžiams būkime vieningi, %s."
+msgstr "*%s (IA)* Jes, esperu ni ke ni estos ĉiam unuiĝintaj, %s"
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
-msgstr "*%s (DI)* Taip, tegyvuoja taika!"
+msgstr "*%s (IA)* Jes, paco estu!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
-msgstr "*%s (DI)* Sutarta. Jokių priešiškų veiksmų, %s."
+msgstr "*%s (IA)* Konsentite! Ne plu malamikeco, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
-"*%s (DI)* Sveikinimai %s! Gal galÄ—tume sudaryti paliaubas, kol vieni kitus "
-"geriau pažinsime?"
+"*%s (AI)* Saluton, %s! Mi povas konsili al vi pafĉesigon dum la tempo necesa "
+"por sin koni reciproke?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
-msgstr "*%s (DI)* Kosmosas niekada Jums nepriklausys. "
+msgstr "*%s (IA)* La kosmo neniam estos via. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
-msgstr ""
-"*%s (DI)* Aš per ilgai toleravau Jūsų ištvirkusį gyvenimo būdą! Į karą!"
+msgstr "%s (AI)* Mi toleris viajn fiajn bufonojn tro longe! Ni ekmilitu!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
-msgstr "*%s (DI)* Taika bus ... kada nors vÄ—liau."
+msgstr "*%s (IA)* Ĉu paco?... eble alian fojon."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
 "away with your crimes?"
 msgstr ""
-"*%s (DI)* Pagaliau aš Jus pergudravau! Negi manėte, galėsią pasprukti su "
-"savo nusikaltimais?"
+"*%s (IA)* Finfine mi encirkligis vin! Ĉu vi opinias ke vi povas foriĝis post "
+"la fiaj krimoj kiun vi faris?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
-msgstr "*%s (DI)* Jūsų slapti kariniai veiksmai sukėlė šį karą!"
+msgstr "*%s (AI)* Viaj kaŝitaj militaĵoj ĵetas la militon sur vi!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
-msgstr "*%s (DI)* Agresija prieš %s buvo paskutinė Jūsų klaida!"
+msgstr "*%s (IA)* Via agreso kontraÅ­ %s estis vian lastan eraro!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1173,25 +1256,20 @@ msgid_plural ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turns to stop "
 "the spaceship launch."
 msgstr[0] ""
-"*%s (DI)* Mes pradėsime visapusį karą prieš %s per %d ėjimą, kad "
-"sustabdytumÄ—me erdvÄ—laivio paleidimÄ…."
+"*%s (AI)* Ni totale militos kontraŭ %s en %d vico por haltigi la lanĉon de "
+"la kosmoŝipo."
 msgstr[1] ""
-"*%s (DI)* Mes pradėsime visapusį karą prieš %s per %d ėjimus, kad "
-"sustabdytumÄ—me erdvÄ—laivio paleidimÄ…."
-msgstr[2] ""
-"*%s (DI)* Mes pradėsime visapusį karą prieš %s per %d ėjimų, kad "
-"sustabdytumÄ—me erdvÄ—laivio paleidimÄ…."
+"*%s (AI)* Ni totale militos kontraŭ %s en %d vicoj por haltigi la lanĉon de "
+"la kosmoŝipo."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
-msgstr ""
-"*%s (DI)* Šiame reikale tikimasi Jūsų pagalbos. Tegyvuoja mūsų šlovingoji "
-"sÄ…junga!"
+msgstr "*%s (AI)* Via helpo pri tio estos atendita. Vivu nia glora alianco!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1202,19 +1280,15 @@ msgid_plural ""
 "will answer in force in %d turns and expect you to honour your alliance with "
 "us and do likewise!"
 msgstr[0] ""
-"*%s (DI)* %s siekdamas naudos šiurkščiai pažeidė mūsų susitarimus. Mes "
-"atsakysime jėga per %d ėjimą ir tikimės, kad gerbdamas mūsų sąjungą Jūs "
-"pasielgsite taip pat!"
+"*%s (AI)* %s krude rompis la traktatojn kun ni por sia propra gajno.  Ni "
+"potence reagos en %d vico kaj ni atendas ke vi plenumos la aliancon kun ni "
+"kaj do vi agos sammaniere!"
 msgstr[1] ""
-"*%s (DI)* %s siekdamas naudos šiurkščiai pažeidė mūsų susitarimus. Mes "
-"atsakysime jėga per %d ėjimus ir tikimės, kad gerbdamas mūsų sąjungą Jūs "
-"pasielgsite taip pat!"
-msgstr[2] ""
-"*%s (DI)* %s siekdamas naudos šiurkščiai pažeidė mūsų susitarimus. Mes "
-"atsakysime jėga per %d ėjimų ir tikimės, kad gerbdamas mūsų sąjungą Jūs "
-"pasielgsite taip pat!"
+"*%s (AI)* %s krude rompis la traktatojn kun ni por sia propra gajno.  Ni "
+"potence reagos en %d vicoj kaj ni atendas ke vi plenumos la aliancon kun ni "
+"kaj do vi agos sammaniere!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1223,22 +1297,21 @@ msgid_plural ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
 "declare war in %d turns."
 msgstr[0] ""
-"*%s (DI)* Mes ketiname apiplÄ—Å¡ti turtingÄ… %s civilizacijÄ…. Mes paskelbisme "
-"karÄ… per %d Ä—jimÄ…."
+"*%s (AI)* Ni intencas disrabadi la riĉan civilizon de %s. Ni ekmilitos en %d "
+"vico."
 msgstr[1] ""
-"*%s (DI)* Mes ketiname apiplÄ—Å¡ti turtingÄ… %s civilizacijÄ…. Mes paskelbisme "
-"karÄ… per %d Ä—jimus."
-msgstr[2] ""
-"*%s (DI)* Mes ketiname apiplÄ—Å¡ti turtingÄ… %s civilizacijÄ…. Mes paskelbisme "
-"karą per %d ėjimų."
+"*%s (AI)* Ni intencas disrabadi la riĉan civilizon de %s. Ni ekmilitos en %d "
+"vicoj."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
-msgstr "*%s (DI)* Jei norite grobio dalies, prašome prisijungti!"
+msgstr ""
+"*%s (AI)* Se vi deziras parton de la kaptaĵo, estu libera pri aliĝo en la "
+"agado!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1247,23 +1320,20 @@ msgid_plural ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
 "apart. We declare war in %d turns."
 msgstr[0] ""
-"*%s (DI)* Mums jau atsibodo %s. Sunaikinkime Å¡iÄ… apgailÄ—tinÄ… civilizacijÄ…. "
-"Mes skelbiame karÄ… per %d Ä—jimÄ…."
+"*%s (AI)* Ni havis tion kun %s. Buĉu ni tiun ĉi patosan civilizon! Ni "
+"ekmilitos en %d vico."
 msgstr[1] ""
-"*%s (DI)* Mums jau atsibodo %s. Sunaikinkime Å¡iÄ… apgailÄ—tinÄ… civilizacijÄ…. "
-"Mes skelbiame karÄ… per %d Ä—jimus."
-msgstr[2] ""
-"*%s (DI)* Mums jau atsibodo %s. Sunaikinkime Å¡iÄ… apgailÄ—tinÄ… civilizacijÄ…. "
-"Mes skelbiame karą per %d ėjimų."
+"*%s (AI)* Ni havis tion kun %s. Buĉu ni tiun ĉi patosan civilizon! Ni "
+"ekmilitos en %d vicoj."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
-"*%s (DI)* Kaip iš šlovingųjų sąjungininkų mes tikimės Jūsų pagalbos šiame "
-"kare."
+"*%s (AI)* kiel niaj gloraj aliancanoj, ni atendas vian helpon en tiu ĉi "
+"milito."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1272,16 +1342,13 @@ msgid_plural ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turns.  "
 "Hold on - we are coming!"
 msgstr[0] ""
-"*%s (DI)* Mes gerbiame mūsų sąjungą ir karą %s paskelbsime per %d ėjimą.  "
-"Laikykitės – mes ateinam!"
+"*%s (AI)* Ni plenumos nian aliancon kaj ekmilitos kontraÅ­ %s en %d vico.  "
+"Ek! - Ni estas alvenantaj!"
 msgstr[1] ""
-"*%s (DI)* Mes gerbiame mūsų sąjungą ir karą %s paskelbsime per %d ėjimus.  "
-"Laikykitės – mes ateinam!"
-msgstr[2] ""
-"*%s (DI)* Mes gerbiame mūsų sąjungą ir karą %s paskelbsime per %d ėjimų.  "
-"Laikykitės – mes ateinam!"
+"*%s (AI)* Ni plenumos nian aliancon kaj ekmilitos kontraÅ­ %s en %d vicoj.  "
+"Ek! - Ni estas alvenantaj!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1290,380 +1357,366 @@ msgid_plural ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
 "turns.  We expect you to do likewise."
 msgstr[0] ""
-"*%s (DI)* Mes  gerbiame mūsų sajungą su %s ir karą %s paskelbsime per %d "
-"ėjimą. Iš Jūsų tikimės to paties."
+"*%s (AI)* Ni plenumos nian aliancon kun %s kaj ekmilitos kontraÅ­ %s en %d "
+"vico.  Ni atendas ke vi faros sammaniere."
 msgstr[1] ""
-"*%s (DI)* Mes  gerbiame mūsų sajungą su %s ir karą %s paskelbsime per %d "
-"ėjimus. Iš Jūsų tikimės to paties."
-msgstr[2] ""
-"*%s (DI)* Mes  gerbiame mūsų sajungą su %s ir karą %s paskelbsime per %d "
-"ėjimų. Iš Jūsų tikimės to paties."
+"*%s (AI)* Ni plenumos nian aliancon kun %s kaj ekmilitos kontraÅ­ %s en %d "
+"vicoj.  Ni atendas ke vi faros sammaniere."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
 "intentions, and I will have no more of our alliance!"
 msgstr ""
-"*%s (DI)* Jūsų bandymas užkariauti kosmosą vienam sau atskleidžia tikrus "
-"Jūsų ketinimus, todėl aš nutraukiu su Jumis sąjungą!"
+"*%s (AI)* Via klopodo por unuflanke konkeri la kosmospacon malkaŝas viajn "
+"efektivajn intencojn, kaj do mi ne volas esti plu via aliancano!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr ""
-"*%s (DI)* Jūsų vienašališkas tikslas užvaldyti kosmosą yra labai priešiškas."
+"*%s (AI)* Via klopodo por unuflanke superregi la kosmospacon estas ege ataka."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr ""
-"*%s (DI)* Jei Jūs nebaigsite konstruoti erdvėlaivio, aš būsiu priverstas "
-"panaudoti jÄ—gÄ…!"
+"*%s (IA)* Se vi ne haltigis la konstruadon de via kosmoŝipo, mi severe "
+"dispozicios kontraÅ­ vi!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
-msgstr ""
-"*%s (DI)* Apgailestaujame, tačiau dalijimasis bendro regėjimo lauku su Jumis "
-"nebesaugus."
+msgstr "*%s (IA)* Mi bedaÅ­ras, sed komuna vido kun vi ne estas plu senriska."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
 "our enemy, %s."
 msgstr ""
-"*%s (DI)* Sveikinimai mūsų labiausiai ištikimas sąjungininke. Mes kviečiame "
-"Jus sunaikinti mūsų priešą %s."
+"*%s (IA)* Saluton al nia plej fidela aliancano. Ni adresas al vi por detrui "
+"nian malamikon, %s"
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
 "s. Why do I need to remind you of your promises?"
 msgstr ""
-"*%s (DI)* Sveikinimai, sąjungininke, aš matau, kad Jūs dar nepaskelbėte karo "
-"mūsų priešui. %s. Kodėl aš turėčiau Jums priminti Jūsų pažadus?"
+"*%s (IA)* Saluton, aliancano. Mi konstatis ke vi ne ekmilitis ankoraÅ­ "
+"kontraÅ­ nia malamiko, %s. Kial do mi devas memorigi al vi pri viaj promesoj?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
 "peace with our mortal enemy, %s! This is unacceptable; our alliance is no "
 "more!"
 msgstr ""
-"*%s (DI)* Negarbingasis, mes susitarÄ—me dÄ—l sÄ…jungos, o JÅ«s vis tiek liekate "
-"taikoje su mūsų mirtinu priešu %s! Tai nepakenčiama, todėl mūsų sąjunga "
-"nutraukiama!"
+"*%s (IA)* Fia senhonorulo! Ni havas aliancon kaj vi ankoraÅ­ estas en paco "
+"kun nia ĝismorta malamiko, %s! Tio ne estas akceptebla, kaj do nia alianco "
+"ĉesas!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr ""
-"*%s (DI)* Sveikinimai, drauge, gal galėtume pasiūlyti prisijungti prie "
-"bendrų tikslų ir įstoti į sąjungą?"
+"*%s (IA)* Saluton, amiko. Ĉu mi povas konsili al vi kune alfronti la "
+"malamikon kaj krei aliancon inter ni?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
-msgstr ""
-"*%s (DI)* Sveikinimai, kaimyne, gal galėtume Jums pasiūlyti labiau taikius "
-"santykius?"
+msgstr "*%s (IA)* Saluton, najbaro. Ĉu ni povas konsili pli pacajn rilatojn?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
 "cessation of hostilities?"
 msgstr ""
-"*%s (DI)* Mums jau įkyrėjo nuolatinis kraujo liejimas. Gal galėtume "
-"pasiūlyti nutraukti karinius veiksmus?"
+"*%s (AI)* Ni estas naŭzitaj pro tiu ĉi senĉesa sangelverŝo. Ĉu ni povas "
+"konsili ĉesigon de la milito?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
 "Honour our glorious alliance and your name will never be forgotten!"
 msgstr ""
-"*%s (DI)*Mus negailestinagi užpuolė %s ir mums reikia Jūsų pagalbos! "
-"Gerbkite mūsų sąjungą ir Jūsų vardas nebus pamirštas!"
+"*%s (AI)* Ni estis sovaĝe atakitaj de %s, kaj ni bezonas vian helpon! "
+"Plenumu nian gloran aliancon kaj via nomo neniam estos forgesito!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
-#, fuzzy, c-format
+#: server/auth.c:170
+#, c-format
 msgid "Auth option \"%s\":"
-msgstr "Visi nustatymai"
+msgstr ""
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
-msgstr ""
+msgstr " (defaÅ­lto)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
-msgstr ""
+msgstr " (agordoj)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
-#, fuzzy
+#: server/auth.c:195
 msgid " (set)"
-msgstr " (veteranas)"
+msgstr " (agordoj)"
 
-#: server/auth.c:266
-#, fuzzy, c-format
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
+#, c-format
 msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Šis vardas neleidžiamas"
+msgstr ""
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
-msgstr "Nepavyksta įkelti konfigūracinio failo „%s“!"
+msgstr ""
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
-"Įspėjimas: svečio vardas „%s“ jau užimtas, vartotojas pervadinamas į „%s“."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
-msgstr "Svečiai į šį serverį neįleidžiami. Apgailestaujame"
+msgstr ""
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
-msgstr "%s atmestas: Svečiai neįleidžiami."
+msgstr ""
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr ""
-"Įvyko klaida skaitant vartotojų duomenų bazę, todėl jungiamasi svečio "
-"vartotoju '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr ""
-"Įvyko klaida skaitant vartotojų duomenų bazę ir svečių prisijungimai "
-"negalimi. Apgailestaujame."
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
-msgstr "%s buvo atmestas: Klaida duomenų bazėje ir svečiai neleidžiami."
+msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
-msgstr "Įveskite %s slaptažodį:"
+msgstr "Enigu pasvorton por %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
-msgstr "Įveskite naują slaptažodį(ir jį prisiminkite)."
+msgstr "Enigu novan pasvorton (kaj memorigu ĝin!)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
-"Prie serverio jungtis leidžiama tik registruotiems vartotojams. "
-"Apgailestaujame."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
-msgstr "%s buvo atmestas, nes leidžiami tik registruoti vartotojai."
+msgstr ""
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
-msgstr "Apgailestaujame, per daug blogų bandymų..."
+msgstr "BedaÅ­re, tro da eraraj provoj..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
-"%s buvo atmestas: Per daug blogų slaptažodžio patvirtinimų naujam vartotojui."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
 msgstr ""
-"Įspėjimas: Saugant į duombazę įvyko klaida. Tęsiama, bet jūsų rezultatai "
-"nebus išsaugomi."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr ""
-"%s buvo atmestas: Per daug blogų bandymų įvedant neteisingą slaptažodį."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
-msgstr "Jūsų slaptažodis klaidingas. Bandykite dar kartą."
+msgstr "Via pasvorto ne estas ĝusta. Provu denove."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
-msgstr "Deja, Jūsų jungimosi laikas baigėsi."
+msgstr ""
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
-msgstr "%s buvo atmestas: belaukiant  slaptažodžio baigėsi jungimosi laikas."
+msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
-"Jūsų slaptažodis yra per trumpas, mažiausias ilgis yra %d. Pabandykite dar "
-"kartÄ…."
+"Via pasvorto estas tro mallonga, la minimuma longo estas %d. Provu denove."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
 "minimum %d [printable] characters long. Try again."
 msgstr ""
-"Slaptažodis mažiausiai turi turėti %d didžiųjų raidžių, %d skaičių ir būti "
-"minimaliai %d (spausdinamų) simbolių ilgio. Pabandykite dar kartą."
+"La pasvorto devas enteni almenaÅ­ %d majusklojn, %d numerojn, kaj havi longon "
+"je %d presliteroj [do preseblaj]. Provu denove."
 
 #: server/barbarian.c:183
 #, c-format
 msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
-msgstr "%s gauna vadą vardu %s. Pavojingi laikai gali laukti priešaky."
+msgstr "%s havas novan estron nomita %s. Danĝeraj tempoj alvenos."
 
 #: server/barbarian.c:479
 #, c-format
 msgid "Native unrest near %s led by %s."
-msgstr "Vietinių sukilimas šalia %s, Juos į kovą veda %s."
+msgstr "Apud %s estas ribelo de indiĝenoj estrita de %s."
 
 #: server/barbarian.c:484
 #, c-format
 msgid "Sea raiders seen near %s!"
-msgstr "Jūrų piratai pastebėti prie %s!"
+msgstr "Piratoj estas viditaj apud %s!"
 
 #: server/cityhand.c:117
+#, fuzzy
 msgid "You don't have a worker here."
-msgstr "Jūs neturite čia darbininko."
+msgstr "Vi ne povas ataki ĉi tie."
 
 #: server/cityhand.c:174
 msgid "You have already sold something here this turn."
-msgstr "Jūs kažką jau pardavėte šio apsisukimo metu."
+msgstr "Vi jam vendis ion ĉi tie, en ĉi tiu vico."
 
 #: server/cityhand.c:183
 #, c-format
 msgid "You sell %s in %s for %d gold."
-msgstr "Jūs pardavėte %s tarp %s už %d aukso."
+msgstr "Vi aĉeti %sn en %s per %d oraj moneroj."
 
 #: server/cityhand.c:223
 msgid "Cannot buy in city created this turn."
-msgstr "Jūs negalite pirkti mieste, įkurtame šiuo ėjimu."
+msgstr "Estas neeble aĉeti en urbo kiu estas kreita en ĉi tiu vico."
 
 #: server/cityhand.c:229
 msgid "You have already bought this turn."
-msgstr "jūs jau pirkote šį ėjimą."
+msgstr "Vi jam aĉetis en tiu ĉi vico."
 
 #: server/cityhand.c:236
 #, c-format
 msgid "You don't buy %s!"
-msgstr "JÅ«s neperkate %s!"
+msgstr "Vi ne aĉetis %sn!"
 
 #: server/cityhand.c:243
 msgid "Can't buy units when city is in disorder."
-msgstr "Negalima pirkti dalinių, kai mieste neramumai."
+msgstr "Estas neeble aĉeti unuojn kiam estas ribelo en la urbo."
 
 #: server/cityhand.c:262
 #, c-format
 msgid "%d gold required.  You only have %d gold."
-msgstr "Reikia %d aukso. JÅ«s turite tik %d aukso."
+msgstr "%d oraj monero necesas. Vi havas nur %d orajn monerojn."
 
 #: server/cityhand.c:363
 msgid "You have bought this turn, can't change."
-msgstr "JÅ«s jau pirkote Å¡iame Ä—jime. Pirkinio keisti negalima."
+msgstr "Vi aĉetis en tiu ĉi vico, kaj do vi ne povas interŝanĝi."
 
 #: server/citytools.c:270
 #, c-format
 msgid "You already have a city called %s."
-msgstr "JÅ«s jau turite miestÄ…, pavadintÄ… %s."
+msgstr "Vi jam havas urbon nomitan %s."
 
 #: server/citytools.c:282
 #, c-format
 msgid "A city called %s already exists."
-msgstr "Miestas, pavadintas %s, jau egzistuoja."
+msgstr "Urbo nomita %s jam ekzistas."
 
 #: server/citytools.c:309
 #, c-format
 msgid "Can't use %s as a city name. It is reserved for %s."
-msgstr "Negalima naudoti %s kaip miesto vardo. Jis paliktas %s."
+msgstr "Vi ne povas uzi %s kiel nomon de urbo. Äœi estas rezervata al %s."
 
 #: server/citytools.c:329
 #, c-format
 msgid ""
 "%s is not a valid name. Only ASCII or ruleset names are allowed for cities."
 msgstr ""
-"%s nėra leistinas vardas. Tik ASCII formato arba taisyklių rinkinio vardai "
-"leidžiami miestams ."
+"%s ne estas valida nomo. Nur ASCII aÅ­ la nomoj en la listo estas ebligitaj "
+"por urboj."
 
 #: server/citytools.c:449
 #, c-format
 msgid "City no. %d"
-msgstr "Miestas Nr. %d"
+msgstr "Urbo n. %d"
 
 #: server/citytools.c:457
 msgid "A poorly-named city"
-msgstr "Blogai pavadintas miestas"
+msgstr "Strangenomita urbo"
 
 #: server/citytools.c:508
 #, c-format
 msgid "Changed homecity of %s to %s."
-msgstr "Pakeistas %s gimtasis miestas į %s."
+msgstr "Estas ŝanĝita hejmurbo de %s al %s."
 
 #: server/citytools.c:522
 #, c-format
 msgid "Transfered %s in %s from %s to %s."
-msgstr "Perkelti %s tarp %s iš %s į %s."
+msgstr "%s estas translokitaj en %s de %s al %s."
 
 #: server/citytools.c:535
 #, c-format
 msgid "Transfered %s from %s to %s."
-msgstr "Perkelti %s iš %s į %s."
+msgstr "%s estas translokitaj de %s al %s."
 
 #. TRANS: Polish Destroyer ... German <city>
 #: server/citytools.c:548
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s lost in transfer to %s %s"
-msgstr "%s iš miesto %s prarastas pervedant į %s miestą %s"
+msgstr "%sj %s estis perditaj dum translokado al %sj %s"
 
 #: server/citytools.c:631
 #, c-format
 msgid "%s lost along with control of %s."
-msgstr "%s prarastas kartu su %s kontrole."
+msgstr "%s estis perditaj kun regilo de %s."
 
 #: server/citytools.c:759
-#, c-format
+#, fuzzy, c-format
 msgid "You lost %s. A new %s was built in %s."
-msgstr "JÅ«s praradote %s. Naujas %s bus statomas tarp %s."
+msgstr "AnstataÅ­igo de %s estis konstruita en %s."
 
 #: server/citytools.c:837
 #, c-format
 msgid "You already had a city called %s. The city was renamed to %s."
-msgstr "Jūs jau turėjote miestą, pavadintą %s. Miestas buvo pervadintas į %s."
+msgstr "Via jam havas urbon nomitan %s. La urbo estis renomita %s."
 
 #: server/citytools.c:927
 #, c-format
@@ -1671,183 +1724,179 @@ msgid ""
 "The people in %s are stunned by your technological insight!\n"
 "      Workers spontaneously gather and upgrade the city with railroads."
 msgstr ""
-"Žmonės mieste %s  yra apstulbinti Jūsų technologinių laimėjimų!\n"
-"      Darbininkai iš karto susirenka ir nutiesia mieste geležinkelį."
+"Popolo en %s supermiriĝas je via vido pri teĥnologio!\n"
+"      Laborantoj memvole grupiĝis kaj modernigis la urbon pere de fervojo."
 
 #: server/citytools.c:1054
 #, c-format
 msgid "You have founded %s."
-msgstr "Jūs įkūrėte %s."
+msgstr "Vi fondis %s-n."
 
 #: server/citytools.c:1126
-#, c-format
+#, fuzzy, c-format
 msgid "Moved %s out of disbanded city %s to avoid being landlocked."
 msgstr ""
-"%s išvestas iš panaikinto miesto %s norint išvengti neturėjimo kur eiti "
-"būsenos."
+"%s estis movita ekster la forlasitan urbon %s ekde tiam ĝi ne povas resti en "
+"%s."
 
 #: server/citytools.c:1137 server/citytools.c:1149
 #, c-format
 msgid ""
 "When %s was disbanded your %s could not get out, and it was therefore lost."
 msgstr ""
-"Kai %s buvo panaikintas, %s negalÄ—jo pasitraukti ir todÄ—l buvo prarastas."
+"Kiam %s estis forlasita, viaj %s ne povis foriri kaj do ĝi estis perdita."
 
 #: server/citytools.c:1289
 #, c-format
 msgid "You destroy %s completely."
-msgstr "Jūs visiškai sunaikinote %s."
+msgstr "Vi tute detruis %sn."
 
 #: server/citytools.c:1292
 #, c-format
 msgid "%s has been destroyed by %s."
-msgstr "%2s sunaikino %1s."
+msgstr "%s estis detruita de %s."
 
 #: server/citytools.c:1310
 #, c-format
 msgid "You conquer %s; your lootings accumulate to %d gold!"
 msgid_plural "You conquer %s; your lootings accumulate to %d gold!"
-msgstr[0] "Jūs užkariavote %s; Jūsų grobis yra %d aukso!"
-msgstr[1] "Jūs užkariavote %s; Jūsų grobis yra %d aukso!"
-msgstr[2] "Jūs užkariavote %s; Jūsų grobis yra %d aukso!"
+msgstr[0] "Vi konkeris %s-n; vi kaptis %d oran moneron!"
+msgstr[1] "Vi konkeris %s-n; vi kaptis %d orajn monerojn!"
 
 #: server/citytools.c:1317
 #, c-format
 msgid "%s conquered %s and looted %d gold from the city."
 msgid_plural "%s conquered %s and looted %d gold from the city."
-msgstr[0] "%s užkariavo %s ir prisigrobė %d aukso iš miesto."
-msgstr[1] "%s užkariavo %s ir prisigrobė %d aukso iš miesto."
-msgstr[2] "%s užkariavo %s ir prisigrobė %d aukso iš miesto."
+msgstr[0] "%s konkeris %s-n kaj kaptis %d oran moneron el la urbo."
+msgstr[1] "%s konkeris %s-n kaj kaptis %d orajn monerojn el la urbo."
 
 #: server/citytools.c:1326
 #, c-format
 msgid "You conquer %s"
-msgstr "Jūs užkariavote %s."
+msgstr "Vi konkeris %s-n"
 
 #: server/citytools.c:1329
 #, c-format
 msgid "%s conquered %s."
-msgstr "%s užkariavo %s."
+msgstr "%s konkeris %s-n."
 
 #: server/citytools.c:1336
 #, c-format
 msgid "You have liberated %s! Lootings accumulate to %d gold."
 msgid_plural "You have liberated %s! Lootings accumulate to %d gold."
-msgstr[0] "Jūs išvadavote %s! Grobdamas surinkote %d aukso."
-msgstr[1] "Jūs išvadavote %s! Grobdamas surinkote %d aukso."
-msgstr[2] "Jūs išvadavote %s! Grobdamas surinkote %d aukso."
+msgstr[0] "Vi liberigis %s-n! Disrabado sumas je %d ora monero."
+msgstr[1] "Vi liberigis %s-n! Disrabado sumas je %d oraj moneroj."
 
 #: server/citytools.c:1343
 #, c-format
 msgid "%s liberated %s and looted %d gold from the city."
 msgid_plural "%s liberated %s and looted %d gold from the city."
-msgstr[0] "%s išvadavo %s ir prisigrobė %d aukso iš miesto."
-msgstr[1] "%s išvadavo %s ir prisigrobė %d aukso iš miesto."
-msgstr[2] "%s išvadavo %s ir prisigrobė %d aukso iš miesto."
+msgstr[0] "%s liberigis %s-n kaj rabegis %d oran moneron el la urbo."
+msgstr[1] "%s liberigis %s-n kaj rabegis %d orajn monerojn el la urbo."
 
 #: server/citytools.c:1352
 #, c-format
 msgid "You have liberated %s!"
-msgstr "Jūs išlaisvinote %s!"
+msgstr "Vi liberigis %s-n!"
 
 #: server/citytools.c:1355
 #, c-format
 msgid "%s liberated %s."
-msgstr "%s išlaisvino %s"
+msgstr "%s liberigis %s-n."
 
 #: server/citytools.c:1953
 msgid " from the worklist"
-msgstr " iš darbų sąrašo"
+msgstr " el la laborlisto"
 
 #. TRANS: "<city> is building <production><source>."
 #: server/citytools.c:1965
 #, c-format
 msgid "%s is building %s%s."
-msgstr "%s stato %s%s."
+msgstr "%s estas konstruanta %s%s-n."
 
 #: server/citytools.c:2211
 #, c-format
 msgid "You sell %s in %s (now landlocked) for %d gold."
-msgstr "Jūs parduodate %s mieste %s (dabar neturi kur eiti) už %d aukso."
+msgstr "Vi vendis %sn en %s (nun landinterna) per %d oraj moneroj."
 
 #: server/cityturn.c:125
 #, c-format
 msgid "%s is selling %s (obsolete) for %d."
-msgstr "%s parduoda %s (pasenęs) už %d."
+msgstr "%s vendas %sn (arkaikaĵo) por %d oraj moneroj."
 
 #: server/cityturn.c:304
 #, c-format
 msgid "Notice: Wonder %s in %s will be finished next turn."
-msgstr "Pastaba: Stebuklas %s %s bus užbaigtas kitu ėjimu."
+msgstr "Mirindaĵo %s en %s estos finita sekvan turnon."
 
 #: server/cityturn.c:339
 #, c-format
 msgid ""
 "Suggest throttling growth in %s to use %s (being built) more effectively."
-msgstr "Augimui paspartinti mieste %s siūloma pastatyti %s (yra statoma)."
+msgstr "Oni konsilas kreskoreguladon en %s por pli bone uzi %sn (preparotan)."
 
 #: server/cityturn.c:351
 #, c-format
 msgid "%s may soon grow to size %i."
-msgstr "%s gal ituoj užaugti iki dydžio %i."
+msgstr "%s povus baldaŭ pligrandiĝi je %ia grando."
 
 #: server/cityturn.c:360
 #, c-format
 msgid "Warning: Famine feared in %s."
-msgstr "Įspėjimas: Bado bijomasi %s."
+msgstr "ATENTU: timo pri malsatmizero en %s."
 
 #: server/cityturn.c:383
 msgid "WARNING, we're LOW on FUNDS sire."
-msgstr "DĖMESIO, mes turime MAŽAI LĖŠŲ."
+msgstr "ATENTU; ni havas malmulton da mono, via moŝto."
 
 #: server/cityturn.c:475
 #, c-format
 msgid "%s needs %s (being built) to grow any further."
-msgstr "Miestui %s reikia %s (yra statomas), kad galėtų toliau augti."
+msgstr "%s bezonas %sn (preparotan) por plue pligrandiĝi."
 
 #: server/cityturn.c:481
 #, c-format
 msgid "%s needs an improvement to grow any further."
-msgstr "Miestui %s reikia patobulinimo, kad galėtų toliau augti."
+msgstr "%s bezonas plibonigon por plue pligrandiĝi."
 
 #: server/cityturn.c:524
 #, c-format
 msgid "%s grows to size %d."
-msgstr "%s auga iki dydžio %d."
+msgstr "%s pligrandiĝis je %da grando."
 
 #: server/cityturn.c:557
 #, c-format
 msgid "Famine feared in %s, %s lost!"
-msgstr "Bado bijomasi %s, %s prarasta!"
+msgstr "Malsatmizero estas en %s, %s estas perditaj!"
 
 #: server/cityturn.c:570
 #, c-format
 msgid "Famine causes population loss in %s."
-msgstr "Badas sukelia populiacijos praradimÄ… %s."
+msgstr "Malsatmizero kaŭzas malpliigon de loĝantaro en %s."
 
 #: server/cityturn.c:574
 #, c-format
 msgid "Famine destroys %s entirely."
-msgstr "Badas sunaikina %s visiškai."
+msgstr "Malsatmizero tute detruis %sn."
 
 #: server/cityturn.c:649
 #, c-format
 msgid ""
 "%s can't build %s from the worklist; tech not yet available.  Postponing..."
 msgstr ""
-"%s negali statyti %s patobulinimo iš darbų sąrašo, nes nėra reikiamos "
-"technologijos.  Atidedama..."
+"%s ne povas konstrui %sn el la laborlisto; teĥnologio ne ankoraŭ disponebla. "
+"Äœi estas prokrastita..."
 
 #: server/cityturn.c:662 server/cityturn.c:698
 #, c-format
 msgid "%s can't build %s from the worklist.  Purging..."
-msgstr "%s negali statyti %s iš darbų sąrašo.  Panaikinama..."
+msgstr "%s ne povas konstrui %sn el la laborlisto.  Äœi estas forigita..."
 
 #: server/cityturn.c:682 server/cityturn.c:844 server/cityturn.c:944
 #: server/cityturn.c:991
 #, c-format
 msgid "Production of %s is upgraded to %s in %s."
-msgstr "%s gamyba yra patobulinta į %s gamybą mieste %s."
+msgstr "Produktado de %s altiĝis ĝis %s en %s."
 
 #: server/cityturn.c:730
 #, c-format
@@ -1855,199 +1904,200 @@ msgid ""
 "%s can't build %s from the worklist; tech %s not yet available.  "
 "Postponing..."
 msgstr ""
-"%s negali statyti %s iš darbų sąrašo, technologija %s dar neatrasta. "
-"Atidedama..."
+"%s ne povas prepari %sn de la laborlisto; teĥnologio pri %s ne estas ankoraŭ "
+"disponebla. Äœi estas prokrastita..."
 
 #: server/cityturn.c:743
 #, c-format
 msgid ""
 "%s can't build %s from the worklist; need to have %s first.  Postponing..."
 msgstr ""
-"%s negali statyti %s iš darbų sąrašo, nes pirma reikia turėti %s. "
-"Atidedama..."
+"%s ne povas prepari %sn de la laborlisto; unue necesas %s. Äœi estas "
+"prokrastita..."
 
 #: server/cityturn.c:756
 #, c-format
 msgid ""
 "%s can't build %s from the worklist; it needs %s government.  Postponing..."
-msgstr "%s negali statyti %s iš darbų sąrašo. Reikalinga %s. Atidedama..."
+msgstr ""
+"%s ne povas prepari %sn de la laborlisto; necesas %s kiel regado. Äœi estas "
+"prokrastita..."
 
 #: server/cityturn.c:768
 #, c-format
 msgid ""
 "%s can't build %s from the worklist; %s special is required.  Postponing..."
 msgstr ""
-"%s negali statyti %s iš darbų sąrašo. Reikalingas specialus laukelis %s. "
-"Atidedama..."
+"%s ne povas prepari %sn de la laborlisto; necesas %s. Äœi estas prokrastita..."
 
 #: server/cityturn.c:780
 #, c-format
 msgid ""
 "%s can't build %s from the worklist; %s terrain is required.  Postponing..."
 msgstr ""
-"%s negali statyti %s iš darbų sąrašo, kadangi reikalingas %s reljefas. "
-"Atidedama..."
+"%s ne povas prepari %sn de la laborlisto; necesas %s areo. Äœi estas "
+"prokrastita..."
 
 #: server/cityturn.c:794
 #, c-format
 msgid ""
 "%s can't build %s from the worklist; only %s may build this.  Postponing..."
 msgstr ""
-"%s negali statyti %s iš darbų sąrašo, kadangi tik %s gali tai statyti. "
-"Atidedama..."
+"%s ne povas prepari %sn de la laborlisto; nur %s povas konstrui tion. Äœi "
+"estas prokrastita..."
 
 #: server/cityturn.c:813
 #, c-format
 msgid ""
 "%s can't build %s from the worklist; city must be of size %d.  Postponing..."
 msgstr ""
-"%s negali statyti %s iš darbų sąrašo. Miestas turi būti dydžio %d. "
-"Atidedama..."
+"%s ne povas prepari %sn de la laborlisto; la urbo devas havi grandecon je %"
+"d. Äœi estas prokrastita..."
 
 #: server/cityturn.c:835
 #, c-format
 msgid "%s can't build %s from the worklist; Reason unknown!  Postponing..."
 msgstr ""
-"%s negali statyti %s iš darbų sąrašo. Priežastis nežinoma!  Atidedama..."
+"%s ne povas prepari %sn de la laborlisto; Nekonata kialo! Äœi estas "
+"prokrastita..."
 
 #. TRANS: The <city> worklist ....
 #: server/cityturn.c:870
-#, fuzzy, c-format
+#, c-format
 msgid "The %s worklist is now empty."
-msgstr "%s darbų sąrašas dabar tuščias."
+msgstr "La laborlisto de %s estas malplena nun."
 
 #: server/cityturn.c:1013
 #, c-format
 msgid "%s can't upkeep %s, unit disbanded."
-msgstr "%s negali išlaikyti %s, dalinys panaikintas."
+msgstr "%s ne povas teni %sn, do la unuo estis dissolvita."
 
 #: server/cityturn.c:1033
 #, c-format
 msgid "Citizens in %s perish for their failure to upkeep %s!"
-msgstr "Miesto %s gyventojai žūsta negalėdami išlaikyti %s!"
+msgstr "La civitanoj en %s mortas ĉar ili malsukcesis teni %sn!"
 
 #: server/cityturn.c:1080 server/cityturn.c:1200
 #, c-format
 msgid "%s is building %s, which is no longer available."
-msgstr "%s stato %s, kuris daugiau neprieinamas."
+msgstr "%s estas preparanta %sn, kiu ne estas plu disponebla."
 
 #: server/cityturn.c:1122
 #, c-format
 msgid "The %s have finished building %s in %s."
-msgstr "%s pabaigÄ— statyti pastatÄ… %s mieste %s."
+msgstr "La %s plenumis la preparadon de %s en %s."
 
 #: server/cityturn.c:1132
 #, c-format
 msgid "%s has finished building %s."
-msgstr "%s baigÄ— statyti %s."
+msgstr "%s plenumis la preparadon de %s."
 
 #: server/cityturn.c:1148
 #, c-format
 msgid "%s boosts research; you gain %d immediate advance."
 msgid_plural "%s boosts research; you gain %d immediate advances."
-msgstr[0] "%s paskatino tyrinėjimus; Jūs iš karto gaunate %d pasiekimą."
-msgstr[1] "%s paskatino tyrinėjimus; Jūs iš karto gaunate %d pasiekimus."
-msgstr[2] "%s paskatino tyrinėjimus; Jūs iš karto gaunate %d pasiekimų."
+msgstr[0] "%s plirapidigas la studadon; vi gajnas %d tujan avanaĵon."
+msgstr[1] "%s plirapidigas la studadon; vi gajnas %d tujajn avanaĵojn."
 
 #: server/cityturn.c:1158 server/techtools.c:176
 #, c-format
 msgid "The %s have acquired %s from %s."
-msgstr "%s gavo technologiją %s iš %s."
+msgstr "La %s aĉetis %sn el %s."
 
 #: server/cityturn.c:1166
 #, c-format
 msgid "The %s have started building a spaceship!"
-msgstr "%s pradėjo statyti erdvėlaivį!"
+msgstr "La %s komencis konstrui kosmoŝipon!"
 
 #: server/cityturn.c:1225
 #, c-format
 msgid "%s can't build %s yet."
-msgstr "%s dar negali statyti %s."
+msgstr "%s ne povas ankoraÅ­ konstrui %sn."
 
 #. TRANS: <city> is finished building <unit/building>.
 #: server/cityturn.c:1258
 #, c-format
 msgid "%s is finished building %s."
-msgstr "%s baigÄ— statyti %s."
+msgstr "%s plenumis preparadon de %s."
 
 #: server/cityturn.c:1300
 #, c-format
 msgid "Can't afford to maintain %s in %s, building sold!"
-msgstr "Negalime išlaikyti %s mieste %s, pastatas parduotas!"
+msgstr ""
+"Viaj enspezoj ne permesas al vi bontenadon de %s en %s, do la konstruaĵo "
+"estis vendita!"
 
 #: server/cityturn.c:1336
 #, c-format
 msgid "Pollution near %s."
-msgstr "Tarša prie %s."
+msgstr "Poluado ĉe %s."
 
 #: server/cityturn.c:1483
 #, c-format
 msgid "We Love The %s Day celebrated in %s."
-msgstr "Mes mylime %s diena švenčiama %s."
+msgstr ""
 
 #: server/cityturn.c:1490
-#, c-format
+#, fuzzy, c-format
 msgid "We Love The %s Day canceled in %s."
-msgstr "Mes mylime %s diena atšaukta %s."
+msgstr "La celebrado en %s estas nuligita."
 
 #: server/cityturn.c:1519
 #, c-format
 msgid "Civil disorder in %s."
-msgstr "Neramumai %s."
+msgstr "Civitana ribelo en %s."
 
 #: server/cityturn.c:1523
 #, c-format
 msgid "CIVIL DISORDER CONTINUES in %s."
-msgstr "NERAMUMAI TĘSIASI %s."
+msgstr "CIVITANA RIBELO PLUDAŬRAS en %s."
 
 #: server/cityturn.c:1529
 #, c-format
 msgid "Order restored in %s."
-msgstr "Tvarka atstatyta %s."
+msgstr "Publika ordo estis restarigita en %s."
 
 #: server/cityturn.c:1539
 #, c-format
 msgid "The people have overthrown your %s, your country is in turmoil."
-msgstr "Jūsų %s buvo nuversta. Jūsų šalis sumaištyje."
+msgstr "La popolo eksigis vian %s, la nacio ekribelas."
 
 #: server/cityturn.c:1564
 #, c-format
 msgid "%s can't build %s yet, and we can't disband our only city."
 msgstr ""
-"%s dar negali statyti %s, ir mes negalime panaikinti mūsų vienintelio miesto."
+"%s ne povas ankoraÅ­ konstrui %sn kaj ni ne povas forlasi nian nuran urbon."
 
 #. TRANS: "<city> is disbanded into Settler."
 #: server/cityturn.c:1588
 #, c-format
 msgid "%s is disbanded into %s."
-msgstr "%s išformuotas į %s."
+msgstr "%s estis forlasita en %s."
 
 #: server/civserver.c:77
 msgid "You must interrupt Freeciv twice within one second to make it exit.\n"
 msgstr ""
-"Jūs turite pertraukti Freeciv du kartus per sekundę, kad galėtumėte išeiti.\n"
 
 #: server/civserver.c:134
 #, c-format
 msgid "Warning: the %s option is obsolete.  Use -m to enable the metaserver.\n"
 msgstr ""
-"Dėmesio: %s parinktis yra pasenusi.  Naudokite -m norėdami įjungti "
-"metaserverį.\n"
+"ATENTU: la opcio %s estas arkaika.  Uzu -m por aktivigi la metaservilon.\n"
 
 #: server/civserver.c:189
 #, c-format
 msgid "Error: unknown option '%s'\n"
-msgstr "Klaida: nežinomas parametras „%s“\n"
+msgstr "Eraro: opcio '%s' estas nekonata\n"
 
 #: server/civserver.c:200
 #, c-format
 msgid "This is the server for %s"
-msgstr "Tai yra %s serveris"
+msgstr "Tiu ĉi estas la servilo por %s"
 
 #: server/civserver.c:201
 #, c-format
 msgid "You can learn a lot about Freeciv at %s"
-msgstr "Apie Freeciv daug galite sužinoti: %s"
+msgstr "Vi povas multe lerni pri Freeciv ĉe %s"
 
 #: server/civserver.c:206 client/civclient.c:237 manual/civmanual.c:380
 #, c-format
@@ -2057,11 +2107,10 @@ msgid ""
 msgstr ""
 
 #: server/civserver.c:208
-#, fuzzy
 msgid ""
 "  -a  --auth FILE\tEnable server authentication with configuration from "
 "FILE.\n"
-msgstr "  -a  --auth\t\tĮgalinti serverio autentifikavimą.\n"
+msgstr ""
 
 #: server/civserver.c:210
 msgid "  -G  --Guests\t\tAllow guests to login if auth is enabled.\n"
@@ -2086,7 +2135,7 @@ msgstr ""
 
 #: server/civserver.c:223
 msgid "  -f, --file FILE\tLoad saved game FILE\n"
-msgstr "  -f, --file FAILAS\tĮkelti išsaugotą žaidimą FAILAS\n"
+msgstr ""
 
 #: server/civserver.c:225 client/civclient.c:248 manual/civmanual.c:382
 msgid "  -h, --help\t\tPrint a summary of the options\n"
@@ -2102,11 +2151,11 @@ msgstr ""
 
 #: server/civserver.c:229
 msgid "  -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
-msgstr "  -M, --Metaserver ADDR\tNustatyti ADDR kaip metaserverio adresÄ…\n"
+msgstr ""
 
 #: server/civserver.c:232
 msgid "  -p, --port PORT\tListen for clients on port PORT\n"
-msgstr "  -p, --port PRIEVADAS\tKlausyti klientų prievade PRIEVADAS\n"
+msgstr ""
 
 #: server/civserver.c:234
 msgid "  -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
@@ -2114,7 +2163,7 @@ msgstr ""
 
 #: server/civserver.c:236
 msgid "  -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
-msgstr "  -e, --exit-on-end\tKai žaidimas pasibaigs, išeiti, o ne perkrauti\n"
+msgstr ""
 
 #: server/civserver.c:239
 msgid "  -s, --saves DIR\tSave games to directory DIR\n"
@@ -2122,7 +2171,7 @@ msgstr ""
 
 #: server/civserver.c:241
 msgid "  -S, --Serverid ID\tSets the server id to ID\n"
-msgstr "  -S, --Serverid ID\tNustato serverio id į ID\n"
+msgstr ""
 
 #: server/civserver.c:243
 msgid "  -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
@@ -2138,18 +2187,18 @@ msgstr ""
 
 #: server/civserver.c:247 client/civclient.c:267 manual/civmanual.c:383
 msgid "  -v, --version\t\tPrint the version number\n"
-msgstr "  -v, --version\t\tAtspausdinti versijos numerį\n"
+msgstr ""
 
 #: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:279
 #: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
 #: manual/civmanual.c:384
-#, c-format
+#, fuzzy, c-format
 msgid "Report bugs at %s.\n"
-msgstr "Pranešti apie klaidas į %s.\n"
+msgstr "Bonvolu raporti pri la eraro al %s\n"
 
 #: server/commands.c:28
 msgid "Start the game, or restart after loading a savegame."
-msgstr "Paleisti žaidimą arba pratęsti užsaugotą žaidimą."
+msgstr "Komencu ludon aŭ restarigu post reŝargo de konservita ludo."
 
 #: server/commands.c:29
 msgid ""
@@ -2161,6 +2210,13 @@ msgid ""
 "savegame for the game to recommence.  Once the game is running this command "
 "is no longer available, since it would have no effect."
 msgstr ""
+"Tiu ĉi komando startigas la ludon.  Kiam oni komencas novan ludon, ĝi devus "
+"esti uzata post kiam ĉiuj homaj ludantoj estas konektitaj kaj la IA-ludantoj "
+"estis (se ĝi necesas) kreitaj kaj iu ajn modifo pri komencaj opcioj estis "
+"plenumitaj. Post \"komencu\", ĉiu homa ludanto povas elekti la nacio kaj "
+"post tio la ludon povas komenci. Tiu ĉi komando necesas ankaŭ por iu ajn "
+"(ŝargitan) konservitan ludon por lanĉi la ludon mem.  Kiam la ludon "
+"komencis, tiu ĉi komando ne estas pli videbla, ĉar ĉiukaze ĝi ne plu efikas."
 
 #. TRANS: translate text between <> only
 #: server/commands.c:42
@@ -2171,6 +2227,11 @@ msgid ""
 "help <command-name>\n"
 "help <option-name>"
 msgstr ""
+"help\n"
+"help commands\n"
+"help options\n"
+"help <komand-nomo>\n"
+"help <opci-nomo>"
 
 #: server/commands.c:47
 msgid "Show help about server commands and server options."
@@ -2188,7 +2249,7 @@ msgstr ""
 
 #: server/commands.c:63
 msgid "Show a list of players, teams, connections, or scenarios."
-msgstr "Parodyti žaidėjų, komandų, jungčių ar scenarijų sąrašą."
+msgstr "Vidigu la liston pri ludantoj, grupoj, konektoj kaj scenejoj."
 
 #: server/commands.c:64
 msgid ""
@@ -2199,16 +2260,16 @@ msgstr ""
 
 #: server/commands.c:70
 msgid "Quit the game and shutdown the server."
-msgstr "Išeiti iš žaidimo ir išjungti serverį"
+msgstr "Eliru el la ludo kaj fermu la servilon."
 
 #. TRANS: translate text between <> only
 #: server/commands.c:74
 msgid "cut <connection-name>"
-msgstr "cut <ryšio-vardas>"
+msgstr "cut <konekto>"
 
 #: server/commands.c:75
 msgid "Cut a client's connection to server."
-msgstr "Ajungti klientÄ… nuo serverio."
+msgstr "CUT interrompas konektadon kun servilo."
 
 #: server/commands.c:76
 msgid ""
@@ -2225,11 +2286,11 @@ msgid ""
 "explain <option-name>"
 msgstr ""
 "explain\n"
-"explain <parametro-pavadinimas>"
+"explain <opcinomo>"
 
 #: server/commands.c:85
 msgid "Explain server options."
-msgstr "Paaiškinti serverio parinktis."
+msgstr ""
 
 #: server/commands.c:86
 msgid ""
@@ -2246,10 +2307,13 @@ msgid ""
 "show <option-name>\n"
 "show <option-prefix>"
 msgstr ""
+"show\n"
+"show <opcinomo>\n"
+"show <antaÅ­meta opcio>"
 
 #: server/commands.c:96
 msgid "Show server options."
-msgstr "Rodyti serverio nustatymus."
+msgstr ""
 
 #: server/commands.c:97
 msgid ""
@@ -2260,11 +2324,11 @@ msgstr ""
 
 #: server/commands.c:102
 msgid "wall <message>"
-msgstr "wall <žinutė>"
+msgstr ""
 
 #: server/commands.c:103
 msgid "Send message to all connections."
-msgstr "Pasiųsti žinutę visoms jungtims."
+msgstr "Sendu mesaĝon al ĉiu konekto."
 
 #: server/commands.c:104
 msgid ""
@@ -2273,11 +2337,11 @@ msgstr ""
 
 #: server/commands.c:108
 msgid "vote yes|no [vote number]"
-msgstr "vote yes|no [balso numeris]"
+msgstr "vote yes|no [kvanto de voĉdono]"
 
 #: server/commands.c:109
 msgid "Cast a vote."
-msgstr "Balsuoti."
+msgstr "Voĉdonu."
 
 #: server/commands.c:111
 #, no-c-format
@@ -2287,44 +2351,42 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr ""
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
-msgstr ""
+msgstr "set <opcinomo> <valoro>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
-msgstr "Nustatyti serverio parinktį."
+msgstr "Agordu opciojn pri servilo."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
-msgstr ""
+msgstr "team <ludanto> [grupo]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr ""
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2332,30 +2394,30 @@ msgid ""
 "to achieve team victory with averaged individual scores."
 msgstr ""
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
-msgstr ""
+msgstr "rulesetdir <dosierujo>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr ""
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
-msgstr "metainfo <meta-eilutÄ—>"
+msgstr "metainfo <lineo de metaservilo>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr ""
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2364,19 +2426,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
-msgstr "metapatch <meta-eilutÄ—>"
+msgstr "metapatch <lineo de metaservilo>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr ""
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr ""
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2384,33 +2446,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
-msgstr "metaserver <adresas>"
+msgstr "metaserver <adreso>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
-msgstr ""
+msgstr "Agordu la adreson (URL) de la metaservilon por raporti."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
-msgstr "aitoggle <žaidėjo-vardas>"
+msgstr "aitoggle <ludantonomo>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
-msgstr ""
+msgstr "Mastrumu IA-staton de la ludanto."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
-msgstr "take [ryšio-vardas] <žaidėjo-vardas>"
+msgstr "take [konektonomo] <ludantonomo>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
-msgstr "Užimti žaidėjo vietą žaidime."
+msgstr "AnstataÅ­u ludanton en la ludo."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2420,15 +2482,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
-msgstr "observe [ryšio-pavadinimas] [žaidėjo-vardas]"
+msgstr "observe [konektonomo] [ludantonomo]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
-msgstr "Stebėti žaidėją arba visą žaidimą."
+msgstr ""
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2438,62 +2500,64 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
-msgstr "detach <ryšio-pavadinimas>"
+msgstr "detach <konektonomo>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
-msgstr "atsijungti nuo žaidėjo."
+msgstr "Disigu de iu ludanto."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
 msgstr ""
+"Nur la konzolo kaj la konektoj kun komand-nivelo 'hack' kapablas devigi "
+"aliajn konektojn al la disigo de iu ludanto."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
-msgstr "create <žaidėjo-vardas>"
+msgstr "create <ludantonomo>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
-msgstr "Sukuria DI žaidėją nurodytu vardu."
+msgstr "Kreu IA-ludanton kun nomo."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
-msgstr ""
+msgstr "La komando 'create' estas uzebla nur antaÅ­ la komenco de la ludo."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
 msgstr ""
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
-msgstr ""
+msgstr "FOR moduso. La IA anstataÅ­as vin dumtempe."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
-msgstr "DI valdys jūsų tautą, bet darys minimalius pakeitimus"
+msgstr "La IA regos vian nacion sed ĝi plenumos nur etajn modifojn."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
 msgstr ""
 "novice\n"
-"novice <žaidėjo-vardas>"
+"novice <ludantonomo>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
-msgstr ""
+msgstr "Agordu unu aÅ­ pluraj IA-ludantoj laÅ­ nivelo 'novico'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2501,19 +2565,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
 msgstr ""
 "easy\n"
-"easy <žaidėjo-vardas>"
+"easy <ludantonomo>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
-msgstr ""
+msgstr "Agordu unu aÅ­ pluraj IA-ludantoj laÅ­ nivelo 'facila'."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2521,19 +2585,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
 msgstr ""
 "normal\n"
-"normal <žaidėjo-vardas>"
+"normal <ludantonomo>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
-msgstr ""
+msgstr "Agordu unu aÅ­ pluraj IA-ludantoj laÅ­ nivelo 'normala'."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2541,19 +2605,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
 msgstr ""
 "hard\n"
-"hard <žaidėjo-vardas>"
+"hard <ludantonomo>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
-msgstr ""
+msgstr "Agordu unu aÅ­ pluraj IA-ludantoj laÅ­ nivelo 'malfacila'."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2561,19 +2625,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
 msgstr ""
 "experimental\n"
-"experimental <žaidėjo-vardas>"
+"experimantal <ludantonomo>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
-msgstr ""
+msgstr "Agordu unu aÅ­ pluraj IA-ludantoj laÅ­ nivelo 'eksperimenta'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2582,7 +2646,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2591,16 +2655,16 @@ msgid ""
 "cmdlevel <level> <connection-name>"
 msgstr ""
 "cmdlevel\n"
-"cmdlevel <lygis>\n"
-"cmdlevel <lygis> new\n"
-"cmdlevel <lygis> first\n"
-"cmdlevel <lygis> <ryšio-pavadinimas>"
+"cmdlevel <nivelo>\n"
+"cmdlevel <nivelo> new\n"
+"cmdlevel <nivelo> first\n"
+"cmdlevel <nivelo> <konektonomo>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr ""
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2622,79 +2686,85 @@ msgid ""
 "now takes connection names, not player names."
 msgstr ""
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
-msgstr ""
+msgstr "timeoutincrease <vico> <vicprogresado> <valoro> <valormultipliko>."
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
-msgstr ""
+msgstr "Vidu \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
 "with the option \"timeout\". Defaults are 0 0 0 1"
 msgstr ""
+"Po <vico> vicoj, oni aldonas <valoro>-n al tempolimo, kaj poste oni aldonas "
+"<vicprogresado>-n al <vico> kaj oni multiplikas <valoro> per "
+"<valormultipliko>. Uzu ĉi tiun opio kun opcio \"timeout\". Apriora valoro "
+"estas  0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
+#, fuzzy
 msgid "endgame"
-msgstr "endgame"
+msgstr "Renomu"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
-msgstr "Iškart baigti žaidimą lygiosiomis."
+msgstr "Finigu tuj la ludon egalstate."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
+#, fuzzy
 msgid "surrender"
-msgstr "pasiduoti"
+msgstr "Uzurpatoro"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
-msgstr ""
+msgstr "Cedo la ludon."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
-msgstr "remove <žaidėjo-vardas>"
+msgstr "remove <ludantonomo>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
-msgstr "Visiškai pašalina žaidėją iš žaidimo."
+msgstr "TUTE formovu ludanton de la ludo."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
 msgstr ""
 "save\n"
-"save <failo-pavadinimas>"
+"save <dosiernomo>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
-msgstr "Išsaugo žaidimą į failą."
+msgstr "Konservu la ludon en dosiero."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2705,100 +2775,100 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
 msgstr ""
 "load\n"
-"load <failo-pavadinimas>"
+"load <dosiernomo>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
-msgstr "Įkelti žaidimą iš failo."
+msgstr "Åœargu ludon el dosiero."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
-msgstr "read <failo-vardas>"
+msgstr "read <dosiernomo>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
-msgstr ""
+msgstr "Plenumu komandojn de la servilo pere de dosiero."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
-msgstr "write <failo-vardas>"
+msgstr "write <dosiernomo>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
-msgstr ""
+msgstr "Skribu nunajn agordojn kiel komandoj de la servilo en dosiero."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
-msgstr ""
+msgstr "Interŝanĝu eligon inter 'RFC-stilo' kaj normala stilo."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
-msgstr "Paprasčiausiai grąžina serverio identfikacinį numerį."
+msgstr "Vidigu la ID-on de la servilo."
 
 #: server/connecthand.c:85
 #, c-format
 msgid "Welcome to the %s Server running at %s port %d."
-msgstr "Sveiki atvykę į %s serverį, paleistą %s %d prievade."
+msgstr "Bonvenon al servilo %s plenumanta ĉe %s - pordo %d."
 
 #: server/connecthand.c:89
 #, c-format
 msgid "Welcome to the %s Server at port %d."
-msgstr "Sveiki atvykę į %s serverį, prievadas %d"
+msgstr "Bonvenon al servilo %s ĉe pordo %d."
 
 #. TRANS: (connection) identifier: ... [network address]
 #: server/connecthand.c:97
 #, fuzzy, c-format
 msgid "(%d) %s: connected [%s]"
-msgstr "(%d) %s prisijungė iš %s."
+msgstr "%s estas konektita el %s."
 
 #: server/connecthand.c:104
 #, c-format
 msgid "Server: %s has connected from %s."
-msgstr "Serveris: %s prisijungė iš %s."
+msgstr "Servilo: %s  estas konektita el %s."
 
 #: server/connecthand.c:145
 msgid "Couldn't attach your connection to new player."
-msgstr "Negalime Jūsų prijungti prie naujo žaidėjo."
+msgstr "Estas neeble konekti vian konekton kun novan ludanto."
 
 #: server/connecthand.c:165
 #, c-format
 msgid "You are logged in as '%s' connected to no player."
-msgstr ""
+msgstr "Vi estas konektita kiel '%s' konektita kun neniu ludanto."
 
 #: server/connecthand.c:169
 #, c-format
 msgid "You are logged in as '%s' connected to an anonymous player."
-msgstr ""
+msgstr "Vi estas konektita kiel '%s' konektita kun anonima ludanto."
 
 #: server/connecthand.c:174
 #, c-format
 msgid "You are logged in as '%s' connected to %s."
-msgstr ""
+msgstr "Vi estas konektita kiel '%s' konektita kun %s."
 
 #: server/connecthand.c:187
 #, c-format
 msgid "Turn-blocking game play: waiting on %s to finish turn..."
-msgstr ""
+msgstr "LaÅ­vica ludo: bonvolu atendi en %s ke la turnoj estas finitaj..."
 
 #. TRANS: (connection) identifier: ... [network address]
 #: server/connecthand.c:240
-#, c-format
+#, fuzzy, c-format
 msgid "(%d) %s: connection request [%s]"
-msgstr ""
+msgstr "Konektopeto de %s el %s"
 
 #: server/connecthand.c:266
 msgid "The client is missing a capability that this server needs."
@@ -2807,7 +2877,7 @@ msgstr ""
 #: server/connecthand.c:268 server/connecthand.c:279
 #, fuzzy, c-format
 msgid "(%d) %s rejected: mismatched capabilities!"
-msgstr "(%d) %s buvo atmestas dėl nesuderinamų galimybių."
+msgstr "%s  estis rifuzita: nekongruaj mandatoj."
 
 #: server/connecthand.c:277
 msgid "This server is missing a capability that the client needs."
@@ -2816,148 +2886,149 @@ msgstr ""
 #: server/connecthand.c:290
 #, fuzzy
 msgid "The username is invalid!"
-msgstr "Netinkamas vartotojo vardas"
+msgstr "Tiu nomo ne estas permesita."
 
 #. TRANS: (connection) identifier: ... [network address]
 #: server/connecthand.c:292
 #, fuzzy, c-format
 msgid "(%d) %s rejected: invalid username [%s]"
-msgstr "(%d) %s buvo atmestas: Neleistinas vardas [%s]."
+msgstr "%s estis rifuzita: nevalida nomo [%s]."
 
 #: server/connecthand.c:303
 #, fuzzy
 msgid "Your username is already connected!"
-msgstr "jau prisijungęs."
+msgstr "Via kosmoŝipo jam ekflugis!"
 
 #. TRANS: (connection) identifier: ... [network address]
 #: server/connecthand.c:305
 #, fuzzy, c-format
 msgid "(%d) %s rejected: duplicate username [%s]"
-msgstr ""
-"(%d) %sbuvo atmestas: antrąkart jungiamasi tuo pačiu prisijungimo vardu[%s]."
+msgstr "%s estis rifuzita: duplikita nomo [%s]."
 
 #: server/connecthand.c:335 server/connecthand.c:344
 #, c-format
 msgid "Lost connection: %s."
-msgstr "Prarastas ryšys: %s."
+msgstr "Konekto estis perdita: %s."
 
 #: server/console.c:167
 msgid "Ok. RFC-style set."
-msgstr ""
+msgstr "BONE. RFC-stilo estas ebligita."
 
 #: server/console.c:169
 msgid "Ok. Standard style set."
-msgstr ""
+msgstr "BONE. Normala stilo estas ebligita."
 
 #: server/console.c:189
 msgid "For introductory help, type 'help'."
-msgstr "Norėdami gauti įžanginę pagalbą surinkite 'help'."
+msgstr "Por helpo, tajpu 'help'."
 
 #: server/diplhand.c:164
 #, c-format
 msgid "The %s can't accept %s."
-msgstr "%s negali priimti %s."
+msgstr "La %s ne povas akcepti %s."
 
 #: server/diplhand.c:176
 #, c-format
 msgid "You don't have tech %s, you can't accept treaty."
-msgstr "JÅ«s neturite technologijos %s, negalite priimti sutarties."
+msgstr "Vi ne havas la teĥnologion %s, do vi ne povas akcepti la kontrakton."
 
 #: server/diplhand.c:185
 msgid "City you are trying to give no longer exists, you can't accept treaty."
 msgstr ""
-"Miestas, kurį Jūs bandote atiduoti, nebegzistuoja. Jūs negalite priimti "
-"sutarties."
+"La urbo, kiun vi provas doni, ne ekzistas plu, do vi ne povas akcepti la "
+"kontrakton."
 
 #: server/diplhand.c:191
 #, c-format
 msgid "You are not owner of %s, you can't accept treaty."
-msgstr "JÅ«s nesate %s savininkas, negalite priimti sutarties."
+msgstr ""
+"Vi ne estas la proprietulo de %s, do vi ne povas akcepti la kontrakton."
 
 #: server/diplhand.c:197 server/diplhand.c:301
 #, c-format
 msgid "Your capital (%s) is requested, you can't accept treaty."
-msgstr "Pareikalaute Jūsų sostinė (%s), negalite priimti sutarties."
+msgstr "Oni postulas vian ĉefurbon (%s), do vi ne povas akcepti la kontrakton."
 
 #: server/diplhand.c:224
 msgid "You don't have enough gold, you can't accept treaty."
-msgstr "Neturi pakankamai aukso, dÄ—l to negali priimti sutarties."
+msgstr "Vi ne havas sufiĉe da oro, do vi ne povas akcepti la kontrakton."
 
 #: server/diplhand.c:256 server/diplhand.c:261
 #, c-format
 msgid "A treaty containing %d clause was agreed upon."
 msgid_plural "A treaty containing %d clauses was agreed upon."
-msgstr[0] "Suderinta sutartis turinti %d sÄ…lygÄ…"
-msgstr[1] "Suderinta sutartis turinti %d sÄ…lygas"
-msgstr[2] "Suderinta sutartis turinti %d sąlygų"
+msgstr[0] "Estis subskribita kontrakto kun %d klaÅ­zo."
+msgstr[1] "Estis subsktibita kontrakto kun %d klaÅ­zoj."
 
 #: server/diplhand.c:277 server/diplhand.c:281
-#, fuzzy, c-format
+#, c-format
 msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
 msgstr ""
-"Vienas iš miestų, kuriuos %s atiduoda, yra sunaikintas! Sutartis nutraukta!"
+"Unu el la urboj, kiujn la %s cedas, estas detruita! La kontrakto estas "
+"nuligita!"
 
 #: server/diplhand.c:288 server/diplhand.c:293
 #, c-format
 msgid "The %s no longer control %s! Treaty canceled!"
-msgstr "%s daugiau nebekontroliuoja %s! Sutartis nutraukta!"
+msgstr "La %s ne regas plu %sn! La kontrakto estas nuligita!"
 
 #: server/diplhand.c:331 server/diplhand.c:335
 #, c-format
 msgid "The %s don't have the promised amount of gold! Treaty canceled!"
-msgstr "%s neturi pažadėto aukso kiekio! Sutartis nutraukta!"
+msgstr ""
+"La %s ne havas la promesitan kvanton da oro! La kontrakto estas nuligita!"
 
 #: server/diplhand.c:364
-#, c-format
+#, fuzzy, c-format
 msgid "You gave an embassy to %s."
-msgstr "JÅ«s davÄ—te ambasadÄ… %s."
+msgstr "Vi donis komunan vidon al %s."
 
 #: server/diplhand.c:367
 #, c-format
 msgid "%s allowed you to create an embassy!"
-msgstr "%s leido jums įsteigti ambasadą!"
+msgstr ""
 
 #: server/diplhand.c:383
 #, c-format
 msgid "You are taught the knowledge of %s."
-msgstr "Jūs esate išmokomas technologijos %s."
+msgstr "Vi estis instruita pri %s."
 
 #: server/diplhand.c:387
 #, c-format
 msgid "The %s have acquired %s from the %s."
-msgstr "%s gavo %s iš %s."
+msgstr "La %s akiris %sn de la %s."
 
 #: server/diplhand.c:402
 #, c-format
 msgid "You get %d gold."
-msgstr "JÅ«s gavote %d aukso."
+msgstr "Vi gajnis %d ora(j) monero(j)."
 
 #. TRANS: ... Polish worldmap.
 #: server/diplhand.c:410
-#, fuzzy, c-format
+#, c-format
 msgid "You receive the %s worldmap."
-msgstr "Jūs gavote %s pasaulio žemėlapį."
+msgstr "Vi ricevis la mapon pri %s."
 
 #. TRANS: ... Polish seamap.
 #: server/diplhand.c:419
-#, fuzzy, c-format
+#, c-format
 msgid "You receive the %s seamap."
-msgstr "Jūs gavote %s jūros žemėlapį."
+msgstr "Vi ricevis la marmapon pri %s."
 
 #: server/diplhand.c:436
 #, c-format
 msgid "You receive city of %s from %s."
-msgstr "Jūs gaunate miestą %s iš %s."
+msgstr "Vi ricevis la urbon de %s de %s."
 
 #: server/diplhand.c:441
 #, c-format
 msgid "You give city of %s to %s."
-msgstr "Jūs atiduodate miestą %s žaidėjui %s."
+msgstr "Vi cedis la urbon de %s al %s."
 
 #: server/diplhand.c:454 server/diplhand.c:457
 #, c-format
 msgid "You agree on a cease-fire with %s."
-msgstr "JÅ«s sutinkate su paliaubomis su %s."
+msgstr "Vi akordiĝis kun %s pri paf-cesigo."
 
 #. TRANS: ... the Poles ... Polish territory.
 #: server/diplhand.c:476 server/diplhand.c:488
@@ -2969,109 +3040,112 @@ msgid_plural ""
 "You agree on an armistice with the %s. In %d turns, it will become a peace "
 "treaty. Move your units out of %s territory."
 msgstr[0] ""
+"Vi konsentis armisticon kun la %s. En %d vico, ĝi iĝos packontrakto.Forpelu "
+"vian unuojn el %s teritorio."
 msgstr[1] ""
-msgstr[2] ""
+"Vi konsentis armisticon kun la %s. En %d vicoj, ĝi iĝos packonstrakto."
+"Forpelu vian unuojn el %s teritorio."
 
 #: server/diplhand.c:512 server/diplhand.c:515
 #, c-format
 msgid "You agree on an alliance with %s."
-msgstr "Susitariate dÄ—l sÄ…jungos su %s."
+msgstr "Vi akordiĝis kun %s pri alianco."
 
 #: server/diplhand.c:524
 #, c-format
 msgid "You give shared vision to %s."
-msgstr "JÅ«s duodate bendrÄ… regÄ—jimo laukÄ… %s."
+msgstr "Vi donis komunan vidon al %s."
 
 #: server/diplhand.c:527
 #, c-format
 msgid "%s gives you shared vision."
-msgstr "%s duoda Jums bendrÄ… regÄ—jimo laukÄ…."
+msgstr "%s donis komunan vidon al vi."
 
 #: server/diplhand.c:663
 #, c-format
 msgid "%s canceled the meeting!"
-msgstr "%s atšaukė susitikimą!"
+msgstr "%s nuligis renkontiĝon!"
 
 #: server/diplhand.c:670
 #, c-format
 msgid "Meeting with %s canceled."
-msgstr "Susitikimas su %s atšauktas."
+msgstr "La renkontiĝo kun %s estas nuligita."
 
 #: server/diplhand.c:712
 msgid "Your diplomatic envoy was decapitated!"
-msgstr "Jūsų diplomatijos pasiuntinui buvo nukirsta galva!"
+msgstr "Via diplomato estis senkapigita!"
 
 #: server/diplomats.c:97
 #, c-format
 msgid "Your %s could not poison the water supply in %s."
-msgstr "Jūsų %s negalėjo užnuodyti %s vandens atsargų."
+msgstr "Via %s ne povas veneni la akvon en %s."
 
 #: server/diplomats.c:112
 #, c-format
 msgid "Your %s poisoned the water supply of %s."
-msgstr "Jūsų %s užnuodijo %s vandens atsargas."
+msgstr "Via %s venenis la akvon en %s."
 
 #: server/diplomats.c:116
 #, c-format
 msgid "%s is suspected of poisoning the water supply of %s."
-msgstr "%s yra įtariamas %s vandens atsargų užnuodijimu."
+msgstr "%s estas suspektita pri venenado de la akvon en %s."
 
 #: server/diplomats.c:260
-#, c-format
+#, fuzzy, c-format
 msgid "Your %s was executed in %s by primitive %s."
-msgstr "Jūsų %s buvo atlikta egzekucija mieste %s. Tai atliko primityvusis %s."
+msgstr "Via %s sukcesis subaĉeti la %sn."
 
 #: server/diplomats.c:274
-#, c-format
+#, fuzzy, c-format
 msgid "You have established an embassy in %s."
-msgstr "Jūs įkūrėte ambasadą mieste %s."
+msgstr "Vi senbridigis hordon de barbaroj!"
 
 #: server/diplomats.c:277
-#, c-format
+#, fuzzy, c-format
 msgid "The %s have established an embassy in %s."
-msgstr "%s įkūrė ambasadą mieste %s."
+msgstr "La %s plenumis la preparadon de %s en %s."
 
 #: server/diplomats.c:333
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s could not sabotage the %s %s."
-msgstr "Jūsų %s nepavyko sabotuoti %s %s."
+msgstr "Via %s ne povas saboti la %sjn %sn."
 
 #: server/diplomats.c:355
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s succeeded in sabotaging the %s %s."
-msgstr "Jūsų %s pavyko sabotuoti %s %s."
+msgstr "Via %s sukcesis saboti la %sjn %sn."
 
 #. TRANS: ... the Poles!
 #: server/diplomats.c:362
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s was sabotaged by the %s!"
-msgstr "%s buvo sabotuotas. Tai atliko %s!"
+msgstr "Via %s estis sabotita de la %s!"
 
 #: server/diplomats.c:411
 msgid "You can't bribe a unit from this nation."
-msgstr "JÅ«s negalite papirkti Å¡ios tautos dalinio."
+msgstr "Vi ne povas subaĉeti unuon de tiu ĉi nacio."
 
 #: server/diplomats.c:422
-#, fuzzy, c-format
+#, c-format
 msgid "You don't have enough gold to bribe the %s %s."
-msgstr "JÅ«s neturite pakankamai aukso, kad papirktumÄ—te %s %s."
+msgstr "Vi ne havas sufiĉe da oro por subaĉeti la %sjn %sn."
 
 #: server/diplomats.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "You cannot bribe the %s!"
-msgstr "JÅ«s negalite papirkti %s!"
+msgstr "Vi ne povas subaĉeti la %sn!"
 
 #. TRANS: <diplomat> ... <unit>
 #: server/diplomats.c:455
 #, c-format
 msgid "Your %s succeeded in bribing the %s."
-msgstr ""
+msgstr "Via %s sukcesis subaĉeti la %sn."
 
 #. TRANS: <unit> ... <Poles>
 #: server/diplomats.c:463
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s was bribed by the %s."
-msgstr "Jūsų %s papirko %s."
+msgstr "Viaj %s estis subaĉetita de la %s."
 
 #: server/diplomats.c:594
 #, c-format
@@ -3079,330 +3153,337 @@ msgid ""
 "%s was expecting your attempt to steal technology again. Your %s was caught "
 "and executed."
 msgstr ""
+"%s estis atendante vian novan provon por ŝteli teĥnologio. Via %s estis "
+"kaptita kaj ekzekutita."
 
 #: server/diplomats.c:600
 #, c-format
 msgid "Your %s was caught in the attempt of stealing technology from %s."
-msgstr ""
+msgstr "Via %s estis kaptita dum ŝtelado de teĥnologio de %s."
 
 #: server/diplomats.c:606
 #, c-format
 msgid "The %s %s failed to steal technology from %s."
-msgstr ""
+msgstr "La %sj %s malsukcesi forŝteli teĥnologion el %s."
 
 #: server/diplomats.c:620
 #, c-format
 msgid "No new technology found in %s."
-msgstr "Jokių naujų technologijų nerasta %s."
+msgstr "Neniu nova teĥnologio estis trovita en %s."
 
 #: server/diplomats.c:676
 msgid "You can't subvert this city."
-msgstr ""
+msgstr "Vi ne povas renversi la ordon en tiu ĉi urbo."
 
 #: server/diplomats.c:687
 #, c-format
 msgid "You don't have enough gold to subvert %s."
-msgstr ""
+msgstr "Vi ne havas sufiĉe da mono por renversi la ordon en %s."
 
 #: server/diplomats.c:704
 #, c-format
 msgid "Your %s was caught in the attempt of inciting a revolt!"
-msgstr ""
+msgstr "Via %s estis kaptita dum klopodo por instigi al ribelo!"
 
 #: server/diplomats.c:708
 #, c-format
 msgid "You caught %s %s attempting to incite a revolt in %s!"
-msgstr ""
+msgstr "Vi kaptis %sn %sn kiuj klopodis instigi al ribelo en %s!"
 
 #: server/diplomats.c:731
 #, c-format
 msgid "Revolt incited in %s, you now rule the city!"
-msgstr "Revoliucija pakurstyta %s, jūs dabar valdote miestą!"
+msgstr "Estis ribelo en %s kaj nun vi havas regadon de la urbo!"
 
 #: server/diplomats.c:734
 #, c-format
 msgid "%s has revolted, %s influence suspected."
-msgstr "%s sukilo, įtariama %s įtaka."
+msgstr "%s estas en ribelo, oni suspektas pri influo de %s nacio."
 
 #: server/diplomats.c:815
 #, c-format
 msgid "Your %s was caught in the attempt of industrial sabotage!"
-msgstr ""
+msgstr "Via %s estis kaptita dum industria sabotado!"
 
 #: server/diplomats.c:819
 #, c-format
 msgid "You caught %s %s attempting sabotage in %s!"
-msgstr ""
+msgstr "Vi kaptis %sn %sn kiu estas plenumanta sabotadon en %s!"
 
 #: server/diplomats.c:854
 #, c-format
 msgid "Your %s could not find anything to sabotage in %s."
-msgstr ""
+msgstr "Via %s trovis nenion saboteblan en %s."
 
 #: server/diplomats.c:899
 #, c-format
 msgid "You cannot sabotage a %s!"
-msgstr "Negali sabotuoti %s!"
+msgstr "Vi ne povas saboti %sn!"
 
 #: server/diplomats.c:910
 #, c-format
 msgid "Your %s could not find the %s to sabotage in %s."
-msgstr ""
+msgstr "Via %s ne trovas la sabotendan %sn en %s."
 
 #: server/diplomats.c:938
 #, c-format
 msgid "Your %s succeeded in destroying the production of %s in %s."
-msgstr ""
+msgstr "Via %s sukcesis detrui produktadon de %s en %s."
 
 #: server/diplomats.c:944
 #, c-format
 msgid "The production of %s was destroyed in %s, %s are suspected."
-msgstr "%s gamyba buvo sunaikinta mieste %s. %s yra įtariami."
+msgstr "La produktado de %s en %s estis detruita, oni suspektis la %sn."
 
 #: server/diplomats.c:968
 #, c-format
 msgid "Your %s was caught in the attempt of sabotage!"
-msgstr "Bandydamas sabotuoti buvo pagautas Jūsų %s!"
+msgstr "Via %s estis kaptita dum sabotado!"
 
 #: server/diplomats.c:973
 #, c-format
 msgid "You caught %s %s attempting to sabotage the %s in %s!"
-msgstr ""
+msgstr "Vi kaptis %sn %sn dum la sabotado de la %s en %s!"
 
 #: server/diplomats.c:986
 #, c-format
 msgid "Your %s destroyed the %s in %s."
-msgstr "Jūsų %s sunaikino %s, esantį %s."
+msgstr "Viaj %s detruis la %sn en %s."
 
 #: server/diplomats.c:991
 #, c-format
 msgid "The %s destroyed the %s in %s."
-msgstr "%s sunaikino %s, esantį %s."
+msgstr "La %s detruis la %sn en %s."
 
 #. TRANS: <unit> ... <diplomat>
 #: server/diplomats.c:1091
 #, c-format
 msgid "An enemy %s has been eliminated by your %s."
-msgstr ""
+msgstr "Malamikaj %s estis mortigitaj de viaj %s."
 
 #. TRANS: <unit> ... <city> ... <diplomat>
 #: server/diplomats.c:1098
 #, c-format
 msgid "Your %s has been eliminated defending %s against a %s."
-msgstr ""
+msgstr "Viaj %s estis mortigitaj, defendante %sn kontraÅ­ %s."
 
 #. TRANS: <unit> ... <diplomat>
 #: server/diplomats.c:1106
 #, c-format
 msgid "Your %s has been eliminated defending against a %s."
-msgstr ""
+msgstr "Viaj %s estis mortigitaj dum defendado kontraÅ­ %s."
 
 #: server/diplomats.c:1119
 #, c-format
 msgid "Your %s was eliminated by a defending %s."
-msgstr "Jūsų %s sunaikino besiginantis %s."
+msgstr "Viaj %s estis mortigitaj de defendantaj %s."
 
 #: server/diplomats.c:1127
 #, c-format
 msgid "Eliminated %s %s while infiltrating %s."
-msgstr ""
+msgstr "%sj %s estis mortigitaj dum enŝteliĝo en %s."
 
 #: server/diplomats.c:1134
 #, c-format
 msgid "Eliminated %s %s while infiltrating our troops."
-msgstr ""
+msgstr "%sj %s estis mortigitaj dum enŝteliĝo en niaj trupoj."
 
 #: server/diplomats.c:1185
 #, c-format
 msgid ""
 "Your %s has successfully completed the mission and returned unharmed to %s."
-msgstr ""
+msgstr "Via %s plenumis la taskon kaj, sendifekta kaj sekura, revenis al %s."
 
 #: server/diplomats.c:1204
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s was captured after completing the mission in %s."
-msgstr "Jūsų %s buvo pagauta pabaigusi savo misiją mieste %s."
+msgstr "Via %s estis kaptita post la plenumo de la tasko en %s."
 
 #: server/diplomats.c:1210
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s was captured after completing the mission."
-msgstr "Jūsų %s buvo pagauta pabaigusi savo misiją."
+msgstr "Via %s estis kaptita post la plenumo de la tasko."
 
 #: server/diplomats.c:1242
-#, fuzzy, c-format
+#, c-format
 msgid "You have caused an incident while bribing the %s %s."
-msgstr "JÅ«s sukÄ—lÄ—te  incidentÄ… bandydamas papirkti %s %s."
+msgstr "Vi kaŭzis diplomatan incidenton dum subaĉetado de la %sj %s."
 
 #: server/diplomats.c:1247
 #, c-format
 msgid "%s has caused an incident while bribing your %s."
-msgstr "%s sukėlė incidentą bandydamas papirkti Jūsų %s."
+msgstr "%s kaŭzis diplomatan incidenton dum subaĉetado de via %s."
 
 #: server/diplomats.c:1254
 #, c-format
 msgid "You have caused an incident while attempting to steal tech from %s."
-msgstr "Jūs sukėlėte incidentą bandydamas iš %s pavogti technologiją."
+msgstr "Vi kaŭzis diplomatan incidenton dum ŝtelado de teĥnologio de %s."
 
 #: server/diplomats.c:1258
 #, c-format
 msgid "%s has caused an incident while attempting to steal tech from you."
-msgstr "%s sukėlė incidentą bandydamas iš Jūsų pavogti technologiją."
+msgstr "%s kaŭzis diplomatan incidenton dum ŝtelado de teĥnologio de vi."
 
 #: server/diplomats.c:1264
 #, c-format
 msgid "You have caused an incident while inciting a revolt in %s."
-msgstr "JÅ«s sukÄ—lÄ—te incidentÄ… bandydamas sukelti sukilimÄ… mieste %s."
+msgstr "Vi kaÅ­zis diplomatan incidenton dum instigado al ribelo en %s."
 
 #: server/diplomats.c:1268
 #, c-format
 msgid "%s have caused an incident while inciting a revolt in %s."
-msgstr "%s sukÄ—lÄ— incidentÄ… bandydamas sukelti sukilimÄ… mieste %s."
+msgstr "%s kaÅ­zis diplomatan incidenton dum instigado al ribelo en %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
-msgstr "JÅ«riniai daliniai dar nepalaikomi. Nieks negauna %s."
+msgstr "Marmovado por unuoj ne estas ankoraÅ­ disponebla. Neniu havas %sn."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
-msgstr "Metai: %s"
+msgstr "Jaro: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
-"Ėjimui skirtas laikas viršijo maksimumą, todėl grąžinama maksimali reikšmė"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
-msgstr "Laikas, skirtas ėjimui, mažesnis nei nulis. Grąžinama į nulį."
+msgstr ""
+
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
-msgstr "Tik GGZ klientas turi kviesti civ clientą ggz režimu!\n"
+msgstr "Nur GGZ-kliento devas uzi civclient en ggz moduso!\n"
 
 #: server/handchat.c:66
 #, c-format
 msgid "%s is an ambiguous player name-prefix."
-msgstr "%s yra dviprasmiškas žaidėjo vardo priešdėlis."
+msgstr ""
 
 #: server/handchat.c:70
 #, c-format
 msgid "%s is an ambiguous connection name-prefix."
-msgstr "%s yra dviprasmiškas susijungimo pavadinimo priešdėlis."
+msgstr ""
 
 #: server/handchat.c:74
 #, c-format
 msgid "%s is an anonymous name. Use connection name"
-msgstr "%s yra anoniminis vardas. Naudokite susijungimo pavadinimÄ…"
+msgstr ""
 
 #: server/handchat.c:186
 msgid "You are not attached to a player."
-msgstr "Jūs nesate prisijungęs prie žaidėjo."
+msgstr ""
 
 #: server/handchat.c:194
 #, c-format
 msgid "%s to allies: %s"
-msgstr "%s sÄ…jungininkams: %s"
+msgstr ""
 
 #: server/handchat.c:288
 #, c-format
 msgid "%s is not connected."
-msgstr "%s neprisijungęs."
+msgstr ""
 
 #: server/handchat.c:301
 #, c-format
 msgid "There is no connection by the name %s."
-msgstr "Nėra ryšio pavadinimu %s."
+msgstr ""
 
 #: server/handchat.c:304
 #, c-format
 msgid "There is no player nor connection by the name %s."
-msgstr "Nėra nei žaidėjo, nei ryšio vardu %s."
+msgstr ""
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
-msgstr "Įvyko globalinis atšilimas!"
+msgstr "Tutmonda varmiĝo okazis!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
-msgstr "Pakrantės buvo užlietos ir platūs pievų laukai pavirto dykumomis."
+msgstr ""
+"Marbordoj estis subakvigitaj kaj vastaj partoj de herbejo iĝis dezertaj."
 
-# Kažkaip negražiai skamba „Įvyko“
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
-msgstr "Prasidėjo branduolinė žiema!"
+msgstr "Atomvintro okazis!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
-msgstr "Drėgnos žemės išdžiūvo ir paltūs pievų laukai pavirto tundra."
+msgstr "La marĉoj sekiĝis kaj vastaj partoj de herbejo iĝis tundro."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
-"Nauja viltis kaip gaisras plinta per Jūsų šalį, kai tik pranešamas "
-"geležinkelio atradimas.\n"
-"      Darbuotojai iš karto susirenka ir nutiesia geležinkelius visuose "
-"miestuose."
+"Nova espero flamiĝas en la nacio kiam oni anoncis la eltrovo de la fervojo.\n"
+"       La laboristoj memvole grupiĝas kaj modernigas ĉiun urbon per fervojo."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
-"Žmonės yra pamaloninti girdėti, kad Jūsų mokslininkai pagaliau žino apie "
-"geležinkelį.\n"
-"     Darbuotojai iš karto susirenka ir nutiesia geležinkelius visuose "
-"miestuose."
+"La popolo estas feliĉa pro la sciigo pri la eltrovo de la fervojo fare de "
+"viaj sciencistoj.\n"
+"      La laboristoj memvole grupiĝas kaj modernigas ĉiun urbon per fervojo."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
-msgstr "Jūsų %s patrauktas dėl besikeičiančio reljefo."
+msgstr "Viaj %s estis movita pro ŝanĝo de speco de areo."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
-msgstr "Jūsų %s panaikintas dėl besikeičiančio reljefo."
+msgstr "Viaj %s estis forsalutita pro ŝanĝo de grundo."
 
 #: server/meta.c:190
 msgid "Not reporting to the metaserver in this game."
-msgstr "Šiame žaidime metaserveriui nėra teikiama ataskaita."
+msgstr "Neniu konekto kun metaservilo por tiu ĉi ludo."
 
 #: server/meta.c:430
 #, c-format
 msgid "Metaserver: bad address: [%s:%d]."
-msgstr "Metaserveris: blogas adresas: [%s:%d]."
+msgstr "Metaservilo: erara adreso: [%s:%d]."
 
 #: server/plrhand.c:126
 #, c-format
 msgid "The %s are no more!"
-msgstr "%s nebÄ—ra!"
+msgstr "La %s ne estas plu!"
 
 #: server/plrhand.c:175
 msgid "Cannot change rates before game start."
-msgstr "Negalima pakeisti normų prieš prasidedant žaidimui."
+msgstr "Vi ne povas ŝanĝi impostadon antaŭ la komenco de la ludo."
 
 #: server/plrhand.c:191 client/gui-gtk-2.0/gamedlgs.c:242
 #: client/gui-win32/ratesdlg.c:309
 msgid "Tax"
-msgstr "Mokesčiai"
+msgstr "Impostoj"
 
 #: server/plrhand.c:199
 #, c-format
 msgid "%s rate exceeds the max rate for %s."
-msgstr "%s norma viršija maksimalią %s normą."
+msgstr "%s imposto superas la maksimuman impostadon por %s."
 
 #: server/plrhand.c:244
 #, c-format
 msgid "%s now governs the %s as a %s."
-msgstr "%s dabar valdo %s kaip %s."
+msgstr "%s regas %sn kiel %s."
 
 #. TRANS: this is a message event so don't make it
 #. * too long.
@@ -3415,143 +3496,143 @@ msgid_plural ""
 "The %s have incited a revolt! %d turns of anarchy will ensue! Target "
 "government is %s."
 msgstr[0] ""
+"La %s instigis al ribelo! Estos %d vico de anarĥio! La regsistemo celas %sn."
 msgstr[1] ""
-msgstr[2] ""
+"La %s instigis al ribelo! Estos %d vicoj de anarĥio! La regsistemo celas %sn."
 
 #: server/plrhand.c:337
 msgid "Revolution: returning to anarchy."
-msgstr "Revoliucija: grįžtama prie anarchijos."
+msgstr "Revolucio: reveno al anarĥio"
 
 #: server/plrhand.c:398
 msgid "You should choose a new government from the government menu."
-msgstr "Jūs turite pasirinkti naują valdymo formą iš valdymo formų meniu."
+msgstr "Vi devas elekti novan regsistemon el la menuo pri la regsistemoj."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
-msgstr "Mokesčių norma viršija maksimalią, kuri yra %s; ištaisoma."
+msgstr "La impostado superas la maksimumon por %s; aranĝu ĝin."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
-msgstr "Mokslo norma viršija maksimalią, kuri yra %s; ištaisoma."
+msgstr "La scienco superas la maksimumon por %s; aranĝu ĝin."
 
-#: server/plrhand.c:437
-#, c-format
+#: server/plrhand.c:434
+#, fuzzy, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
-msgstr "Prabangos norma viršija maksimalią, kuri yra %s; ištaisoma."
+msgstr "La lukso superas la maksimumon por %s; aranĝu ĝin."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
-msgstr "%s mums daugiau nebeteikia bendro regÄ—jimo lauko!"
+msgstr "%s ne donas plu al ni komuna vidon!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
-"Senatas neleidžia Jums sulaužyti sutarties su %s.  Jūs privalote arba "
-"išvaikyti senatą arba laukti palankesnio momento."
+"La senato ne permesos al vi nuligi kontrakton kun la %s.  Vi devas ĉu "
+"dissolvi la senaton ĉu atendi la ĝustan momenton."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
-msgstr "Senatas sutinka su Jūsų sprendimu dėl pastovių %s provokacijų."
+msgstr "La senato aprobas vian proponon pro la senĉesaj provokoj de la %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
-"Senatas atsisako sulaužyti sutartį su %s, bet Jums nekyla problemų surandant "
-"naujÄ… senatÄ…."
+"La senato rifuzas nuligi la kontrakton kun la %s, sed vi ne havas problemojn "
+"por trovi novan senaton."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
-msgstr "Diplomatinė būsena tarp %s ir %s dabar yra %s."
+msgstr "La diplomatia stato inter la %s kaj la %s nun estas %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
-" %s atšaukė diplomatinį susitarimą! Diplomatinė būsena tarp %s ir %s dabar "
-"yra %s."
+"La %s nuligis la diplomatajn interkonsentojn! La diplomatia stato inter la %"
+"s kaj la %s nun estas %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
-"%s užpuolė Jūsų sąjungininką %s! Jūs nutraukiate sąjungą su agresoriumi."
+"%s atakis vian aliancanon %s! Via alianco kun la atakanto estas nuligita."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr ""
-"Jūsų komandos draugas %s paskelbė karą %s. Jūs privalote nutraukti sąjungą "
-"su %s."
+"Via grupano %s ekmilitis kun %s. Vi estas devigata nuligi la aliancon kun %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
-msgstr "Pašalinamas žaidėjas %s."
+msgstr "Formovante la ludanton %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
-msgstr "Jūs pašalintas iš žaidimo!"
+msgstr "Vi estis formovita de la ludo!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
-msgstr "%s pašalintas iš žaidimo."
+msgstr "%s estis formovita de la ludo."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
-msgstr "Jus nelauktai sutiko %s ir jų valdovas %s."
+msgstr "Vi kontaktiĝis kun la %s, estritaj de %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
-"%s ir %s susitiko ir vienas kitam paskelbÄ— karÄ…. JÅ«s nutraukiate sÄ…jungÄ… su "
-"abiem."
+"%s kaj %s renkontiĝis kaj tuj ekmilitis. Vi forigas vian aliancon kun ambaŭ "
+"ili."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
-msgstr "Negalima įvelti %s į pilietinį karą – per daug žaidėjų"
+msgstr ""
+"Estas neeble ĵeti %sn en intercivitana milito - ĉar ĉeestas tro ludantoj"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
-msgstr "Negalima įvelti %s į pilietinį karą – per daug žaidėjų"
+msgstr ""
+"Estas neeble ĵeti %sn en intercivitana milito - ĉar ĉeestas tro ludantoj"
 
-#: server/plrhand.c:1682
-#, c-format
+#: server/plrhand.c:1686
+#, fuzzy, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
-msgstr ""
-"Jūsų valstybėje kilo pilietinis karas,  %s pasiskelbė sukilusių valstijų "
-"vadu."
+msgstr "Via nacio falis en intercivitana milito."
 
-#: server/plrhand.c:1703
-#, c-format
+#: server/plrhand.c:1707
+#, fuzzy, c-format
 msgid "%s declares allegiance to %s."
-msgstr "%s paskelbia sÄ…jungÄ… su %s."
+msgstr "%s subskribis aliancon kun la %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3561,264 +3642,274 @@ msgid ""
 msgstr ""
 
 #: server/report.c:56
-#, c-format
+#, fuzzy, c-format
 msgid "%s report on the RICHEST Civilizations in the World."
-msgstr "%s ataskaita apie TURTINGIAUSIAS pasaulio civilizacijas."
+msgstr "%s %s raportas pri la plej RIĈA Civilizo en la mondo."
 
 #: server/report.c:57
-#, c-format
+#, fuzzy, c-format
 msgid "%s report on the most ADVANCED Civilizations in the World."
-msgstr "%s ataskaita apie PAŽANGIAUSIAS pasaulio civilizacijas."
+msgstr "%s %s raportas pri la plej AVANA Civilizo en la mondo"
 
 #: server/report.c:58
-#, c-format
+#, fuzzy, c-format
 msgid "%s report on the most MILITARIZED Civilizations in the World."
-msgstr "%s ataskaita apie labiausiai MILITARIZUOTAS pasaulio civilizacijas."
+msgstr "%s %s raportas pri la plej MILITA Civilizo en la mondo"
 
 #: server/report.c:59
-#, c-format
+#, fuzzy, c-format
 msgid "%s report on the HAPPIEST Civilizations in the World."
-msgstr "%s ataskaita apie LAIMINGIAUSIAS pasaulio civilizacijas."
+msgstr "%s %s raportas pri la plej FELIĈA Civilizo en la mondo"
 
 #: server/report.c:60
-#, c-format
+#, fuzzy, c-format
 msgid "%s report on the LARGEST Civilizations in the World."
-msgstr "%s ataskaita apie DIDŽIAUSIAS pasaulio civilizacijas."
+msgstr "%s %s raportas pri la plej GRANDA Civilizo en la mondo"
 
 #: server/report.c:64
+#, fuzzy
 msgid "Herodotus'"
 msgstr "Herodoto"
 
-# Čia atrodo kažkoks istorikas. Nežinau kaip tiksliai išverst.
 #: server/report.c:65
+#, fuzzy
 msgid "Thucydides'"
 msgstr "Tucidido"
 
 #: server/report.c:66
+#, fuzzy
 msgid "Pliny the Elder's"
-msgstr "Plinijaus Vyresniojo"
+msgstr "Plinio la Maljuna"
 
 #: server/report.c:67
+#, fuzzy
 msgid "Livy's"
-msgstr "Livio"
+msgstr "Tito Livio"
 
 #: server/report.c:68
+#, fuzzy
 msgid "Toynbee's"
-msgstr "Toinbio"
+msgstr "Toynbee"
 
 #: server/report.c:69
+#, fuzzy
 msgid "Gibbon's"
-msgstr "Gibono"
+msgstr "Gibbon"
 
 #: server/report.c:70
+#, fuzzy
 msgid "Ssu-ma Ch'ien's"
-msgstr "Ssu-ma Ch'ien o"
+msgstr "Ssu-ma Ch'ien"
 
 #: server/report.c:71
+#, fuzzy
 msgid "Pan Ku's"
 msgstr "Pan Ku"
 
 #: server/report.c:116
 msgid "Population"
-msgstr "Gyventojai"
+msgstr "Populacio"
 
 #: server/report.c:117
 msgid "Land Area"
-msgstr "Valdoma teritorija"
+msgstr "Tera areo"
 
 #: server/report.c:118
 msgid "Settled Area"
-msgstr "Apgyvendinta teritorija"
+msgstr "Okupita areo"
 
 #: server/report.c:119
 msgid "Research Speed"
-msgstr "Mokslinių tyrinėjimų greitis"
+msgstr "Rapideco de la studado"
 
 #: server/report.c:120 data/default/techs.ruleset:393
 #: data/civ2/techs.ruleset:380 data/civ1/techs.ruleset:378
 msgid "Literacy"
-msgstr "Raštingumas"
+msgstr "Alfabetiĝo"
 
 #: server/report.c:121 client/cityrepdata.c:526 client/cityrepdata.c:527
 #: client/gui-sdl/cityrep.c:174
 msgid "Production"
-msgstr "Produkcija"
+msgstr "Produktado"
 
 #: server/report.c:122 data/default/techs.ruleset:224
 #: data/civ2/techs.ruleset:211 data/civ1/techs.ruleset:210
 msgid "Economics"
-msgstr "Ekonomika"
+msgstr "Ekonomio"
 
 #: server/report.c:123
 msgid "Military Service"
-msgstr "KarinÄ— tarnyba"
+msgstr "Militservo"
 
 #: server/report.c:149
+#, fuzzy
 msgid "Magnificent"
-msgstr "Nuostabūs"
+msgstr "%2d: La Majestaj %s"
 
 #: server/report.c:149
 msgid "Glorious"
-msgstr "Å lovingi"
+msgstr ""
 
 #: server/report.c:149
+#, fuzzy
 msgid "Great"
-msgstr "Didingi"
+msgstr "Murego"
 
 #: server/report.c:149
+#, fuzzy
 msgid "Decent"
-msgstr "Šaunūs"
+msgstr "Forigu"
 
 #: server/report.c:150
+#, fuzzy
 msgid "Mediocre"
-msgstr "PusÄ—tini"
+msgstr "Medicino"
 
 #: server/report.c:150
+#, fuzzy
 msgid "Hilarious"
-msgstr "Triukšmingi"
+msgstr "Golfo"
 
 #: server/report.c:150
+#, fuzzy
 msgid "Worthless"
-msgstr "beverčiai"
+msgstr "Fortreso"
 
 #: server/report.c:150
+#, fuzzy
 msgid "Pathetic"
-msgstr "Beviltiški"
+msgstr "Matematiko"
 
 #: server/report.c:151
 msgid "Useless"
-msgstr "Beverčiai"
+msgstr ""
 
 #: server/report.c:201
-#, c-format
+#, fuzzy, c-format
 msgid "%2d: The %s %s\n"
-msgstr "%2d: %s %s\n"
+msgstr "%2d: La Senutilaj %s"
 
 #: server/report.c:208
 msgid "Historian Publishes!"
-msgstr "Istorikai paskelbia!"
+msgstr "La Historiisto verkas!"
 
 #: server/report.c:270
 #, c-format
 msgid "%2d: The %s City of %s of size %d, "
-msgstr "%2d: %s miestas %s, dydis %d, "
+msgstr "%2d: La %s urbo de %s je grando %d, "
 
 #: server/report.c:277
 msgid "with no wonders\n"
-msgstr "be stebuklų\n"
+msgstr "sen mirindaĵoj\n"
 
 #: server/report.c:280
 #, c-format
 msgid "with %d wonder\n"
 msgid_plural "with %d wonders\n"
-msgstr[0] "su %d stebuklu\n"
-msgstr[1] "su %d stebuklais\n"
-msgstr[2] "su %d stebuklų\n"
+msgstr[0] "kun %d mirindaĵo\n"
+msgstr[1] "kun %d mirindaĵoj\n"
 
 #: server/report.c:283 server/report.c:329
 msgid "Traveler's Report:"
-msgstr "Keliautojo ataskaita:"
+msgstr "Raporto de vojaĝanto:"
 
 #: server/report.c:284
 msgid "The Five Greatest Cities in the World!"
-msgstr "Penki didingiausi pasaulio miestai!"
+msgstr "La kvin Plej Grandaj Urboj en la mondo!"
 
 #: server/report.c:302
 #, c-format
 msgid "%s in %s (%s)\n"
-msgstr "%s esantis %s (%s)\n"
+msgstr "%s en %s (%s)\n"
 
 #: server/report.c:307
 #, c-format
 msgid "%s has been DESTROYED\n"
-msgstr "%s buvo SUNAIKINTAS\n"
+msgstr "%s estis DETRUITA\n"
 
 #: server/report.c:319
 #, c-format
 msgid "(building %s in %s (%s))\n"
-msgstr "(statoma %s %s(%s))\n"
+msgstr "(preparante %sn en %s (%s))\n"
 
 #: server/report.c:330 client/gui-xaw/menu.c:226 data/helpdata.txt:898
 msgid "Wonders of the World"
-msgstr "Pasaulio stebuklai"
+msgstr "Mirindaĵoj de la mondo"
 
 #: server/report.c:547
 msgid " sq. mi."
-msgstr "kv. myl,"
+msgstr " kvadr. km."
 
 #: server/report.c:557
 msgid " M tons"
-msgstr " mil. tonų"
+msgstr " M tunoj"
 
 #: server/report.c:562
 msgid " M goods"
-msgstr ""
+msgstr " M da havaĵoj"
 
 #: server/report.c:567
 msgid " bulbs"
-msgstr "lemputÄ—s"
+msgstr " ampoloj"
 
 #: server/report.c:572
 msgid " month"
 msgid_plural " months"
-msgstr[0] " mÄ—nuo"
-msgstr[1] " mÄ—nesiai"
-msgstr[2] " mėnesių"
+msgstr[0] " monato"
+msgstr[1] " monatoj"
 
 #: server/report.c:577
 msgid " ton"
 msgid_plural " tons"
-msgstr[0] " tona"
-msgstr[1] " tonos"
-msgstr[2] " tonų"
+msgstr[0] " tuno"
+msgstr[1] " tunoj"
 
 #: server/report.c:591
 msgid "st"
-msgstr "-mas"
+msgstr "a"
 
 #: server/report.c:593
 msgid "nd"
-msgstr "-ras"
+msgstr "a"
 
 #: server/report.c:595
 msgid "rd"
-msgstr "-čias"
+msgstr "a"
 
 #: server/report.c:597
 msgid "th"
-msgstr "-tas"
+msgstr "a"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
-"Demografijos eilutėje rasta negalimų simbolių. Bandykite \"help demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
-msgstr "Demografų ataskaita:"
+msgstr "Demografia raporto:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
-msgstr "Apgailestaujame, tačiau demografinė ataskaita negalima."
+msgstr "BedaÅ­rinde, la demografia raporto ne estas disponebla."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
-msgstr ""
+msgstr "La %s de la %s (%s)"
 
 #. TRANS: message about an installation error.
 #: server/ruleset.c:163
 #, c-format
 msgid "Could not find a readable \"%s.%s\" ruleset file."
-msgstr ""
+msgstr "Ne estas trovita legebla dosiero de reguloj \"%s.%s\"."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
-msgstr "Įkeliamos taisyklės"
+msgstr "Åœargado de la reguloj"
 
 #. TRANS: Minor error message.
 #: server/savegame.c:173
@@ -3827,20 +3918,22 @@ msgid ""
 "games, or it may indicate an invalid saved game file.  Proceed at your own "
 "risk."
 msgstr ""
+"La konservita ludo entenas nekompletan mapon.  Tio povas okazi kun malnovaj "
+"konservitaj ludoj, aÅ­ tio signifas ke la konservita dosiero estas nevalida. "
+"Pluiru laÅ­ via propra risko."
 
-#: server/savegame.c:3590
-#, fuzzy
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
-msgstr "Išsaugotas žaidimas per senas. Seniausia palaikoma versija yra 1.9.0."
+msgstr ""
+"La konservitan ludon estas tro malnova, necesas almenaÅ­ la versio 1.9.0."
 
 #. TRANS: Fatal error message.
 #: server/savegame.c:3815
-#, fuzzy
 msgid ""
 "Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
 msgstr ""
-"Šis išsaugotas žaidimas naudoja klasikines reljefo taisykles, kurios daugiau "
-"nebepalaikomos."
+"La konservitan ludon uzas la \"klasikajn\" grund-regulojn, kaj ili ne estas "
+"plu subtenitaj."
 
 #: server/savegame.c:3824
 #, c-format
@@ -3848,123 +3941,134 @@ msgid ""
 "Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
 "Using '%s'."
 msgstr ""
+"ATENTU: malamaj dosierujoj por la reguloj ('%s' kaj '%s') ne estas plu "
+"subtenitaj. Uzu '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
-msgstr ""
+msgstr "%s havas nevalidan nacion; ŝanĝante al %s."
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
 "treaty."
 msgstr ""
+"Estis trovita nevalida strukturo de alianco: la alianco inter %s kaj %s "
+"reduktiĝis al packontrakto."
 
 #: server/settings.c:32
 msgid "Geological"
-msgstr "Geologiniai"
+msgstr "Geologia"
 
 #: server/settings.c:33
 msgid "Sociological"
-msgstr "Sociologiniai"
+msgstr "Sociologia"
 
 #: server/settings.c:34
 msgid "Economic"
-msgstr "Ekonominiai"
+msgstr "Ekonomia"
 
 #: server/settings.c:35
 msgid "Military"
-msgstr "Kariniai"
+msgstr "Milita"
 
 #: server/settings.c:36
 msgid "Scientific"
-msgstr "Moksliniai"
+msgstr "Scienca"
 
 #: server/settings.c:37
 msgid "Internal"
-msgstr "Vidiniai"
+msgstr "Interna"
 
 #: server/settings.c:38
 msgid "Networking"
-msgstr "Tinklo"
+msgstr "Reta"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
-msgstr "Visos"
+msgstr "Ĉio"
 
 #: server/settings.c:43
 msgid "Vital"
-msgstr "Gyvybiškai svarbus"
+msgstr "Vigla"
 
 #: server/settings.c:44
 msgid "Situational"
-msgstr "Priklauso nuo situacijos"
+msgstr "Situacia"
 
 #: server/settings.c:45
 msgid "Rare"
-msgstr "Retas"
+msgstr "Rara"
 
 #: server/settings.c:46
 msgid "Changed"
-msgstr "Pakeista"
+msgstr "Ŝanĝita"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
 msgstr ""
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
 msgstr ""
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
-msgstr ""
+msgstr "Estas neeble uzi finan jaron pli frua ol nuna jaro."
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
-msgstr "GGZ režime negalima keisti maksimalaus žaidėjų skaičiaus."
+msgstr "Estas neeble ŝanĝi maxplayers en GGZ moduso."
 
-#: server/settings.c:180
-#, fuzzy
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr ""
-"Žaidėjų skaičius yra didesnis nei reikalaujama reikšmė, todėl paliekama "
-"senoji reikšmė."
+"Numero de ludantoj estas pli alta ol la necesa valoro;\n"
+"Uzante malnovan valoron."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Vi ne rajtas agordi tiun ĉi opcion."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
-msgstr "Žemėlapio dydis (tūkstančiais laukelių)"
+msgstr "Mapgrando (en miloj da kaheloj)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
 "  size = 20 is a huge map of 20,000 tiles"
 msgstr ""
+"Tiu ĉi valoro agordas la mapograndon.\n"
+"  size = 4 estas normala mapo je 4000 kaheloj (defaÅ­lto)\n"
+"  size = 20 estas giganta mapo je 20000 kaheloj"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
-msgstr "Žemėlapio topologinis indeksas"
+msgstr "Topologia indekso de la mapo"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -3999,12 +4103,44 @@ msgid ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 msgstr ""
+"La mapoj de Freeciv ĉiam estas dudimensiaj. Ili estas interligeblaj laŭ "
+"norda-suda kaj orienta-okcidenta direkto por krei plata mapo, cilindra mapo "
+"aŭ tora mapo. Ĉiu kvadro de la mapo estas ortangula aŭ sesangula kun klasika "
+"aŭ izometria alliniiĝo - tio estas laŭ uzata grafikaĵo.\n"
+"   0 Tero plata (ne interligita mapo)\n"
+"   1 Tero (mapo interligita laÅ­ E-O)\n"
+"   2 Urano (mapo interligita laÅ­ N-S)\n"
+"   3 Mondo tora (mapo interligita laÅ­ N-S kaj E-O)\n"
+"   4 Tero plata (izometria)\n"
+"   5 Tero (izometria)\n"
+"   6 Urano (izometria)\n"
+"   7 Mondo tora (izometria)\n"
+"   8 Tero plata (sesangula)\n"
+"   9 Tero (sesangula)\n"
+"  10 Urano (sesangula)\n"
+"  11 Mondo tora (sesangula)\n"
+"  12 Tero plata (izo-sesangula)\n"
+"  13 Tero (izo-sesangula)\n"
+"  14 Urano (izo-sesangula)\n"
+"  15 Mondo tora (izo-sesangula)\n"
+"Klasika ortangula:   Ortangula izometria:\n"
+"      _________               /\\/\\/\\/\\/\\ \n"
+"     |_|_|_|_|_|             /\\/\\/\\/\\/\\/ \n"
+"     |_|_|_|_|_|             \\/\\/\\/\\/\\/\\\n"
+"     |_|_|_|_|_|             /\\/\\/\\/\\/\\/ \n"
+"                             \\/\\/\\/\\/\\/  \n"
+"Fakoj sesangulaj:        Izometria-sesangula:\n"
+"  /\\/\\/\\/\\/\\/\\               _   _   _   _   _       \n"
+"  | | | | | | |             / \\_/ \\_/ \\_/ \\_/ \\      \n"
+"  \\/\\/\\/\\/\\/\\/\\             \\_/ \\_/ \\_/ \\_/ \\_/  \n"
+"   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
+"   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
-msgstr "Metodas, naudotas žemėlapio generavimui"
+msgstr "Metodo por krei mapon"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4015,12 +4151,21 @@ msgid ""
 "If the default value of startpos is used then a startpos setting will be "
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr ""
+"0 = Scenejo - neniu generatoro;\n"
+"1 = Tute hazarda generatoro de alteco;          [4]\n"
+"2 = PseÅ­do-fraktala generatoro de alteco;      [3]\n"
+"3 - Insul-bazita generatoro (justa sed enuiga)   [1]\n"
+"\n"
+"La numeroj inter la [] havigas la antaÅ­agorditajn valorojn por lokado de "
+"komencaj lokoj. Se estas uzata la defaŭlta valoro de startpos, agordaĵo de "
+"\"startpos\" estos elektita laÅ­ uzata generatoro. Legu pri agordado de "
+"\"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
-msgstr "Metodas, naudojamas parinkti pradinÄ—ms pozicijoms"
+msgstr "Metodo uzata por elekti la startopunktojn"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4032,36 +4177,47 @@ msgid ""
 "Note: generators try to create the right number of continents for the choice "
 "of start pos and to the number of players"
 msgstr ""
-
-#: server/settings.c:315
+"0 = Elekto de la generatoro. La elekto de tiu ĉi valoro signifas ke\n"
+"    la apriora valoro estos elektita laÅ­ la elektita generatoro.\n"
+"    Vidu la variablon \"generator\".1 = Äœi provas loki unu ludanton en unu "
+"kontinento.\n"
+"2 = Äœi provas loki du ludantojn en unu kontinento.\n"
+"3 = Ĝi provas loki ĉiujn ludanton en la sama kontinento.\n"
+"4 = Äœi lokas ludantojn laÅ­ la grandeco de la kontinentoj.\n"
+"Notu: La generatoroj klopodas krei la taÅ­ga nombro da kontinentoj laÅ­ la "
+"valoro de \"startpos\" kaj laÅ­ la nombro da ludantoj"
+
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
-msgstr "1x1 salų buvimas"
+msgstr "Ĉeesto de insuloj je 1x1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
-msgstr "0 = nėra 1x1 salų; 1 = kažkiek 1x1 salų"
+msgstr "0 = neniu insulo je 1x1; 1 = kelkaj insuloj je 1x1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
-msgstr ""
+msgstr "Kontrolu ke la polusoj estas apartaj kontinentoj"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
+"0 = la kontinentoj povas esti kunigitaj al la polusoj; 1 = la polusoj estas "
+"apartaj"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
-msgstr "Visas žemėlapis yra vidutinės temperatūros"
+msgstr "La tuta mapo havas moderan klimaton"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
-msgstr "0 = normali, į Žemę panaši planeta; 1 = vienodos temperatūros planeta"
+msgstr "0 = normala Tera planedo; 1 = alia moderklima planedo "
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
-msgstr "Vidutinė planetos temperatūra"
+msgstr "La mezvaloro de la temperaturo de la planedo"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4078,114 +4234,145 @@ msgid ""
 "\n"
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr ""
+"Malaltaj valoroj kreas malvarman mapon kaj altaj valoroj kreas varmegan "
+"mapon.\n"
+"\n"
+"100 signifas ke la planedo estas seka kaj varmega sen polusaj kalotoj, "
+"ekzistas nur tropikaj kaj sekaj areoj.\n"
+"\n"
+"70 signifas ke la planedo estas varma kaj la polusaj kalotoj estas "
+"mallarĝaj.\n"
+"\n"
+"50 signifas ke la planedo havas moderan klimaton, normalajn polusajn "
+"kalotojn, malvarmajn, varmajn kaj tropikajn areojn; la dezerto parte "
+"surmetiĝas tropikajn kaj moderajn areojn.\n"
+"\n"
+"30 signifas ke la planedo estas malvarma, la tropikaj areoj estas "
+"mallarĝaj.\n"
+"\n"
+"0 signifas ke la planedo estas ege malvarma sen tropikaj areoj, la polusaj "
+"kalotoj estas larĝaj"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
-msgstr "Sausumos procentas žemėlapyje"
+msgstr "Procento de la mapo kiu estas tero"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
+"Tiu ĉi variablo proksimume reeĥas la procento de mapo kiu estos kreita kiel "
+"tero."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
-msgstr "Kalvų/kalnų kiekis"
+msgstr "Kanto da montoj/montetoj"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
 msgstr ""
+"Malaltaj valoroj kreas ebenajn mapojn, altaj valoroj kreas malebenajn mapojn "
+"kun multaj montoj kaj montetoj."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
-msgstr "Vandens telkinių sausumoje kiekis"
+msgstr "Kvanto da akvo en la tero"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
 msgstr ""
+"Etaj valoroj signifas ke la plejparto de la lando estas kvazaÅ­-dezerta; "
+"altaj valoroj kreas mapon pli malsekan kun marĉoj, ĝangaloj kaj riveroj."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
-msgstr "Žemėlapio generatoriaus atsitiktinės funkcijos pradinis duomuo"
+msgstr "Hazarda valoro por map-generatoro"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
 "usually only of interest while debugging the game."
 msgstr ""
+"La sama valoro kreas ĉiam la saman mapon; laŭ nulo (la apriora valoro)oni "
+"elektas valoron bazita sur la horo, por krei hazardan mapon."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
-msgstr "Žaidimo atsitiktinė sėkla"
+msgstr "Hazarda valoro por ludo"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr ""
+"Laŭ nulo (la apriora valoro) oni elektas valoron bazita sur la horo. Ĉi tiu "
+"variablo estas interesa nur dum la sencimigo de la ludo."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
-msgstr "\"Specialių\" resursų laukelių kiekis"
+msgstr "Kvanto da kaheloj kun \"specialaj\" risurcoj"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
 msgstr ""
+"La specialaj risurcoj plibonigas la bazan grundon sur kiu ili estas. La "
+"skalo de la variablo estas en partoj por miloj."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
-msgstr "Namelių (mažų genčių kaimelių) kiekis"
+msgstr "Kvanto da kabanoj (etaj tribaj vilaĝoj)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
 msgstr ""
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
-msgstr "Mažiausias žaidėjų skaičius"
+msgstr "Minimuma nombro da ludantoj"
 
-#: server/settings.c:419
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
-msgstr "Didžiausias žaidėjų skaičius"
+msgstr "Maksimuma nombro da ludantoj"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
 "try to connect will be rejected."
 msgstr ""
 
-#: server/settings.c:435
+#: server/settings.c:426
+#, fuzzy
 msgid "Total number of players (including AI players)"
-msgstr ""
+msgstr "Nombro da ludantoj (inkluzive la AI):"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
 msgstr ""
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
-msgstr "Žaidėjo pradinių dalinių sąrašas"
+msgstr "Listo pri unuaj unuoj de la ludantoj"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4201,27 +4388,27 @@ msgid ""
 "    A   = Strong attack unit (eg., Catapult)\n"
 msgstr ""
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
-msgstr "Vieta, kurioje išdėstomi pradiniai daliniai"
+msgstr "Areoj kie unuaj unuoj estas lokitaj"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
-msgstr "Tai yra spindulys, kuriame išsklaidomi pradiniai daliniai."
+msgstr ""
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
-msgstr "Pradinis aukso kiekis žaidėjui"
+msgstr "Unua kvanto da oro por ludanto"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
-msgstr "Žaidimo pradžioje kiekvienas žaidėjas gauna tokį aukso kiekį."
+msgstr ""
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
-msgstr "Pradinių technologijų skaičius vienam žaidėjui"
+msgstr "Nombro da unuaj teĥnologioj por ludanto"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4229,33 +4416,33 @@ msgid ""
 "next techs really expensive."
 msgstr ""
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
 "determined by the ruleset or other game settings."
 msgstr ""
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr ""
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
 "does not apply when you have just gained a technology this turn."
 msgstr ""
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr ""
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4263,22 +4450,22 @@ msgid ""
 "to gold transfers in diplomatic treaties."
 msgstr ""
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr ""
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
 "this is non-zero, you can end up with negative research points."
 msgstr ""
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
-msgstr "Bauda gaunant nemokamÄ… technologijÄ…"
+msgstr ""
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4287,43 +4474,43 @@ msgid ""
 "points."
 msgstr ""
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
-msgstr "Maistas, reikalingas miestui augti"
+msgstr "Necesa nutraĵo por kreskigi urbon"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
 "the size of the city."
 msgstr ""
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
-msgstr ""
+msgstr "Procento da perdita nutraĵo kiam konstruaĵo necesas"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
 "it has a Granary)."
 msgstr ""
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
-msgstr ""
+msgstr "Minimuma grando de urbo por havi plenan komercon"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4331,32 +4518,32 @@ msgid ""
 "also notradesize."
 msgstr ""
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
-msgstr ""
+msgstr "Maksimuma grando de urbo sen komerco"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
 "notradesize and smaller than fulltradesize. See also fulltradesize."
 msgstr ""
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr ""
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
 msgstr ""
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr ""
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4364,11 +4551,11 @@ msgid ""
 "numbers of cities."
 msgstr ""
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
-msgstr "Mažiausias atstumas tarp miestų"
+msgstr "Minimuma distanco inter du urboj"
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4376,31 +4563,31 @@ msgid ""
 "(default), the ruleset value will be used."
 msgstr ""
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr ""
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
 msgstr ""
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr ""
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr ""
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr ""
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4409,21 +4596,21 @@ msgid ""
 "\"occupying\" territory."
 msgstr ""
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
-msgstr "Sumažinti miesto populiaciją po atakos"
+msgstr "Malpliigu la urban loĝantaron post atako"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4432,33 +4619,41 @@ msgid ""
 "  4 = heli\n"
 "  8 = air"
 msgstr ""
+"Tiu ĉi flago montras se la urba loĝantaro estas malpliigita post atako de "
+"malamika unuo, rilate al ĝia movospeco (la valoroj estas sumigendaj):\n"
+"  1 = tera\n"
+"  2 = mara\n"
+"  4 = helikoptera\n"
+"  8 = avia"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
-msgstr ""
+msgstr "Radiuso de landolimoj"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
 "tiles or tiles within range of more than one nation's cities."
 msgstr ""
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
-msgstr "Daliniai valstybÄ—s viduje nekelia nepasitenkinimo"
+msgstr "La unuoj interne de la landlimo ne kaÅ­zas malkontentecon"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
+"Se tiu ĉi variablo estas 1, la unuoj ne kaŭzos malkontentecon dum ili estas "
+"interne de sia nacia landlimo."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
-msgstr "Galimybė vykdyti diplomatiją su kitais žaidėjais."
+msgstr "Diplomatia kapablo kun aliaj ludantoj"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4466,12 +4661,17 @@ msgid ""
 "3 = diplomacy is restricted to teams.\n"
 "4 = diplomacy is disabled for everyone."
 msgstr ""
+"0 = defaŭlto; diplomatio estas ebligita por ĉiuj.\n"
+"1 = diplomatio estas ebligita nur inter homaj ludantoj.\n"
+"2 = diplomatio estas ebligita nur inter AI-ludantoj.\n"
+"3 = diplomatio estas ebligita nur por la grupoj.\n"
+"4 = diplomatio ne estas ebligita."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
-msgstr "Leidžiami miestų vardai"
+msgstr "Permesitaj nomoj de urbo"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4486,11 +4686,11 @@ msgid ""
 "another nations unless it is a default for their nation also."
 msgstr ""
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
-msgstr "Barbarų pasirodymo dažnis"
+msgstr "Ofteco de la apero de la Barbaroj"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4498,83 +4698,87 @@ msgid ""
 "3 = frequent barbarian uprising \n"
 "4 = raging hordes, lots of barbarians"
 msgstr ""
+"0 = neniam \n"
+"1 = barbaroj nur en kabanoj \n"
+"2 = normala ofteco de apero \n"
+"3 = oftaj rabkuroj de Barbaroj \n"
+"4 = senbridaj hordoj, multaj Barbaroj"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
-msgstr "Barbarų pasirodymo metai"
+msgstr "Jaro de la apero de la Barbaroj"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
-msgstr "Barbarai nepasirodys iki šių metų."
+msgstr "La Barbaroj ne aperos antaŭ ĉi tiu jaro."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
-msgstr "Revoliucijos ilgis Ä—jimais"
+msgstr "DaÅ­ro de la revolucioj en vicoj"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
 msgstr ""
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
-msgstr "Ar leisti karo rūką"
+msgstr "Ebligu milit-nebulon"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
 "cities or terrain changes in tiles not observed."
 msgstr ""
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
-msgstr "Ar leisti kosminÄ™ rasÄ™"
+msgstr "Ebligu konkuro por la kosmo"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
-msgstr "Jei čia nustatyta 1, žaidėjai gali statyti erdvėlaivius."
+msgstr "Se ĉi tiu valoro estas 1, la ludantoj povas konstrui kosmoŝipojn."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
-msgstr "Mažiausias miestų skaičius, reikalingas pilietiniam karui"
+msgstr "Minimuma nombro da urboj por intercivitana milito"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
 "civil wars are turned off altogether."
 msgstr ""
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
-msgstr "Ėjimai, kol prarandamas kontaktas tarp žaidėjų"
+msgstr ""
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
 "players cannot meet unless they have an embassy."
 msgstr ""
 
-#: server/settings.c:810
-#, fuzzy
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
-msgstr "Perstatyti rūmus, jei sostinė užgrobta"
+msgstr "Ree konstruu la palacon se la ĉefurbo estis konkerita"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4582,23 +4786,21 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
-msgstr "Ar naudoti natūralius miestų pavadinimus."
+msgstr "Ebligu naturajn nomojn de la urboj"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr ""
-"Jei įjungta, tai standartiniai miestų pavadinimai bus nustatomi pagal juos "
-"supantį reljefą."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr ""
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4632,122 +4834,128 @@ msgid ""
 "\n"
 msgstr ""
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
-msgstr ""
+msgstr "Ebligu aŭtomatan mastrumadon fare de IA kiam ludanto malkonektiĝis"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
 msgstr ""
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
-msgstr "Metai, kuriais baigiasi žaidimas"
+msgstr "Finjaro de la ludo"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
-msgstr "Žaidimas pasibaigs nurodytais metais."
+msgstr "La ludo finos en la fino de la specifita jaro."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
-msgstr "Ä–jimui skirtas maksimalus laikas sekundÄ—mis"
+msgstr "Maksimuma nombro da sekundoj por vico"
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
-msgstr ""
+msgstr "Ebligu samtempajn fazojn por la ludantoj."
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr ""
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
 "connections will be automatically disconnected eventually)."
 msgstr ""
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr ""
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
 "not wait at all."
 msgstr ""
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
-msgstr "Sekundės tarp PINGų"
+msgstr "Sekundoj inter du PING"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr ""
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
-msgstr "Laikas atjungti klientÄ…"
+msgstr ""
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
-msgstr ""
+msgstr "Luda moduso kun blokanta vico"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
 msgstr ""
+"Se tio estas agordita je 1, la vico ne finos ĝis ĉiu ludanto finos sian "
+"vicon, inkluzive de la ne plu konektitaj ludantoj."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
-msgstr "Fiksuoto laiko ėjimų žaidimo režimas"
+msgstr "Luda moduso kun fiksa vico"
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
 msgstr ""
+"Se tio estas agordita je 1, la vico finas laŭ la tempolimo, ankaŭ se ĉiuj "
+"ludantoj premis la butonon \"Fino de la vico\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
-msgstr "Kas yra demografinÄ—je ataskaitoje"
+msgstr "Kio estas en la demografia raporto"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -4769,44 +4977,47 @@ msgid ""
 "The order of characters is not significant, but their capitalization is."
 msgstr ""
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
-msgstr "Kas kelintą ėjimą bus vykdomas automatinis išsaugojimas"
+msgstr "Vicoj por mem-konservado"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
 msgstr ""
-"Šis žaidimas bus automatiškai išsaugojamas per šį ėjimų skaičių. Nulis "
-"reiškia, kad žaidimas nebus automatiškai išsaugojamas."
+"Oni konservos la ludon je ĉi nombro da vicoj. Nulo signifas neniun aŭtomatan "
+"konservadon."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
-msgstr "Išsaugotų žaidimų suspaudimo lygis"
+msgstr "Kunprem-nivelo por konservotaj ludoj"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
+#, fuzzy
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
 "this server was not compiled to use zlib."
 msgstr ""
+"Se ĝi estas malsama ol nulo, la dosieroj estos kunpremitaj per zlib ( gzip-"
+"formato) aÅ­ bzip2. Pli altaj valoroj kunpremas plie, sed pli malrapide."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
-msgstr "Auto-išsaugojimo vardo priešdėlis"
+msgstr "Antaŭmetaĵo por la nomoj de la aŭtomata konservado"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
 msgstr ""
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
-msgstr "Ar registruoti žaidėjo statistiką"
+msgstr ""
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -4816,24 +5027,23 @@ msgstr ""
 #: server/sernet.c:147
 msgid "Server cannot read standard input. Ignoring input."
 msgstr ""
-"Serveris negali nuskaityti standartinės įvesties. Įvesties ignoruojama."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
-msgstr "Serveris: blogas adresas: [%s:%d]."
+msgstr ""
 
 #: server/spacerace.c:165
 msgid "You need to have a capital in order to launch your spaceship."
-msgstr "Jums reikia sostinės tam, kad galėtumėte paliesti erdvėlaivį."
+msgstr "Ĉefurbo necesas al vi por lanĉi vian kosmoŝipon."
 
 #: server/spacerace.c:171
 msgid "Your spaceship is already launched!"
-msgstr "Jūsų erdvėlaivis jau paleistas!"
+msgstr "Via kosmoŝipo jam ekflugis!"
 
 #: server/spacerace.c:177
 msgid "Your spaceship can't be launched yet!"
-msgstr "Jūsų erdvėlaivis dar negali būti paleistas!"
+msgstr "Via kosmoŝipo ne povas ankoraŭ esti lanĉita!"
 
 #: server/spacerace.c:186
 #, c-format
@@ -4841,255 +5051,257 @@ msgid ""
 "The %s have launched a spaceship!  It is estimated to arrive on Alpha "
 "Centauri in %s."
 msgstr ""
-"%s paleido erdvėlaivį! Apskaičiuota, kad jis atvyks į Alfa Kentaura %s."
+"La %s lanĉis kosmoŝipon!   Oni taksis ke ili alvenos al Alfa Centaŭro en %s."
 
 #: server/spacerace.c:204
 msgid "Spaceship action received, but you don't have a spaceship!"
-msgstr "Gauta erdvÄ—laivio komanda, bet JÅ«s neturite erdvÄ—lavio."
+msgstr "Vi ricevis komandon de la kosmoŝipo, sed vi ne havas kosmoŝipon!"
 
 #: server/spacerace.c:210
 msgid "You can't modify your spaceship after launch!"
-msgstr "JÅ«s negalite keisti savo erdvÄ—laivio po paleidimo!"
+msgstr "Vi ne povas modifi vian kosmoŝipon por la lanĉo!"
 
 #: server/spacerace.c:219
 msgid "You don't have any unplaced Space Structurals!"
-msgstr ""
+msgstr "Vi ne havas nelokitajn strukturojn por kosmoŝipo!"
 
 #: server/spacerace.c:224
 msgid "That Space Structural would not be connected!"
-msgstr "Ši kosminė struktūra nebus prijungta!"
+msgstr "La strukturo por kosmoŝipo ne devus esti kunigita!"
 
 #: server/spacerace.c:239 server/spacerace.c:260
 msgid "You don't have any unplaced Space Components!"
-msgstr ""
+msgstr "Vi ne havas nelokitajn komponantojn de kosmoŝipo!"
 
 #: server/spacerace.c:245
 msgid "Your spaceship already has the maximum number of Fuel Components!"
-msgstr ""
+msgstr "Via kosmoŝipo jam havas la maksimuma kvanto da fuelo!"
 
 #: server/spacerace.c:266
 msgid "Your spaceship already has the maximum number of Propulsion Components!"
-msgstr ""
+msgstr "Via kosmoŝipo jam havas la maksimuma kvanto da fuzaĵo!"
 
 #: server/spacerace.c:282 server/spacerace.c:304 server/spacerace.c:326
 msgid "You don't have any unplaced Space Modules!"
-msgstr ""
+msgstr "Vi ne havas nelokitajn kosmajn modulojn !"
 
 #: server/spacerace.c:288
 msgid "Your spaceship already has the maximum number of Habitation Modules!"
-msgstr "Jūsų erdvėlaivis jau turi maksimalų skaičių apgyvendinimo modulių."
+msgstr "Via kosmoŝipo jam havas la maksimuma kvanto da loĝaj moduloj"
 
 #: server/spacerace.c:310
 msgid "Your spaceship already has the maximum number of Life Support Modules!"
-msgstr "Jūsų erdvėlaivis jau turi maksimalų skaičių gyvybės palaikymo modulių."
+msgstr "Via kosmoŝipo jam havas la maksimuma kvanto da vivsubtenantaj moduloj!"
 
 #: server/spacerace.c:332
 msgid "Your spaceship already has the maximum number of Solar Panel Modules!"
-msgstr "Jūsų erdvėlaivis jau turi maksimalų skaičių saulės jėgainių modulių."
+msgstr "Via kosmoŝipo jam havas la maksimuma kvanto da sunpaneloj"
 
 #: server/spacerace.c:351
 #, c-format
 msgid "Without guidance from the capital, the %s spaceship is lost!"
-msgstr "Be sostinÄ—s vadovavimo %s erdvÄ—laivis prarastas!"
+msgstr "Sen regado el la ĉefurbo, la %s kosmoŝipo estis perdita!"
 
 #: server/srv_main.c:240
 msgid "Game ended in a draw as end year exceeded"
-msgstr "Žaidimas baigėsi lygiosiomis, nes pasiekti pabaigos metai."
+msgstr ""
+"La ludo finis egalstate ĉar finis la jaro kiu estas specifita kiel fino."
 
 #: server/srv_main.c:274
 #, c-format
 msgid "The %s spaceship has arrived at Alpha Centauri."
-msgstr "%s erdvėlaivis atvyko į Alfa Kentaura."
+msgstr "La %s kosmoŝipo alvenis al Alfa Centaŭro."
 
 #: server/srv_main.c:287 server/srv_main.c:322
 #, c-format
 msgid "Team victory to %s"
-msgstr "Komandos %s pergalÄ—"
+msgstr "Grupa venko por %s"
 
 #: server/srv_main.c:297 server/srv_main.c:338
 #, c-format
 msgid "Game ended in victory for %s"
-msgstr "Žaidimas baigėsi %s pergale"
+msgstr "%s gajnis la ludon"
 
 #: server/srv_main.c:345
 msgid "Game ended in a draw"
-msgstr "Žaidimas baigėsi lygiosiomis"
+msgstr "La ludo finis egalstate"
 
 #: server/srv_main.c:461 server/srv_main.c:472
 #, c-format
 msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
-msgstr ""
+msgstr "Viaj %s estis dissolvitaj laÅ­ via packontrakto kun la %s."
 
 #: server/srv_main.c:512 server/srv_main.c:516
 #, c-format
 msgid ""
 "Concerned citizens point out that the cease-fire with %s will run out soon."
-msgstr "Susirūpinę gyventojai primena, jog paliaubos su %s tuoj baigsis."
+msgstr "Angoroplenaj civitanoj rimarkas ke la pafĉesigo kun %s finos baldaŭ."
 
 #: server/srv_main.c:521 server/srv_main.c:525
 #, c-format
 msgid "The cease-fire with %s has run out. You are now at war with the %s."
-msgstr "Paliaubų laikas su %s baigėsi. Jūs dabar kariaujate su %s."
+msgstr "La pafĉesigo kun %s finis. Nun vi estas en milito kun la %s."
 
 #: server/srv_main.c:542
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Ceasefire between %s and %s has run out. They are at war. You cancel your "
 "alliance with both."
 msgstr ""
-"%s ir %s susitiko ir vienas kitam paskelbÄ— karÄ…. JÅ«s nutraukiate sÄ…jungÄ… su "
-"abiem."
+"La pafĉesigo inter %s kaj %s finis. Ili estas militantaj. Vi nuligas vian "
+"aliancon kun ambaÅ­ ili."
 
 #: server/srv_main.c:928
 #, c-format
 msgid "Failed saving game as %s"
-msgstr "Nepavyko išsaugoti žaidimo kaip %s"
+msgstr "Malsukcesis la konservado de la ludo kiel %s"
 
 #: server/srv_main.c:930
 #, c-format
 msgid "Game saved as %s"
-msgstr "Žaidimas išsaugotas kaip %s"
+msgstr "La ludo estas konservita kiel %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
-msgstr "Žaidimas jau paleistas."
+msgstr "La ludo estas jam plenumanta."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
-msgstr "Paleidžiamas žaidimas."
+msgstr "Komenco de la ludo."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
-msgstr ""
+msgstr "mendo pri nekonata raporto (speco %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
-msgstr "DÄ—mesio: atmetamas senas klientas %s"
+msgstr "Atentu: malnova kliento %s estas rifuzita"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
-msgstr ""
+msgstr "Vi ricevis pakaĵon de %d speco de mortinta aŭ observanta ludanto"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
-msgstr "Pasirinkite ne tuščią vardą"
+msgstr "Bonvolu ne elekti nulan nomon."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
-msgstr "Å i tauta jau pasirinkta."
+msgstr "Tiu nacio estas jam uzata."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
-msgstr "Kitas žaidėjas jau turi vardą „%s“. Prašome pasirinkti kitą vardą."
+msgstr "Jam alia uzanto havas la nomon '%s'.  Bonvolu elekti alian nomon."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
-msgstr ""
+msgstr "Bonvolu elekti nomon kiu entenas nur ASCII literojn."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
-msgstr "%s tauta yra negalima Å¡iam scenarijuje."
+msgstr "%s nacio ne estas disponebla en tiu ĉi scenejo."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
-msgstr "%s tauta jau pasirinkta."
+msgstr "%s nacio estas jam uzata."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
-msgstr "%s yra %s valdovas %s."
+msgstr "%s estas la %s estro %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr ""
+"Atendante komenci la ludon: %d el %d ludantoj estas pretaj por komenci."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
-msgstr ""
+msgstr "%s estis aldonita kiel AI-ludanto je %s nivelo "
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
-msgstr "Žaidėjas %d"
+msgstr "Ludanto %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
-msgstr "%s valdo %s."
+msgstr "%s estas la %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
-msgstr "Informacija siunčiama į metaserverį [%s]"
+msgstr "Sendante informojn al la metaservilo [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
-msgstr "Žaidimas baigtas..."
+msgstr "La ludo estas finita..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
-msgstr "Dabar priimami nauji klientų prisijungimai."
+msgstr "Nun novaj konektoj de klientoj estas akcepteblaj."
 
 #: server/stdinhand.c:246
 #, c-format
 msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
+msgstr "Voĉo \"%s\" estas akceptita: %d favore, %d malfavore, %d sindetene."
 
 #: server/stdinhand.c:253
 #, c-format
 msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
+msgstr "Voĉo \"%s\" ne estas akceptita: %d malfavore, %d favore, %d sindetene."
 
 #. TRANS: ambiguous command
 #: server/stdinhand.c:365
 msgid "(ambiguous)"
-msgstr "(dviprasmiškas)"
+msgstr "(dubsenca)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
 msgid "(unknown)"
-msgstr "(nežinoma)"
+msgstr "(nekonata)"
 
 #: server/stdinhand.c:458
 msgid "Name is empty, so cannot be a player."
-msgstr "Vardas tuščias, taigi negali būti žaidėjo."
+msgstr "La nomo estas malplena, do ĝi ne povas aparteni al iu ludanto."
 
 #: server/stdinhand.c:462
 msgid "Name is too long, so cannot be a player."
-msgstr "Vardas per ilgas, taigi negali būti žaidėjo."
+msgstr "La nomo estas tro longa, do ĝi ne povas aparteni al iu ludanto."
 
 #: server/stdinhand.c:466
 #, c-format
 msgid "Player name prefix '%s' is ambiguous."
-msgstr ""
+msgstr "Antaŭmetaĵo de ludantonomo '%s' estas dubsenca."
 
 #: server/stdinhand.c:470
 #, c-format
 msgid "No player by the name of '%s'."
-msgstr "Nėra tokio žaidėjo, vardu '%s'."
+msgstr "Neniu ludanto nomiĝas '%s'."
 
 #: server/stdinhand.c:474 server/stdinhand.c:509
 #, c-format
@@ -5098,51 +5310,51 @@ msgstr ""
 
 #: server/stdinhand.c:493
 msgid "Name is empty, so cannot be a connection."
-msgstr "Vardas yra tuščias, todėl jungtis negali būti sukurta."
+msgstr "La nomo estas malplena, do ĝi ne povas aparteni al iu konekto."
 
 #: server/stdinhand.c:497
 msgid "Name is too long, so cannot be a connection."
-msgstr "Vardas yra per ilgas, todėl jungtis negali būti sukurta."
+msgstr "La nomo estas tro longa, do ĝi ne povas aparteni al iu konekto."
 
 #: server/stdinhand.c:501
 #, c-format
 msgid "Connection name prefix '%s' is ambiguous."
-msgstr "Jungties vardo priešdėlis „%s“ yra dviprasmiškas."
+msgstr "Antaŭmetaĵo de konekto '%s' estas dubsenca."
 
 #: server/stdinhand.c:505
 #, c-format
 msgid "No connection by the name of '%s'."
-msgstr "NÄ—ra tokios jungties, pavadinimu '%s'."
+msgstr "Neniu konekto havas nomon '%s'."
 
 #: server/stdinhand.c:525
 #, c-format
 msgid "Open metaserver connection to [%s]."
-msgstr ""
+msgstr "Estas malfermita la konekto de metaservilo al [%s]."
 
 #: server/stdinhand.c:538
 #, c-format
 msgid "Close metaserver connection to [%s]."
-msgstr ""
+msgstr "Estas fermita la konekto de metaservilo al [%s]."
 
 #: server/stdinhand.c:553
 msgid "Metaserver connection is open."
-msgstr "Metaserverio jungtis yra atvira."
+msgstr "La konekto de metaservilo estas malfermita."
 
 #: server/stdinhand.c:556
 msgid "Metaserver connection is closed."
-msgstr "Metaserverio jungtis yra uždara."
+msgstr "La konekto de metaservilo estas fermita."
 
 #: server/stdinhand.c:566
 msgid "Metaserver connection is already open."
-msgstr "Metaserverio jungtis jau yra atvira."
+msgstr "La konekto de metaservilo estas jam malfermita."
 
 #: server/stdinhand.c:577
 msgid "Metaserver connection is already closed."
-msgstr "Metaserverio jungtis jau yra uždara."
+msgstr "La konekto de metaservilo estas jam fermita."
 
 #: server/stdinhand.c:582
 msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
-msgstr "Argumentas turi būti 'u', 'up', 'd', 'down' arba '?'."
+msgstr "La argumento devas esti 'u', 'up', 'd', 'down' aÅ­ '?'."
 
 #: server/stdinhand.c:603
 #, c-format
@@ -5167,83 +5379,83 @@ msgstr ""
 #: server/stdinhand.c:650
 #, c-format
 msgid "Metaserver is now [%s]."
-msgstr "Metaserveris dabar yra [%s]."
+msgstr "La metaservilo nun estas [%s]."
 
 #: server/stdinhand.c:660
 #, c-format
 msgid "Server id: %s"
-msgstr "Serverio id: %s"
+msgstr "ID de la servilo: %s"
 
 #: server/stdinhand.c:757
 msgid "You cannot save games manually on this server."
-msgstr "Rankiniu būdu šiame serveryje žaidmų išsaugoti negalite."
+msgstr "Vi ne povas konservi la ludon mane en ĉi tiu servilo."
 
 #: server/stdinhand.c:774
 msgid "Cannot toggle a barbarian player."
-msgstr "Negalite perjungti barbaro žaidėjo."
+msgstr "Estas neeble mastrumi barbaran ludanton."
 
 #: server/stdinhand.c:781
 #, c-format
 msgid "%s is now under AI control."
-msgstr "%s dabar valdo DI."
+msgstr "%s nun estas mastrumita de AI."
 
 #: server/stdinhand.c:802
 #, c-format
 msgid "%s is now under human control."
-msgstr "%s dabar valdo žmogus."
+msgstr "%s nun estas mastrumita de homo."
 
 #: server/stdinhand.c:847
 msgid "Can't add AI players once the game has begun."
-msgstr "Negalite įdėti DI žaidėjų žaidimui prasidėjus."
+msgstr "Estas neeble aldoni AI-ludantojn post la komenco de la ludo."
 
 #: server/stdinhand.c:867
 msgid "Can't add more players, server is full."
-msgstr "Neįmanoma pridėti daugiau žaidėjų, serveris pilnas."
+msgstr "Estas neeble aldoni pluajn ludantojn: la servilo estas plena."
 
 #: server/stdinhand.c:874
 msgid "Can't use an empty name."
-msgstr "Negaliu naudoti tuščio vardo."
+msgstr "Estas neeble uzi malplenan nomon."
 
 #: server/stdinhand.c:881
 #, c-format
 msgid "That name exceeds the maximum of %d chars."
-msgstr "Vardo ilgis viršija %d raidžių maksimumą."
+msgstr "Tiu nomo superas la maksimumon je %d literoj."
 
 #: server/stdinhand.c:887
 msgid "That name is not allowed."
-msgstr "Šis vardas neleidžiamas"
+msgstr "Tiu nomo ne estas permesita."
 
 #: server/stdinhand.c:893
 msgid "A player already exists by that name."
-msgstr "Žaidėjas tokiu vardu jau egzistuoja."
+msgstr "Jam ekzistas ludanto kiu havas tiun nomon."
 
 #: server/stdinhand.c:899
 msgid "A user already exists by that name."
-msgstr "Vartotojas Å¡iuo vardu jau egzistuoja."
+msgstr "Jam ekzistas uzanto kiu havas tiun nomon."
 
 #: server/stdinhand.c:925
 #, c-format
 msgid "%s has been added as an AI-controlled player."
-msgstr "%s buvo įtrauktas kaip DI kontroliuojamas žaidėjas."
+msgstr "%s estis aldonita kiel AI-ludanto."
 
 #: server/stdinhand.c:932
 #, c-format
 msgid "Error creating new AI player: %s."
-msgstr "Klaida kuriant naują DI žaidėją: %s."
+msgstr ""
 
 #: server/stdinhand.c:966
 msgid "Players cannot be removed once the game has started."
-msgstr "Žaidėjai negali būti pašalinti prasidėjus žaidimui."
+msgstr "Estas neeble formovi ludantoj post la komenco de la ludo."
 
 #: server/stdinhand.c:977
 #, c-format
 msgid "Removed player %s from the game."
-msgstr "Žaidėjas %s pašalintas iš žaidimo"
+msgstr "La ludanto %s estis formovita de la ludo."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
-msgstr "Vardas \"%s\" neleidžiamas dėl saugumo priežasčių."
+msgstr "La nomo \"%s\" ne estas permesita pro sekureco."
 
 #: server/stdinhand.c:1029
 #, c-format
@@ -5253,26 +5465,26 @@ msgstr ""
 #: server/stdinhand.c:1037
 #, c-format
 msgid "Loading script file: %s"
-msgstr "Įkeliamas scenarijaus failas: %s"
+msgstr "Åœargante skripton: %s"
 
 #: server/stdinhand.c:1052
 #, c-format
 msgid "Cannot read command line scriptfile '%s'."
-msgstr ""
+msgstr "Estas neeble legi la skripton de komandlinio '%s'."
 
 #: server/stdinhand.c:1054
 #, c-format
 msgid "Could not read script file '%s'."
-msgstr "Negalima perskaityti scenarijaus failo „%s“."
+msgstr "Estas neeble legi la skripton '%s'."
 
 #: server/stdinhand.c:1146
 #, c-format
 msgid "Could not write script file '%s'."
-msgstr "Negalima įrašyti scenarijaus failo „%s“."
+msgstr "Estas neeble skribi la skripton '%s'."
 
 #: server/stdinhand.c:1158
 msgid "You cannot use the write command on this server for security reasons."
-msgstr ""
+msgstr "Vi ne povas uzi komandojn je skribo en tiu ĉi servilo pro sekureco."
 
 #: server/stdinhand.c:1186
 #, c-format
@@ -5312,699 +5524,747 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr ""
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr ""
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr ""
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
-msgstr "Žaidimo organizatorius jau yra kažkas kitas."
+msgstr ""
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
-msgstr "Netinkamas argumentas %d."
+msgstr "Nevalida argumento %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
+#, fuzzy
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
-msgstr ""
+msgstr "timeoutincrease <vico> <vicprogresado> <valoro> <valormultipliko>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
-msgstr ""
+msgstr "Dinamika tempolimo agordita je %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#, fuzzy
 msgid "Option:"
-msgstr "Parinktis:"
+msgstr "Opcio"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
-msgstr "Aprašymas:"
+msgstr "Priskribo:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
-msgstr "BÅ«sena: %s"
+msgstr "Stato: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
-msgstr "keičiamas"
+msgstr "ŝanĝebla"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
-msgstr "fiksuotas"
+msgstr "fiksa"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
-msgstr ""
+msgstr "Valoro: %d, Minimumo: 0, DefaÅ­lto: %d, Maksimumo: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
-msgstr ""
+msgstr "Valoro: %d, Minimumo: %d, DefaÅ­lto: %d, Maksimumo: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
-msgstr "Vertė: „%s“, numatyta: „%s“"
+msgstr "Valoro: \"%s\",  DefaÅ­lto: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
-msgstr "Paaiškinimai galimi šioms serverio parinktims:"
+msgstr "Esplikojn estas disponeblaj pri la jenaj servil-opcioj:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
-msgstr "Šitam dar nėra paaiškinimo."
+msgstr "Neniu espliko estas disponebla pri tio."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
-msgstr "Dviprasmiškas parinkties vardas."
+msgstr "Dubsenca nomo de opcio."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
-msgstr "Serverio operatorius: %s"
+msgstr "Servil-operatoro: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
-msgstr "Žaidėjas „%s“ turi DI meistriškumo lygį „%s“."
+msgstr "la ludanto '%s' nun havas nivelon de AI '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
-msgstr "DI nekontroliuoja %s."
+msgstr "%s ne estas mastrumita de AI."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
-msgstr "Numatytas DI meistriškumo lygis nustatytas į „%s“."
+msgstr "La apriora nivelo de lerteco por IA estas agordita je '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
-msgstr "Å i komanda skirta tik klientui."
+msgstr "Tiu ĉi komando estas nur por klientoj."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
-msgstr "Naudojimas: away"
+msgstr ""
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
-msgstr "Tik žaidėjai gali naudoti away komandą"
+msgstr "Nur la ludantoj rajtas uzi tiun komandon."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
-msgstr "%s dabar yra nutolimo režime."
+msgstr "%s estas agordita je 'for' moduso."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
-msgstr "%s grįžo į žaidimą."
+msgstr "%s estas denove en la ludo."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
-msgstr ""
+msgstr "BedaÅ­re, vi ne rajtas uzi la opcion '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
-msgstr "Nežinomas parametras „%s“."
+msgstr "La opcio '%s' estas nekonata."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
-msgstr "Visos parinktys su nestandartinėmis reikšmėmis"
+msgstr "Ĉiuj opcioj kun ne-defaŭltaj valoroj"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
-msgstr "Visi nustatymai"
+msgstr "Ĉiuj opcioj"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
-msgstr "Gyvybiškai svarbios nuostatos"
+msgstr "Vitalaj opcioj"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
-msgstr "Nuostatos, priklausomos nuo situacijos"
+msgstr "Situaciaj opcioj"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
-msgstr "Retai naudojamos nuostatos"
+msgstr "Maloftaj opcioj"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
-msgstr "+ reiškia, kad Jūs galite keisti parinktį"
+msgstr "+ signifas ke vi povas ŝanĝi opcion"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
-msgstr "= reikškia, kad parinkčiai nustatyta standartinė reikšmė"
+msgstr "= signifas ke la opcio havas sian defaÅ­ltan valoron"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
-msgstr ""
+msgstr "%-*s valoro  (min,maks)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
-msgstr "Nuostata"
+msgstr "Opcio"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
-msgstr "aprašymas"
+msgstr "priskribo"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
-msgstr "Negalima pakeisti komandų žaidimui prasidėjus."
+msgstr "Estas neeble ŝanĝi la grupojn post la komenco de la ludo."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
+#, fuzzy
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr ""
+"Nedifinita argumento.  Uzo:\n"
+"%s"
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
-msgstr ""
-"Nėra tokios komandos %s.  Pateikite galiojantį komandos vardą arba numerį."
+msgstr "Neniu grupo %s.  Bonvolu havigi validan nomon aÅ­ numero por la grupo."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
-msgstr "Negalite sudaryti komandos su barbaru."
+msgstr "Estas neeble aligi barbaron."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
-msgstr "Žaidėjas %s priskirtas komandai %s."
+msgstr "La ludanto %s estas aligita al %s grupo."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
+#, fuzzy
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr ""
+"Nedifinita argumento.  Uzo:\n"
+"%s"
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
-msgstr "StebÄ—tojai balsuoti negali."
+msgstr "La observantoj ne rajtas voĉdoni."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
-"Balsuoti galima tik vykstančiame žaidime.  Įveskite 'first' norėdami tapti "
-"žaidimo organizatoriumi, jei jo dabar nėra."
+"Vi povas nur voĉdoni en plenumanta ludo.  Uzu 'first' por igi organizanto de "
+"la ludo, se la seĝo estas vaka."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
-msgstr ""
+msgstr "Voĉdonado %d \"%s\": %d favore, %d malfavore"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
-msgstr "Nevyksta balsavimas."
+msgstr "Neniu voĉdonado."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
-msgstr "NÄ—ra tinkamo paskutinio balso."
+msgstr "Lasta voĉdono estas nevalida."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
-msgstr "Vertė turi būti sveikasis skaičius."
+msgstr "La valoro devas esti entjero."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
-msgstr "NÄ—ra tokio balso (%d)."
+msgstr "Neniu voĉdono (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
-msgstr "Balsavai už „%s“"
+msgstr "Vi voĉdonis favore al \"%s\""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
-msgstr "Balsavai prieš „%s“"
+msgstr "Vi voĉdonis malfavore al \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
-msgstr ""
+msgstr "Vi povas uzi tiun komandon nur post la komenco de la ludo."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
-msgstr "Vertės 2 ir 3 turi būti sveikieji skaičiai."
+msgstr "La 2a kaj 3a valoro devas esti entjero."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
-msgstr "Blogos žemėlapio koordinatės."
+msgstr "Eraraj mapaj koordinatoj."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
-msgstr "Nurodytomos koordinatÄ—mis miestas nerastas."
+msgstr "Neniu urbo estas ĉe tiuj koordinatoj."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr ""
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr ""
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
-msgstr "Vertė 2 turi būti sveikasis skaičius."
+msgstr "La dua valoro devas esti entjero."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
-msgstr "Dalinys %d neegzistuoja."
+msgstr "La unuo %d ne ekzistas."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
+#, fuzzy
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr ""
+"Nedifinita argumento.  Uzo:\n"
+"%s"
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
-msgstr "Jums neleidžiama nustatyti šios parinkties."
+msgstr "Vi ne rajtas agordi tiun ĉi opcion."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
-msgstr ""
+msgstr "Tiu ĉi agordaĵo ne estas redaktebla post la komenco de la ludo."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
-msgstr "Vertė turi būti sveikasis skaičius."
+msgstr "La valoro devas esti entjero."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
-msgstr ""
+msgstr "La parametro %s devus enteni nur diĝitajn valorojn 0-1."
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
-msgstr "Reikšmė yra už ribų (minimali: 0, maksimali: 1)"
+msgstr "Ekstera valoro (minimumo: 0, maksimumo: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
-msgstr "Parinktis %s buvo nustatyta į %d."
+msgstr "Opcio: %s estis agordita je %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
-msgstr ""
+msgstr "La parametro %s devus enteni nur +- kaj 0-9."
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
-msgstr "Reikšmė yra už ribų (minimali: %d, maksimali: %d)"
+msgstr "Ekstera valoro (minimumo: %d, maksimumo: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
+#, fuzzy
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr ""
+"La ĉeno estas tro longa.  Uzo:\n"
+"%s"
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
-msgstr "Parinktis %s buvo nustatyta į \"%s\"."
+msgstr "Opcio: %s estis agordita je \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
-msgstr ""
+msgstr "Bedaŭre, oni ne povas observi ĝenerale en tiu ĉi ludo."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
+"Bedaŭre, vi ne povas mastrumi ĝeneralan observanton. Observu ĝin anstataŭe."
 
-#: server/stdinhand.c:2643
-msgid "Sorry, one can't observe barbarians in this game."
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Bedaŭre, oni ne povas mastrumi la homajn ludantojn en tiu ĉi ludo."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
 msgstr ""
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2702
+msgid "Sorry, one can't observe barbarians in this game."
+msgstr "Bedaŭre, oni ne povas observi la Barbarojn en tiu ĉi ludo."
+
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
-msgstr ""
+msgstr "Bedaŭre, oni ne povas mastrumi la Barbarojn en tiu ĉi ludo."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
-msgstr ""
+msgstr "Bedaŭre, oni ne povas observi la mortintajn ludantojn en tiu ĉi ludo."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
-msgstr ""
+msgstr "Bedaŭre, oni ne povas mastrumi la mortintajn ludantojn en tiu ĉi ludo."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
-msgstr ""
+msgstr "Bedaŭre, oni ne povas observi la AI-jn ludantojn en tiu ĉi ludo."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
-msgstr ""
+msgstr "Bedaŭre, oni ne povas mastrumi la AI-jn ludantojn en tiu ĉi ludo."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
-msgstr ""
+msgstr "Bedaŭre, oni ne povas observi la homajn ludantojn en tiu ĉi ludo."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
-msgstr ""
+msgstr "Bedaŭre, oni ne povas mastrumi la homajn ludantojn en tiu ĉi ludo."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
-msgstr ""
+msgstr "Bedaŭre, oni ne povas observi en tiu ĉi ludo."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
-msgstr ""
+msgstr "Bedaŭre, oni ne povas mastrumi la ludantojn en tiu ĉi ludo."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
+"Bedaŭre, oni ne povas mastrumi la jam konektitajn ludantojn en tiu ĉi ludo."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
+#, fuzzy
 msgid "Usage: observe [connection-name [player-name]]"
-msgstr ""
+msgstr "observe [konektonomo] [ludantonomo]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
+#, fuzzy
 msgid "Usage: observe [player-name]"
-msgstr ""
+msgstr "remove <ludantonomo>"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
-msgstr ""
+msgstr "%s jam mastrumas %sn. Uzante 'observe', tio formovus %sn"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
-msgstr "%s jau stebi %s."
+msgstr "%s estas jam observanta %sn."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
-msgstr "%s jau stebi."
+msgstr "%s estas jam observanta."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
-msgstr "%s dabar stebi %s"
+msgstr "%s de nun observas %sn"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
-msgstr "%s dabar stebi"
+msgstr "%s nun observas"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
+#, fuzzy
 msgid "Usage: take <connection-name> <player-name>"
-msgstr ""
+msgstr "take [konektonomo] <ludantonomo>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
+#, fuzzy
 msgid "Usage: take <player-name>"
-msgstr "Naudojimas: take <žaidėjo-vardas>"
+msgstr "create <ludantonomo>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
+#, fuzzy
 msgid "Usage: take [connection-name] <player-name>"
-msgstr ""
+msgstr "take [konektonomo] <ludantonomo>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
-msgstr "%s jau kontroliuoja %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
+msgstr "%s jam mastrumas %sn"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Ne estas libera ludanta ingo por %s"
 
-#: server/stdinhand.c:3000
-#, c-format
+#: server/stdinhand.c:3059
+#, fuzzy, c-format
 msgid "being detached from %s."
-msgstr "yra atjungiamas nuo %s."
+msgstr "malkonektado el %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
-msgstr "%s dabar kontroliuoja %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
+msgstr "%s nun mastrumas %sn (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
-msgstr "Barbaras"
+msgstr "Barbara"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
-msgstr "DI"
+msgstr "AI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
-msgstr "Žmogus"
+msgstr "Homo"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
-msgstr "Gyvas"
+msgstr "Aktiva"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
-msgstr "Miręs"
+msgstr "Malaktiva"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
-msgstr "%s nėra prisijungęs prie jokio žaidėjo."
+msgid "%s failed to attach to any player."
+msgstr "%s malsukcesis konekti kun iu ajn ludanto."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
+#, fuzzy
 msgid "Usage: detach <connection-name>"
-msgstr "Naudojimas: detach <ryšio-pavadinimas>"
+msgstr "detach <konektonomo>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
-msgstr "Jūs negalite atjungti kitų žaidėjų."
+msgstr "Vi ne povas malkonetkigi aliajn uzantojn."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
-msgstr "%s nėra prisijungęs prie jokio žaidėjo."
+msgstr "%s ne estas konektita kun iu ajn ludanto."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
-msgstr "%s atsijungia nuo %s"
+msgstr "%s malkonetktanta el %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
-msgstr "%s daugiau nebestebi."
+msgstr "%s ne estas plu kontrolita."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
-msgstr "atsijungiama nuo %s"
+msgstr "malkonektado el %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
-msgstr "Naudojimas: load <žaidimo pavadinimas>"
+msgstr ""
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
-msgstr "Neįmanoma įkelti žaidimą, kol kitas veikia."
+msgstr "Vi ne povas ŝargi ludon dum alia ludo estas plenumanta."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
-msgstr ""
+msgstr "Estas neeble trovi konservitan ludon aÅ­ scenejon nomitan \"%s\"."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
-msgstr "Negalima įkelti išsaugoto žaidimo: %s"
+msgstr "Estas neeble ŝargi la konservitan dosieron: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
-msgstr ""
+msgstr "La nuna dosierujo de la reguloj estas \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
-msgstr ""
+msgstr "La dosierujo de la reguloj \"%s\" ne estis trovita"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
-msgstr ""
+msgstr "La dosierujo de la reguloj jam estas \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
-msgstr ""
+msgstr "La dosierujo de la reguloj estas agordita je \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
-msgstr "Viso."
+msgstr "Äœis."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
-msgstr "Apgailestaujame, bet Jums neleidžiama naudotis serverio komandomis."
+msgstr "Domaĝe, vi ne rajtas uzi komandojn de la servilo."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
-msgstr "Nežinoma komanda. Bandykite '%shelp'."
+msgstr "Nekonata komando.  Provu '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
-msgstr "Jūsų naujas balsas panaikino ankstesnį jūsų balsą."
+msgstr "Via nova voĉdono forigis vian antaŭan voĉdonon."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
-msgstr ""
+msgstr "Nova voĉdono (numero %d) de %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
-msgstr ""
+msgstr "Via nova voĉdono (\"%s\") estas ĉu ne leĝa ĉu ne konata."
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
-msgstr "Jums neleidžiama naudoti šios komandos."
+msgstr "Vi ne rajtas uzi tiun komandon."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
-msgstr "(serverio žinutė)"
+msgstr " (konzolo por servilo)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
-msgstr "Žaidimas baigėsi lygiosiomis."
+msgstr "La ludon finis egalstate."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
-"Baigiamas žaidimas. Serveris pasileis iš naujo, kai visi klientai atsijungs."
+"La ludo finas. La servilo denove startos kiam ĉiuj klientoj estos "
+"malkonektitaj."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
-msgstr "Žaidimo baigti negalime, nes nevyksta joks žaidimas."
+msgstr "Estas neeble finigi la ludon: neniu ludo estas plenumanta."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
-msgstr "Å iuo metu negalite pasiduoti."
+msgstr "Vi ne povas kapitulaci nun!"
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
-msgstr "Žaidimas neprasidės, nes per mažai žaidėjų."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
+msgstr "La nombro de ludantoj ne estas sufiĉa, la ludo ne povas komenci."
+
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "La nombro de ludantoj ne estas sufiĉa, la ludo ne povas komenci."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
-msgstr "Žaidimas neprasidės, nes per mažai žaidėjų."
+msgstr "La nombro de ludantoj ne estas sufiĉa, la ludo ne povas komenci."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
-msgstr "Visi žaidėjai pasiruošę; paleidžiamas žaidimas."
+msgstr "Ĉiuj ludantoj estas pretaj; la ludo komencas."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
-"Negalima paleisti žaidimo, nes žaidimas laukia, kol atsijungs visi klientai."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
-msgstr "Negalime paleisti žaidimo, nes jis jau vyksta."
+msgstr ""
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
-msgstr "Atjungiamas susijungimas %s."
+msgstr ""
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6025,142 +6285,141 @@ msgid ""
 "  quit   -  to exit"
 msgstr ""
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#, fuzzy
 msgid "Command:"
-msgstr "Komanda:"
+msgstr "Komando: %s"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
-msgstr "ReziumÄ—: "
+msgstr "Skemo: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
-msgstr "Lygis: %s"
+msgstr "Nivelo: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
-msgstr "Å ios serverio komandos yra galimos:"
+msgstr "Estas disponeblaj la jenaj komandoj de la servilo:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
-msgstr "Pagalbos argumentas „%s“ yra dviprasmiškas."
+msgstr "La argumento '%s' aldonita al 'help' estas dubsenca."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
-msgstr ""
+msgstr "Neniu kongruo pri la argumento '%s' aldonita al 'help'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
-msgstr ""
+msgstr "Erara argumento aldonita al 'list': '%s'.  Provu '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
-msgstr "Žaidėjų sąrašas:"
+msgstr "Listo de ludantoj:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
-msgstr "<nėra žaidėjų>"
+msgstr "<neniu ludanto>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
-msgstr "vartotojas %s, "
+msgstr "uzanto %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
-msgstr ", Miręs"
+msgstr ", Mortinta"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
-msgstr ", sunkumo lygis %s"
+msgstr ", ludonivelo %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
-msgstr ", %s"
+msgstr "?clistmore:, %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
-msgstr ", pasiruošęs"
+msgstr ", preta"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
-msgstr ", nepasiruošęs"
+msgstr ", ne preta"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
-msgstr[0] " %d susijungimas:"
-msgstr[1] " %d susijungimai:"
-msgstr[2] " %d susijungimų:"
+msgstr[0] " %d konekto:"
+msgstr[1] " %d konektoj:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
-msgstr "   %s iš %s (priėjimo lygis yra %s), buferio dydis=%dkb"
+msgstr ""
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
-msgstr " (stebėjimo reežimas)"
+msgstr " (observanto)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
-msgstr "Komandų sąrašas:"
+msgstr "Gruplisto:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
-msgstr[0] "%2d : '%s' : %d žaidėjas"
-msgstr[1] "%2d : '%s' : %d žaidėjai"
-msgstr[2] "%2d : '%s' : %d žaidėjų"
+msgstr[0] "%2d : '%s' : %d ludanto"
+msgstr[1] "%2d : '%s' : %d ludantoj"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
-msgstr "%2d : '%s' : 1 žaidėjas : %s"
+msgstr "%2d : '%s' : 1 ludanto : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
-msgstr "Tuščia komanda: %s"
+msgstr "Malplena grupo: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
-msgstr "Prisijungimų prie serverio sąrašas:"
+msgstr "Listo de konektoj al la servilo:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
-msgstr "<nėra susijungimų>"
+msgstr "<neniu konekto>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
-msgstr "Galimų scenarijų sąrašas:"
+msgstr "Listo pri scenejoj disponeblaj:"
 
 #: server/techtools.c:110
 #, c-format
 msgid "The %s have researched %s."
-msgstr "%s atrado %s"
+msgstr "La %s estis studintaj pri %s."
 
 #: server/techtools.c:116
 #, c-format
 msgid "The %s have researched Future Tech. %d."
-msgstr "%s išrado ateities technologiją %d."
+msgstr "La %s estis studintaj la Estontan Teĥnologio. %d."
 
 #: server/techtools.c:168
 #, c-format
 msgid "%s acquired from %s!"
-msgstr "%s gauta(s) iš %s!"
+msgstr "%s akiris el %s!"
 
 #: server/techtools.c:220
 #, c-format
@@ -6168,263 +6427,261 @@ msgid ""
 "Discovery of %s makes the government form %s available. You may want to "
 "start a revolution."
 msgstr ""
-"%s atradimas padaro %s prieinamą. Jūs galbūt norėsite pradėti revoliuciją."
+"La eltrovo de %s igas disponebla la regsistemo %s. Vi povus deziri revolucii."
 
 #: server/techtools.c:301
 #, c-format
 msgid "Discovery of %s OBSOLETES %s in %s!"
-msgstr "%s atradimas PANAIKINA %s mieste %s veikimÄ…!"
+msgstr "Eltrovo de %s igas ARKAIKA %sn en %s!"
 
 #: server/techtools.c:351
 #, c-format
 msgid "Learned %s. Our scientists focus on %s; goal is %s."
-msgstr "IÅ¡mokta(s) %s. Mokslininkai dirba ties %s; tikslas yra %s."
+msgstr ""
+"%s estas lernita. Niaj sciencistoj sin koncentras sur %s; la celo estas %s."
 
 #: server/techtools.c:369
 #, c-format
 msgid "Learned %s.  Scientists choose to research %s."
-msgstr "IÅ¡mokta(s) %s. Mokslininkai renkasi tyrinÄ—ti %s."
+msgstr "%s estas lernita. Niaj sciencistoj elektas studi pri %s."
 
 #: server/techtools.c:376
 #, c-format
 msgid "Learned %s. "
-msgstr "Atrasta(s) %s. "
+msgstr "%s estis lernita. "
 
 #: server/techtools.c:379
 #, c-format
 msgid "Researching %s."
-msgstr "TyrinÄ—jama(s) %s."
+msgstr "Studante %sn."
 
 #: server/techtools.c:385
 #, c-format
 msgid "Learned %s.  Scientists do not know what to research next."
-msgstr "Išmokta %s. Mokslininkai nežino, ką toliau tyrinėti."
+msgstr ""
+"%s estis lernita. Do la sciencistoj ne scias tion kion ili devos studi sekve."
 
 #: server/techtools.c:402
 msgid ""
 "Great scientists from all the world join your civilization: you get an "
 "immediate advance."
 msgstr ""
-"Didieji filosofai prisijungia prie tavęs iš viso pasaulio. Jūs iš karto "
-"gaunate technologinį pasiekimą."
+"Gravaj sciencistoj el la tuta mondo aliĝis al via civilizo: vi tuj gajnas "
+"novan teĥnologion."
 
 #: server/techtools.c:570
 #, c-format
 msgid "Technology goal is %s."
-msgstr "Tyrimų tikslas yra %s."
+msgstr "Teĥnologia celo estas %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
-msgstr "Pavogei %s iš %s."
+msgstr "Vi forŝtelis %sn de la %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
-msgstr "%s iš tavęs pavogė %s!"
+msgstr "La %s forŝtelis %sn de vi!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
-msgstr "%s pavogė %s iš %s."
+msgstr "La %s forŝtelis %sn de la %s."
 
 #: server/unithand.c:100
 #, c-format
 msgid "Illegal packet, can't upgrade %s (yet)."
-msgstr "Blogas paketas, dar negalima patobulinti %s."
+msgstr ""
 
 #: server/unithand.c:128
 #, c-format
 msgid "%d %s upgraded to %s for %d gold."
-msgstr "%d %s patobulintas iki %s už %d aukso."
+msgstr "%d %s moderniĝis al %s per %d oraj moneroj."
 
 #: server/unithand.c:136
 msgid "No units could be upgraded."
-msgstr "Jokie daliniai negali būti patobulinti."
+msgstr "Neniu unuo povis esti modernigita."
 
 #: server/unithand.c:160
 #, c-format
 msgid "%s upgraded to %s for %d gold."
-msgstr "%s patobulintas iki %s už %d aukso."
+msgstr "%s moderniĝis al %s per %d oraj moneroj."
 
 #: server/unithand.c:396
 #, c-format
 msgid "%s refuses to disband!"
-msgstr "%s atsisako išsiformuoti!"
+msgstr "%s rifuzas dissolviĝon!"
 
 #: server/unithand.c:449
 msgid "Can't place city here."
-msgstr "Čia neįmanoma pastatyti miesto."
+msgstr "Vi ne povas fondi urbon ĉi tie."
 
 #: server/unithand.c:456
 #, c-format
 msgid "Only %s can build a city."
-msgstr "Tik %s gali statyti miestÄ…."
+msgstr "Nur la %s povas fondi urbon."
 
 #: server/unithand.c:461
 msgid "Can't build a city."
-msgstr "Negaliu statyti miesto."
+msgstr "Estas neeble fondi urbon"
 
 #: server/unithand.c:470
 #, c-format
 msgid "Only %s can add to a city."
-msgstr "Tik %s gali prisidÄ—ti prie miesto."
+msgstr "Nur la %s povas aldoniĝi al urbo"
 
 #: server/unithand.c:475
 msgid "Can't add to a city."
-msgstr "Negalime pridÄ—ti prie miesto."
+msgstr "Estas neeble aldoniĝi al urbo"
 
 #: server/unithand.c:481
 #, c-format
 msgid "%s unit has no moves left to add to %s."
-msgstr ""
-"%s dalinys daugiau nebeturi ėjimų ir negali prisijungti prie miesto %s."
+msgstr "La %s unuo ne havas plu movojn por aldoni sin al %s."
 
 #: server/unithand.c:487
 #, c-format
 msgid "%s unit has no moves left to build city."
-msgstr "%s dalinys daugiau nebeturi ėjimų ir negali statyti miesto."
+msgstr "La %s unuo ne havas plu movojn por fondi urbon."
 
 #: server/unithand.c:492
 #, c-format
 msgid "%s is too big to add %s."
-msgstr "%s nÄ—ra toks didelis kaip %s."
+msgstr "%s estas tro granda por aldoni %sn."
 
 #: server/unithand.c:498
 #, c-format
 msgid "%s needs an improvement to grow, so you cannot add %s."
-msgstr "%s reikia patobulinimo, kad galėtų augti, todėl negalite pridėti %s."
+msgstr "Necesas urba plibonigo por ke %s kresku, do vi ne povas aldoni %sn."
 
 #: server/unithand.c:509
 #, c-format
 msgid "Can't add %s to %s."
-msgstr "Negalime pridÄ—ti %s prie %s."
+msgstr "Vi ne povas aldoni %sn al %s."
 
 #: server/unithand.c:531
 #, c-format
 msgid "%s added to aid %s in growing."
-msgstr "%s prisijungÄ— pagelbÄ—ti %s augti."
+msgstr "%s aldoniĝis por helpi la kreskon de %s."
 
 #: server/unithand.c:828
 msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
-msgstr "Jūsų atominė raketa buvo pašauta SDI gynybos, kokios išlaidos."
+msgstr "Via atom-misilo estis paffaligita fare de SDI-defendo. Kia malŝparo."
 
 #: server/unithand.c:831
 #, c-format
 msgid "The nuclear attack on %s was avoided by your SDI defense."
-msgstr "Branduolinio ginklo atakos %s buvo išvengta Jūsų SDI gynybos dėka."
+msgstr "La atom-atako en %s estas senefikigita fare de via SDI-defendo."
 
 #. TRANS: "Your Cannon ... the Polish Destroyer."
 #: server/unithand.c:901
-#, fuzzy, c-format
+#, c-format
 msgid "Your %s survived the pathetic attack from the %s %s."
-msgstr "Jūsų %s išgyveno apgailėtiną %s %s ataką."
+msgstr "Viaj %s supervivis la mizeran atakon de la %sj %s."
 
 #. TRANS: "... Cannon ... the Polish Destroyer."
 #: server/unithand.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "Your attacking %s failed against the %s %s!"
-msgstr "Jūsų %s ataka prieš %s %s nepavyko!"
+msgstr "Viaj atakantaj %s malsukcesis kontraÅ­ la %sj %s!"
 
 #: server/unithand.c:983
 #, c-format
 msgid "Only %s can attack from sea."
-msgstr "Tik %s gali atakuoti iš jūros."
+msgstr "Nur la %s kapablas ataki de la maro."
 
 #: server/unithand.c:988
 msgid "Cannot attack from sea."
-msgstr "Negali atakuoti iš jūros."
+msgstr "Estas neeble ataki de la maro."
 
 #: server/unithand.c:996 server/unittools.c:2103
 msgid "Cannot attack unless you declare war first."
-msgstr "Negalite atakuoti prieš tai nepasklebę karo."
+msgstr "Vi ne povas ataki sen militdeklari antaÅ­e."
 
 #: server/unithand.c:1001
 #, c-format
 msgid "%s can only move into your own zone of control."
-msgstr "%s gali eiti tik į savo kontrolės zoną."
+msgstr "%s povas nur movi en via influa areo."
 
 #: server/unithand.c:1007
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot invade unless you break peace with %s first."
-msgstr "Negalite atakuoti prieš tai nepasklebę karo."
+msgstr "Vi ne povas invadi sen nuligi la pacon kun %s antaÅ­e."
 
 #: server/unithand.c:1052
 msgid "This unit has no moves left."
-msgstr "Daliniui nėra likusių ėjimų."
+msgstr "Ĉi tiu unuo ne havas plu movojn."
 
 #: server/unithand.c:1107
 #, fuzzy
 msgid "Unit must be on land to perform diplomatic action."
-msgstr "Dalinys negali atlikti diplomatinių veiksmų iš %s."
+msgstr "La unuo ne povas plenumi diplomatian agon de %s."
 
 #: server/unithand.c:1109
 msgid "No diplomat action possible."
-msgstr "Neįmanomi jokie diplomato veiksmai."
+msgstr "Neniu diplomatia ago estas farebla."
 
 #: server/unithand.c:1125
 #, c-format
 msgid "You must declare war on %s first.  Try using players dialog (F3)."
-msgstr "Pirma turite paskelbti %s karą.  Pasinaudokite žaidėjų dialogu (F3)."
+msgstr ""
+"Vi devas militdeklari kontraÅ­ %s antaÅ­e.  Uzu la fenestron de la ludantoj "
+"(F3)."
 
 #: server/unithand.c:1143
 msgid "This unit is being transported, and so cannot bombard."
-msgstr "Å is dalinys yra transportuojamas, todÄ—l negali bombarduoti."
+msgstr "Ĉi tiu unuo estas transportita, do ĝi ne povas bombi."
 
 #: server/unithand.c:1158
 msgid "You can't attack there."
-msgstr "Negalite atakuoti čia."
+msgstr "Vi ne povas ataki ĉi tie."
 
 #: server/unithand.c:1180
 msgid "This type of troops cannot take over a city."
-msgstr "Šio tipo daliniai negali užimti miesto"
+msgstr "Ĉi tiu speco de unuo ne povas konkeri urbon."
 
 #: server/unithand.c:1198
 msgid "A transported unit is not allied to all units or city on target tile."
 msgstr ""
-"Perkeltas dalinys nėra sąjunginkinkas su visais tame laukelyje esančiu "
-"miestu ar daliniais."
+"Transportita unuo ne estas alianca kun ĉiuj unuoj aŭ kun urbo de la kahelo "
+"kie ĝi estas alvenonta."
 
 #: server/unithand.c:1240
 #, c-format
 msgid "Your %s helps build the %s in %s (%d remaining)."
-msgstr ""
+msgstr "Viaj %s helpis prepari la %sn en %s (%d ceterajn)."
 
 #: server/unithand.c:1242
 #, c-format
 msgid "Your %s helps build the %s in %s (%d surplus)."
-msgstr ""
+msgstr "Viaj %s helpis prepari la %sn en %s (troo je %d)."
 
 #: server/unithand.c:1286
 #, c-format
 msgid ""
 "Sorry, your %s cannot establish a trade route because it has no home city"
-msgstr ""
-"Apgailestaujame, tačiau Jūsų %s negali įkurti prekybos kelio, nes jis neturi "
-"namų miesto"
+msgstr "Bedaŭre, viaj %s ne povas starigi komercan kurson ĉar mankas hejmurbon"
 
 #: server/unithand.c:1296
 #, c-format
 msgid "Sorry, your %s cannot establish a trade route between %s and %s"
-msgstr ""
-"Apgailestaujame, tačiau Jūsų %s negali įkurti prekybos kelio tarp %s ir %s"
+msgstr "BedaÅ­re, viaj %s ne povas starigi komercan kurson inter %s kaj %s"
 
 #: server/unithand.c:1325 server/unithand.c:1344
 #, c-format
 msgid "Sorry, your %s cannot establish a trade route here!"
-msgstr "Apgailestaujame, tačiau čia Jūsų %s negali įkurti prekybos kelio!"
+msgstr "Bedaŭre, viaj %s ne povas starigi komercan kurson ĉi tie!"
 
 #: server/unithand.c:1329 server/unithand.c:1348
 #, c-format
 msgid "      The city of %s already has %d better trade routes!"
-msgstr "       %s jau turi %d geresnius prekybos kelius!"
+msgstr "       La urbo %s jam havas %d pli bonajn komercajn kursojn!"
 
 #: server/unithand.c:1361 server/unithand.c:1373
 #, c-format
 msgid "Sorry, %s has canceled the trade route from %s to your city %s."
-msgstr ""
-"Apgailestaujame, tačiau %s panaikino prekybos kelią iš miesto %s į Jūsų "
-"miestÄ… %s."
+msgstr "Bedaŭrinde, %s forigis la komercan kurson de %s ĝis via urbo %s."
 
 #: server/unithand.c:1406
 #, c-format
@@ -6432,108 +6689,108 @@ msgid ""
 "Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
 "research."
 msgstr ""
-"Jūsų %s iš %s atvyko į miestą %s ir atneša %d pelno auksu ir paieškos "
-"taškais."
+"Viaj %s estas alvenintaj de %s al %s, kaj la enspezo estas %d poentojn de "
+"oro kaj studo."
 
 #: server/unittools.c:253
-#, fuzzy, c-format
+#, c-format
 msgid "%s was upgraded for free to %s."
-msgstr "%s nemokamai patobulintas iki %s."
+msgstr "%s estas senpage ĝisdatigitaj al %s."
 
 #: server/unittools.c:297
 #, c-format
 msgid "Not enough gold. %s disbanded"
-msgstr "Nepakanka aukso. IÅ¡montuojamas %s"
+msgstr "Oro estas nesufiĉa. %s estas dissolvitaj"
 
 #: server/unittools.c:342
 #, c-format
 msgid "Your %s has run out of hit points."
-msgstr "Jūsų %s baigėsi gyvybės taškai."
+msgstr "Viaj %s finis la vivo-poentojn."
 
 #: server/unittools.c:358
-#, c-format
+#, fuzzy, c-format
 msgid "Your %s has been lost on the high seas."
-msgstr "Jūsų %s buvo prarastas plačiosiose jūrose."
+msgstr "Viaj %s finis la vivo-poentojn."
 
 #: server/unittools.c:365
-#, c-format
+#, fuzzy, c-format
 msgid "Your %s survived on the high seas and became more experienced!"
-msgstr "Jūsų %s buvo išgyveno plačiosiose jūrose ir įgavo patirties."
+msgstr "Viaj %s iĝis pli spertaj!"
 
 #: server/unittools.c:376
-#, c-format
+#, fuzzy, c-format
 msgid "Your %s has been lost on unsafe terrain."
-msgstr "Jūsų %s buvo prarastas, nes atsidūrė ant nesaugaus reljefo."
+msgstr "Viaj %s finis la vivo-poentojn."
 
 #: server/unittools.c:430
 #, c-format
 msgid "Your %s has returned to refuel."
-msgstr "Jūsų %s grįžo pasipildyti degalų."
+msgstr "Viaj %s revenis por sin provizi."
 
 #: server/unittools.c:454
 #, c-format
 msgid "Your %s has run out of fuel."
-msgstr "Jūsų %s pasibaigė degalai."
+msgstr "Viaj %s elĉerpis la fuelon."
 
 #. TRANS: And, <the unit> became ...
 #: server/unittools.c:616
-#, fuzzy
 msgid "And, became more experienced!"
-msgstr " ir dalinys įgavo patirties!"
+msgstr "Kaj, ili iĝas pli spertaj!"
 
 #. TRANS: Your <unit> became ...
 #: server/unittools.c:620
 #, c-format
 msgid "Your %s became more experienced!"
-msgstr "Jūsų %s tapo labiau patyręs!"
+msgstr "Viaj %s iĝis pli spertaj!"
 
 #: server/unittools.c:1011
 #, c-format
 msgid "Teleported your %s to %s."
-msgstr "Jūsų %s teleportuotas į %s."
+msgstr "Viaj %s estis teletransportitaj al %s."
 
 #: server/unittools.c:1041
 #, c-format
 msgid "Disbanded your %s."
-msgstr "Išmontuotas Jūsų %s."
+msgstr "Viaj %s estis dissolvita."
 
 #: server/unittools.c:1363
 #, c-format
 msgid "Unable to defend %s, %s has lost the game."
-msgstr "Negalime apginti %s, %s pralošė žaidimą."
+msgstr "Oni malkapablas defendi %sn, %s malvenkis la ludon."
 
 #: server/unittools.c:1367
 #, c-format
 msgid "Losing %s meant losing the game! Be more careful next time!"
-msgstr ""
-"%s praradimas reiškė žaidimo pralaimėjimą! Kitą kartą būkite atsargesnis!"
+msgstr "Perdi %sn signifas malvenki! Estu pli zorgema venont-foje!"
 
 #: server/unittools.c:1469
 #, c-format
 msgid "%s escaped the destruction of %s, and fled to %s."
-msgstr "%s išsigelbėjo iš %s ir pabėgo į %s."
+msgstr "%s forkuris de la detruo de %s, kaj rifuĝis en %s."
 
 #: server/unittools.c:1478
 #, c-format
 msgid "%s lost when %s was lost."
-msgstr "%s prarastas, kai %s buvo prarastas."
+msgstr "%s malvenkis pro la perdo de %s."
 
 #: server/unittools.c:1527
 #, c-format
 msgid "Barbarian leader captured, %d gold ransom paid."
-msgstr "Sučiuptas barbarų vadas, gauta %d aukso išpirka."
+msgstr ""
+"La estro de la Barbaroj estis kaptita; elaĉeto je %d oraj moneroj estis "
+"pagita."
 
 #. TRANS: "... Cannon ... the Polish Destroyer."
 #: server/unittools.c:1545
-#, fuzzy, c-format
+#, c-format
 msgid "Your attacking %s succeeded against the %s %s!"
-msgstr "Jūsų %s ataka prieš  %s %s pavyko!"
+msgstr "Viaj atakantaj %s sukcesis kontraÅ­ la %sj %s!"
 
 #. TRANS: "Cannon ... the Polish Destroyer."
 #: server/unittools.c:1554 server/unittools.c:1612
-#, fuzzy, c-format
+#, c-format
 msgid "%s lost to an attack by the %s %s."
-msgstr "%s prarastas atakuojant %s %s."
+msgstr "%s pereis pro atako de la %sj %s."
 
 #. TRANS: "... Cannon ... the Polish Destroyer ...."
 #: server/unittools.c:1588
@@ -6541,23 +6798,22 @@ msgstr "%s prarastas atakuojant %s %s."
 msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
 msgid_plural ""
 "Your attacking %s succeeded against the %s %s (and %d other units)!"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Viaj atakantaj %s sukcesis kontraÅ­ la %sj %s (kaj %d alia unuo)!"
+msgstr[1] "Viaj atakantaj %s sukcesis kontraÅ­ la %sj %s (kaj %d aliaj unuoj)!"
 
 #. TRANS: "Cannon lost when the Polish Destroyer
 #. * attacked the German Musketeers."
 #: server/unittools.c:1621
 #, c-format
 msgid "%s lost when the %s %s attacked the %s %s."
-msgstr ""
+msgstr "%s pereis kiam la %sj %s atakis la %sjn %sn."
 
 #. TRANS: "Musketeers (and Cannon) lost to an
 #. * attack from the Polish Destroyer."
 #: server/unittools.c:1636
 #, c-format
 msgid "%s (and %s) lost to an attack from the %s %s."
-msgstr ""
+msgstr "%s (kaj %s) pereis pro atako de la %sj %s."
 
 #. TRANS: "Musketeers and 3 other units lost to
 #. * an attack from the Polish Destroyer."
@@ -6566,9 +6822,8 @@ msgstr ""
 #, c-format
 msgid "%s and %d other unit lost to an attack from the %s %s."
 msgid_plural "%s and %d other units lost to an attack from the %s %s."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%s kaj %d alia unuo pereis pro atako de la %sj %s."
+msgstr[1] "%s kaj %d aliaj unuoj pereis pro atako de la %sj %s."
 
 #. TRANS: "2 units lost when the Polish Destroyer
 #. * attacked the German Musketeers."
@@ -6577,194 +6832,195 @@ msgstr[2] ""
 #, c-format
 msgid "%d unit lost when the %s %s attacked the %s %s."
 msgid_plural "%d units lost when the %s %s attacked the %s %s."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d unuo pereis kiam la %sj %s atakis la %sj %s."
+msgstr[1] "%d unuoj pereis kiam la %sj %s atakis la %sj %s."
 
 #: server/unittools.c:1928
 #, c-format
 msgid "Your %s was nuked by %s."
-msgstr "Ant Jūsų %s buvo numesta branduolinė bomba, kurią numetė %s."
+msgstr "Via %s estis atombombita fare de %s."
 
 #: server/unittools.c:1931 server/unittools.c:1947
 msgid "yourself"
-msgstr "patį save"
+msgstr "vi mem"
 
 #: server/unittools.c:1935
-#, fuzzy, c-format
+#, c-format
 msgid "The %s %s was nuked."
-msgstr "Ant %s %s buvo numesta branduolinÄ— bomba."
+msgstr "La %sj %s estis atombombitaj"
 
 #: server/unittools.c:1944
 #, c-format
 msgid "%s was nuked by %s."
-msgstr "Ant %s buvo numesta branduolinÄ— bomba. JÄ… numetÄ— %s."
+msgstr "%s estis atombombita fare de %s."
 
 #: server/unittools.c:1952
 #, c-format
 msgid "You nuked %s."
-msgstr "JÅ«s numetÄ—te branduolinÄ™ bombÄ… ant %s."
+msgstr "Vi atombombis %sn."
 
 #: server/unittools.c:1993
-#, fuzzy, c-format
+#, c-format
 msgid "The %s detonated a nuke!"
-msgstr "%s susprogdino branduolinÄ™ bombÄ…!"
+msgstr "La %s eksplodigis atombombon!"
 
 #: server/unittools.c:2017
 #, c-format
 msgid "%s transported successfully."
-msgstr "%s sÄ—kmingai transportuotas."
+msgstr "%s estis transportitaj sukcese."
 
 #: server/unittools.c:2069
 msgid "This unit type can not be paradropped."
-msgstr "Šio tipo dalinys negali būti nuliestas parašiutu."
+msgstr "Ĉi tiu speco de unuo ne estas paraŝutebla."
 
 #: server/unittools.c:2079
-#, fuzzy
 msgid "You cannot paradrop a unit that is transporting other units."
-msgstr "Negalite nuleisti parašiutu trasportinio dalinio."
+msgstr "Vi ne povas paraŝutigi unuon kiu transportas alian unuon."
 
 #: server/unittools.c:2085
 msgid "The destination location is not known."
-msgstr "Tikslo vieta nežinoma."
+msgstr "La alvenpunkto estas nekonata."
 
 #: server/unittools.c:2092
 #, c-format
 msgid "This unit cannot paradrop into %s."
-msgstr "Šitas dalinys negali nusileisti parašiutu į %s."
+msgstr "Ĉi tiu unuo ne povas paraŝuti en %sn."
 
 #: server/unittools.c:2112
 #, c-format
 msgid "The distance to the target (%i) is greater than the unit's range (%i)."
-msgstr ""
-"Atstumas iki taikinio  (%i) yra didesnis nei dalinio Å¡audymo atstumas  (%i)."
+msgstr "La distanco de la celo (%i) superas la aÅ­tonomion de la unuo (%i)."
 
 #: server/unittools.c:2123
 #, c-format
 msgid "Your %s paradropped into the %s and was lost."
-msgstr "Jūsų %s nusileido parašiutu į %s ir buvo sunaikintas."
+msgstr "Viaj %s paraŝutis en la %s kaj estis perdita."
 
 #: server/unittools.c:2136
 #, c-format
 msgid "Your %s was killed by enemy units at the paradrop destination."
-msgstr "Jūsų %s buvo nužudytas priešo dalinių nusileidimo parašiutais vietoje."
+msgstr ""
+"Viaj %s estis mortigita fare de malamikaj unuoj ĉe la paraŝuta alvenpunkto."
 
 #: server/unittools.c:2158
 #, c-format
 msgid "You found %d gold."
-msgstr "JÅ«s radote %d aukso."
+msgstr "Vi trovis %d oraj monerojn."
 
 #: server/unittools.c:2175
 #, c-format
 msgid "You found %s in ancient scrolls of wisdom."
-msgstr "Jūs atradote %s senoviniuose išminties rankraščiuose."
+msgstr "Vi trovis %sn en antikvaj pergamenoj de saĝo."
 
 #: server/unittools.c:2182
-#, c-format
+#, fuzzy, c-format
 msgid "The %s have acquired %s from ancient scrolls of wisdom."
-msgstr "%s gavo %s iš senovinių išminties rankraščių."
+msgstr ""
+"%s akiris %sn el antikvaj pergamenoj de                              saĝo."
 
 #: server/unittools.c:2196
 msgid "A band of friendly mercenaries joins your cause."
-msgstr "Prie Jūsų prisijungia draugiškų samdinių būrys."
+msgstr "Bando da amikaj dungosoldatoj aliĝas al via idealo."
 
 #: server/unittools.c:2214
 msgid "An abandoned village is here."
-msgstr "ÄŒia yra apleista gyvenvietÄ—."
+msgstr "Ĉi tie estas forlasita vilaĝo."
 
 #: server/unittools.c:2224
 msgid "You have unleashed a horde of barbarians!"
-msgstr "Jūs išlaisvinote barbarų ordą."
+msgstr "Vi senbridigis hordon de barbaroj!"
 
 #: server/unittools.c:2227
 #, c-format
 msgid "Your %s has been killed by barbarians!"
-msgstr "Jūsų %s buvo užmuštas barbarų!"
+msgstr "Viaj %s estis mortigita de la barbaroj!"
 
 #: server/unittools.c:2243
 msgid "You found a friendly city."
-msgstr "Jūs radote draugišką miestą."
+msgstr "Vi trovis amikan urbon."
 
 #: server/unittools.c:2257
 msgid "Friendly nomads are impressed by you, and join you."
-msgstr "Draugiški klajokliai yra sužavėti ir prisijungia prie Jūsų."
+msgstr "Amikaj nomadoj restis imponitaj de vi, kaj ili aliĝas al vi."
 
 #: server/unittools.c:2282
 msgid "Your overflight frightens the tribe; they scatter in terror."
-msgstr ""
+msgstr "Via superflugo teruris la tribon; ili forkuris terruroplenaj."
 
 #: server/unittools.c:2540
 #, c-format
 msgid "Orders for %s aborted after enemy movement was spotted."
-msgstr "Dalinio %s įsakymai nutraukti, nes pastebėtas priešo judėjimas."
+msgstr ""
+"La ordonoj por %s estis nuligitaj post la ĉesigo de la movoj de la malamiko."
 
 #: server/unittools.c:2989
 #, c-format
 msgid "Orders for %s aborted as there are units nearby."
-msgstr "Dalinio %s įsakymai nutraukti, nes gretimais yra kitų dalinių."
+msgstr "La ordonoj por %s estis nuligitaj ĉar estas proksimaj unuoj."
 
 #: server/unittools.c:3041
 #, c-format
 msgid "Orders for %s aborted because building of city failed."
-msgstr "Dalinio %s įsakymai nutraukti, nes žlugo miesto statyba."
+msgstr ""
+"La ordonoj por %s estis nuligitaj ĉar la konstruado de urbo malsukcesis."
 
 #: server/unittools.c:3054
 #, c-format
 msgid "Orders for %s aborted since they give an invalid activity."
-msgstr "Dalinio %s įsakymai nutraukti, nes jiems netinkamai įsakyta."
+msgstr "La ordonoj por %s estis nuligitaj ĝis ili estos nevalidaj agoj."
 
 #: server/unittools.c:3068
 #, c-format
 msgid "Orders for %s aborted since they give an invalid location."
-msgstr "Dalinio %s įsakymai nutraukti, nes jiems nurodyta netinkama vieta."
+msgstr "La ordonoj por %s estis nuligitaj ĉar ili havas nevalidan lokiĝon."
 
 #: server/unittools.c:3078
 #, c-format
 msgid "Orders for %s aborted as there are units in the way."
-msgstr "Dalinio %s įsakymai nutraukti, nes kelyje yra kitų dalinių."
+msgstr "La ordonoj por %s estis nuligitaj ĉar estas unuoj en la vojo."
 
 #: server/unittools.c:3104
 #, c-format
 msgid "Orders for %s aborted because of failed move."
-msgstr "Dalinio %s įsakymai nutraukti dėl blogo ėjimo."
+msgstr "La ordonoj por %s estis nuligitaj pro malsukcesa movo."
 
 #: server/unittools.c:3145
 #, c-format
 msgid "Attempt to change homecity for %s failed."
-msgstr "Bandymas daliniui %s pakeisti namų miestą žlugo."
+msgstr "AnstataÅ­igo de nuna hejmurbo per %s malsukcesis."
 
 #: server/unittools.c:3156
 #, c-format
 msgid "Attempt to establish trade route for %s failed."
-msgstr "Bandymas sukurti prekybos kelią miestui %s žlugo."
+msgstr "Malsukcesis provo por starigi komercan kurson por %s."
 
 #: server/unittools.c:3168
 #, c-format
 msgid "Attempt to build wonder for %s failed."
-msgstr "Pastangos pastatyti stebukla mieste %s žlugo."
+msgstr "Malsukcesis provo por konstrui mirindaĵon por %s."
 
 #: server/unittools.c:3177
 #, c-format
 msgid "Your %s has invalid orders."
-msgstr "Jūsų %s gavo klaidingus nurodymus."
+msgstr "Viaj %s havas nevalidajn ordonojn."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
-msgstr "Didelis sausumos kiekis, todėl tai gali užtrukti kelias sekundes."
+msgstr ""
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
-msgstr "Grįžtama į generatorių %d."
+msgstr "AnstataÅ­o de generatoro per generatoro %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
-msgstr "3 generatorius nepaskirstė didelių salų."
+msgstr "La generatoro 3 ne lokis ĉiujn grandajn insulojn."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
-msgstr "3 generatorius paliko %li sausumos nepaskirstęs."
+msgstr "La generatoro 3 lasis ne-lokita %li da lando."
 
 #: server/generator/startpos.c:381
 #, c-format
@@ -6787,12 +7043,12 @@ msgstr ""
 #: client/audio.c:119
 #, c-format
 msgid "Plugin '%s' isn't available. Available are %s"
-msgstr "Įskiepis '%s' negalimas. Galimi yra %s"
+msgstr "La kromaĵo '%s' ne estas disponebla. Disponeblaj estas %s"
 
 #: client/audio.c:125
 #, c-format
 msgid "Plugin %s found but can't be initialized."
-msgstr "Įskiepis %s rastas, bet negali būti paleistas."
+msgstr ""
 
 #: client/audio.c:174
 #, c-format
@@ -6801,282 +7057,283 @@ msgstr ""
 
 #: client/audio.c:197
 msgid "No real audio plugin present."
-msgstr ""
+msgstr "Neniu real-audio kromaĵo ĉeestas."
 
 #: client/audio.c:198 client/audio.c:215 client/audio.c:247 client/audio.c:258
+#, fuzzy
 msgid "Proceeding with sound support disabled"
-msgstr ""
+msgstr "Plenumanta sen sono."
 
 #: client/audio.c:199
 msgid "For sound support, install SDL_mixer"
-msgstr "Kad girdÄ—tumÄ—te garsus, instaliuokite SDL_mixer"
+msgstr "Por havi sonon, instalu esound aÅ­ SDL_mixer"
 
 #: client/audio.c:205
+#, fuzzy
 msgid "No sound spec-file given!"
-msgstr ""
+msgstr "Estas neeble ŝargi sound-spec-file: %s"
 
 #: client/audio.c:211
-#, c-format
+#, fuzzy, c-format
 msgid "Cannot find sound spec-file \"%s\"."
-msgstr ""
+msgstr "Estas neeble ŝargi sound-spec-file: %s"
 
 #: client/audio.c:212
 msgid "To get sound you need to download a sound set!"
-msgstr "Kad girdėtumėte garsą, Jums reikia atsisiųsti garsų rinkinį!"
+msgstr "Por havi sonon, vi devas elŝuti sonaĵojn!"
 
 #: client/audio.c:213
 #, c-format
 msgid "Get sound sets from <%s>."
-msgstr ""
+msgstr "Prenu sonaĵojn el <%s>."
 
 #: client/audio.c:220
 #, c-format
 msgid "Could not load sound spec-file: %s"
-msgstr ""
+msgstr "Estas neeble ŝargi sound-spec-file: %s"
 
 #: client/audio.c:255
 msgid "No real audio subsystem managed to initialize!"
-msgstr ""
+msgstr "Neniu reala son-subsistemo por prepari!"
 
 #: client/audio.c:257
+#, fuzzy
 msgid "Perhaps there is some misconfiguration or bad permissions"
-msgstr "Galbūt kalta bloga konfigūracija arba uždrausta prieiga"
+msgstr "Eble ĉi tie estas eraraj agordaĵoj aŭ rajtoj."
 
 #: client/audio.c:280
-#, c-format
+#, fuzzy, c-format
 msgid "Cannot find audio file %s"
-msgstr "Negaliu rasti audio failo %s"
+msgstr "Estas neeble trovi vian hejm-dosierujon"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
-msgstr "?filler:XXX/XXX XXX ėjimų"
+msgstr "?filler:XXX/XXX XXX vicoj"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
-msgstr "%3d aukso per Ä—jimÄ…"
+msgstr "%3d oro povice"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
-msgstr[0] "%3d Ä—jimas"
-msgstr[1] "%3d Ä—jimai"
-msgstr[2] "%3d ėjimų"
+msgstr[0] "%3d vico"
+msgstr[1] "%3d vicoj"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
-msgstr "niekada"
+msgstr "neniam"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
-#, c-format
+#: client/citydlg_common.c:272
+#, fuzzy, c-format
 msgid "%s (XX) %d/turn"
-msgstr "%s (XX) %d/Ä—jimÄ…"
+msgstr "%d/vico"
 
-#: client/citydlg_common.c:288
-#, c-format
+#: client/citydlg_common.c:290
+#, fuzzy, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
-msgstr[0] "%s (%d) %d Ä—jimas"
-msgstr[1] "%s (%d) %d Ä—jimai"
-msgstr[2] "%s (%d) %d ėjimų"
+msgstr[0] "%d/%d %d vicoj"
+msgstr[1] "%d/%d %d vicoj"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
-msgstr "Pasenęs"
+msgstr "Arkaika"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
-msgstr "Pastatyta"
+msgstr "Konstruita"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
-msgstr "Didysis stebuklas"
+msgstr "Ega Mirindaĵo"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
-msgstr "Mažasis stebuklas"
+msgstr "Eta mirindaĵo"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
-msgstr "%d/Ä—jimÄ…"
+msgstr "%d/vico"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
-msgstr "%+4d : Piliečiai\n"
+msgstr "%+4d : Civitanoj\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
-msgstr ""
+msgstr "%+4d : Impostoj el komerco\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
-msgstr ""
+msgstr "%+4d : Komerca kurso kun %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
-msgstr ""
+msgstr "%+4d : Dekonaĵoj de konstruado\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
-msgstr ""
+msgstr "%+4d : Pluso el %s (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
-msgstr ""
+msgstr "%+4d : Malŝparo\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
-msgstr "%+4d : Netvarka\n"
+msgstr "%+4d : Tumulto\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
-msgstr ""
+msgstr "%+4d : Uzata\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
-msgstr ""
+msgstr "==== : Aldonita al\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
-msgstr ""
+msgstr "%4d : Suma troo"
 
 #: client/cityrepdata.c:73
 msgid "?city_state:Rapture"
-msgstr "?city_state:Susižavėjęs"
+msgstr "?city_state:Entuziasma"
 
 #: client/cityrepdata.c:74
 msgid "?city_state:Disorder"
-msgstr "?city_state:Netvarka"
+msgstr "?city_state:Tumulta"
 
 #: client/cityrepdata.c:75
 msgid "?city_state:Peace"
-msgstr "?city_state:Taika"
+msgstr "?city_state:Paca"
 
 #: client/cityrepdata.c:358
 msgid "(worklist)"
-msgstr "(darbų sąrašas)"
+msgstr "(laborlisto)"
 
 #: client/cityrepdata.c:447
 msgid "Special"
-msgstr "Specialūs"
+msgstr "Specialistoj"
 
 #: client/cityrepdata.c:448
 msgid "?entertainers/scientists/taxmen:E/S/T"
-msgstr ""
+msgstr "?entertainers/scientists/taxmen:Ve/Sc/Im"
 
 #: client/cityrepdata.c:449
 msgid "Entertainers, Scientists, Taxmen"
-msgstr "Paslaugų teikėjai, mokslininkai, mokesčių rinkėjai"
+msgstr "Vervigantoj, Sciencistoj, Impostisto"
 
 #: client/cityrepdata.c:452
-#, fuzzy
 msgid "Concise + Rapture, - Disorder"
-msgstr "+ Susižavėjęs, - Netvarka"
+msgstr "Mallonge + Entuziasmo, - Tumulto"
 
 #: client/cityrepdata.c:454 client/plrdlg_common.c:261
 #: client/gui-win32/plrdlg.c:337
 msgid "State"
-msgstr "BÅ«sena"
+msgstr "Stato"
 
 #: client/cityrepdata.c:454
 msgid "Rapture/Peace/Disorder"
-msgstr "Susižavėjęs/Taika/Netvarka"
+msgstr "Entuziasmo/Paco/Tumulto"
 
 #: client/cityrepdata.c:457
 msgid "?Happy workers:H"
-msgstr "?Happy workers:L"
+msgstr "?Happy workers:Fe"
 
 #: client/cityrepdata.c:457
 msgid "Workers: Happy"
-msgstr "Darbininkai: laimingi"
+msgstr "Laboristoj: Feliĉaj"
 
 #: client/cityrepdata.c:459
 msgid "?Content workers:C"
-msgstr "?Content workers:P"
+msgstr "?Content workers:Kn"
 
 #: client/cityrepdata.c:459
 msgid "Workers: Content"
-msgstr "Darbininkai: patenkinti"
+msgstr "Laboristoj: Kontentaj"
 
 #: client/cityrepdata.c:461
 msgid "?Unhappy workers:U"
-msgstr "?Unhappy workers:N"
+msgstr "?Unhappy workers:Mk"
 
 #: client/cityrepdata.c:461
 msgid "Workers: Unhappy"
-msgstr "Darbininkai: nelaimingi"
+msgstr "Laboristoj: Malkontentaj"
 
 #: client/cityrepdata.c:463
 msgid "?Angry workers:A"
-msgstr "?Angry workers:S"
+msgstr "?Angry workers:Kl"
 
 #: client/cityrepdata.c:463
 msgid "Workers: Angry"
-msgstr "Darbininkai: susierzinÄ™"
+msgstr "Laboristoj: Koleraj"
 
 #: client/cityrepdata.c:465 client/gui-xaw/citydlg.c:2401
 #: data/default/units.ruleset:238
 msgid "Workers"
-msgstr "Darbininkai"
+msgstr "Laboristoj"
 
 #: client/cityrepdata.c:466
 msgid "?happy/content/unhappy/angry:H/C/U/A"
-msgstr "?happy/content/unhappy/angry:L/P/N/S"
+msgstr "?happy/content/unhappy/angry:Fe/Kn/Mk/Kl"
 
 #: client/cityrepdata.c:467
 msgid "Workers: Happy, Content, Unhappy, Angry"
-msgstr "Darbininkai: laimingi, patenkinti, nelaimingi, supykÄ™"
+msgstr "Laboristoj: Feliĉaj, Kontentoj, Malkontentoj, Koleraj"
 
 #: client/cityrepdata.c:470 client/cityrepdata.c:472
 msgid "Best"
-msgstr "Geriausi"
+msgstr "La plej bona"
 
 #: client/cityrepdata.c:470
 msgid "attack"
-msgstr "ataka"
+msgstr "atako"
 
 #: client/cityrepdata.c:471
 msgid "Best attacking units"
-msgstr "Geriausiai atakuojantys daliniai"
+msgstr "La plej bona atak-unuo"
 
 #: client/cityrepdata.c:472
 msgid "defense"
-msgstr "gynyba"
+msgstr "defendo"
 
 #: client/cityrepdata.c:473
 msgid "Best defending units"
-msgstr "Geriausiai besiginantys daliniai"
+msgstr "La plej bona defend-unuo"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7086,198 +7343,197 @@ msgstr "Geriausiai besiginantys daliniai"
 #: client/gui-xaw/menu.c:242 client/gui-xaw/repodlgs.c:881
 #: client/gui-xaw/repodlgs.c:1069 data/Freeciv.in:1895 data/helpdata.txt:909
 msgid "Units"
-msgstr "Daliniai"
+msgstr "Unuoj"
 
 #. TRANS: Header "Number of units inside city"
 #: client/cityrepdata.c:476
-#, fuzzy
 msgid "?Present (units):Here"
-msgstr "Esantys daliniai %d"
+msgstr "?Present (units):Ĉi tie"
 
 #: client/cityrepdata.c:477
 msgid "Number of units present"
-msgstr "Esančių dalinių dalinių"
+msgstr "Nombro da ĉeestantaj unuoj"
 
 #. TRANS: Header "Number of units supported by given city"
 #: client/cityrepdata.c:480
-#, fuzzy
 msgid "?Supported (units):Owned"
-msgstr "Palaikomi daliniai:"
+msgstr "?Supported (units):Tenitaj"
 
 #: client/cityrepdata.c:481
 msgid "Number of units supported"
-msgstr "Palaikomų dalinių skaičius"
+msgstr "Nombro da unuoj subtenitaj"
 
 #. TRANS: Header "It will take this many turns before city grows"
 #: client/cityrepdata.c:484
-#, fuzzy
 msgid "?food (population):Grow"
-msgstr "augimo"
+msgstr "?food (population):Plinombriĝo"
 
 #: client/cityrepdata.c:485 client/cityrepdata.c:530
-#, fuzzy
 msgid "?Stock/Target:(Have/Need)"
-msgstr "atsargos"
+msgstr "?Stock/Target:(Havaĵo/Necesaĵo)"
 
 #: client/cityrepdata.c:486
 msgid "Turns until growth/famine"
-msgstr "Ä–jimai iki augimo/bado"
+msgstr "Vicoj antaŭ pliiĝo/malsatmisero"
 
 #: client/cityrepdata.c:488
 msgid "?size [short]:Sz"
-msgstr "?size [short]:Dy"
+msgstr "?size:Gr"
 
 #: client/cityrepdata.c:488
 msgid "Size"
-msgstr "Dydis"
+msgstr "Grando"
 
 #: client/cityrepdata.c:492
 msgid "?city:Name"
-msgstr "?city:Pavadinimas"
+msgstr "?city:Nomo"
 
 #: client/cityrepdata.c:492 client/gui-sdl/cityrep.c:169
 msgid "City Name"
-msgstr "Miesto pavadinimas"
+msgstr "Urbonomo"
 
 #: client/cityrepdata.c:495
 msgid "Surplus"
-msgstr "Perteklius"
+msgstr "Troo"
 
 #: client/cityrepdata.c:495
 msgid "?food/production/trade:F/P/T"
-msgstr "?food/production/trade:M/G/P"
+msgstr "?food/production/trade:Nu/Pr/Ko"
 
 #: client/cityrepdata.c:496
 msgid "Surplus: Food, Production, Trade"
-msgstr "Perteklius: maistas, gamyba, prekyba"
+msgstr "Troo: Nutraĵo, Produktado, Komerco"
 
 #: client/cityrepdata.c:498
 msgid "?Food surplus [short]:+F"
-msgstr "?Food surplus [short]:+M"
+msgstr "?Food surplus [short]:+NU"
 
 #: client/cityrepdata.c:498
 msgid "Surplus: Food"
-msgstr "Perteklius: maistas"
+msgstr "Troo: Nutraĵo"
 
 #: client/cityrepdata.c:500
 msgid "?Production surplus [short]:+P"
-msgstr "?Production surplus [short]:+G"
+msgstr "?Production surplus [short]:+Pr"
 
 #: client/cityrepdata.c:501
 msgid "Surplus: Production"
-msgstr "Perteklius: gamyba"
+msgstr "Troo: Produktado"
 
 #: client/cityrepdata.c:502
 msgid "?Production loss (waste) [short]:-P"
-msgstr "?Production loss (waste) [short]:-G"
+msgstr "?Production loss (waste) [short]:-Pr"
 
 #: client/cityrepdata.c:503
 msgid "Waste"
-msgstr "Atliekos"
+msgstr "Malŝparo"
 
 #: client/cityrepdata.c:504
 msgid "?Trade surplus [short]:+T"
-msgstr "?Trade surplus [short]:+P"
+msgstr "?Trade surplus [short]:+Ko"
 
 #: client/cityrepdata.c:504
 msgid "Surplus: Trade"
-msgstr "Perteklius: prekyba"
+msgstr "Surplus: Komerco"
 
 #: client/cityrepdata.c:506
 msgid "?Trade loss (corruption) [short]:-T"
-msgstr "?Trade loss (corruption) [short]:-P"
+msgstr "?Trade perdita (subaĉeto) [mallonge]:-Ko"
 
 #: client/cityrepdata.c:507
 msgid "Corruption"
-msgstr "Korupcija"
+msgstr "Subaĉetado"
 
 #: client/cityrepdata.c:509 client/gui-gtk-2.0/repodlgs.c:654
 #: client/gui-sdl/mapctrl.c:1400 client/gui-win32/repodlgs.c:334
 #: client/gui-xaw/menu.c:222 client/gui-xaw/repodlgs.c:644
 #: client/gui-xaw/repodlgs.c:773 data/Freeciv.in:1819
 msgid "Economy"
-msgstr "Ekonomika"
+msgstr "Ekonomio"
 
 #: client/cityrepdata.c:509
+#, fuzzy
 msgid "?gold/luxury/science:G/L/S"
-msgstr "?gold/luxury/science:A/P/M"
+msgstr "?gold/lÅ­ury/science:Au/Lu/Sc"
 
 #: client/cityrepdata.c:510
+#, fuzzy
 msgid "Economy: Gold, Luxuries, Science"
-msgstr "Ekonomika: Auksas, Prabanga, Mokslas"
+msgstr "Ekonomio: Oro, Lukso, Scienco"
 
 #: client/cityrepdata.c:512
 msgid "?Gold:G"
-msgstr "?Gold:A"
+msgstr "?Gold:Au"
 
 #: client/cityrepdata.c:512
 msgid "Economy: Gold"
-msgstr "Ekonomika: Auksas"
+msgstr "Ekonomio: Oro"
 
 #: client/cityrepdata.c:514
+#, fuzzy
 msgid "?Luxury:L"
-msgstr "?Luxury:P"
+msgstr "?LÅ­ury:Lu"
 
 #: client/cityrepdata.c:514
+#, fuzzy
 msgid "Economy: Luxury"
-msgstr "Ekonomika: Prabanga"
+msgstr "Ekonomio: Lukso"
 
 #: client/cityrepdata.c:516
 msgid "?Science:S"
-msgstr "?Science:M"
+msgstr "?Science:Sc"
 
 #: client/cityrepdata.c:516
 msgid "Economy: Science"
-msgstr "Ekonomika: Mokslas"
+msgstr "Ekonomio: Scienco"
 
 #: client/cityrepdata.c:518
-#, fuzzy
 msgid "?number_trade_routes:n"
-msgstr "s"
+msgstr "?number_trade_routes:n"
 
 #: client/cityrepdata.c:518
-#, fuzzy
 msgid "?number_trade_routes:R"
-msgstr "s"
+msgstr "?number_trade_routes:Kv"
 
 #: client/cityrepdata.c:519
 msgid "Number of Trade Routes"
-msgstr "Prekybos maršrutų skaičius"
+msgstr "Nombro da komercaj kursoj"
 
 #: client/cityrepdata.c:521
 msgid "?pollution [short]:Pol"
-msgstr "?pollution [short]:Tar"
+msgstr "?pollution [short]:Pol"
 
 #: client/cityrepdata.c:523
 msgid "?cma:Governor"
-msgstr "?cma:Valdytojas"
+msgstr "?cma:Reganto"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
-msgstr "Piliečių valdytojas"
+msgstr "Urba regado"
 
 #: client/cityrepdata.c:526
 msgid "Turns/Buy"
-msgstr "Ä–jimai/Pirkti"
+msgstr "Vicoj/Aĉeti"
 
 #: client/cityrepdata.c:529 client/cityrepdata.c:531
 msgid "Currently Building"
-msgstr "Dabar statoma"
+msgstr "Konstruata konstruaĵo"
 
 #: client/cityrepdata.c:575
 msgid "?specialist:S"
 msgstr "?specialist:S"
 
 #: client/cityrepdata.c:578
+#, fuzzy
 msgid "Specialists"
-msgstr "Specialistai"
+msgstr "Specialistoj: %s"
 
 #: client/civclient.c:239
 msgid "  -a, --autoconnect\tSkip connect dialog\n"
-msgstr "  -a, --autoconnect\tPraleisti prisijungimo dialogÄ…\n"
+msgstr ""
 
 #: client/civclient.c:249
 msgid "  -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
@@ -7294,8 +7550,6 @@ msgstr ""
 #: client/civclient.c:255
 msgid "  -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
 msgstr ""
-"  -p, --port PRIEVADAS\tPrisijungti prie serverio prievado PRIEVADAS "
-"(paprastai su -a)\n"
 
 #: client/civclient.c:257
 #, c-format
@@ -7307,9 +7561,8 @@ msgid "  -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
 msgstr ""
 
 #: client/civclient.c:262
-#, fuzzy
 msgid "  -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
-msgstr "  -p, --port PRIEVADAS\tPrisijungti prie serverio prievado PRIEVADAS\n"
+msgstr ""
 
 #: client/civclient.c:264
 msgid "  -S, --Sound FILE\tRead sound tags from FILE\n"
@@ -7328,18 +7581,18 @@ msgstr ""
 
 #. TRANS: No full stop after the URL, could cause confusion.
 #: client/civclient.c:273
-#, fuzzy, c-format
+#, c-format
 msgid "Report bugs at %s\n"
-msgstr "Pranešti apie klaidas į %s.\n"
+msgstr "Bonvolu raporti pri la eraro al %s\n"
 
 #: client/civclient.c:297
 #, c-format
 msgid "Invalid port \"%s\" specified with --port option.\n"
-msgstr "Su --port parametru nurodytas netinkamas prievadas „%s“.\n"
+msgstr ""
 
 #: client/civclient.c:299 client/civclient.c:314
 msgid "Try using --help.\n"
-msgstr "Bandykite --help.\n"
+msgstr ""
 
 #: client/civclient.c:312
 #, c-format
@@ -7349,11 +7602,11 @@ msgstr ""
 #: client/civclient.c:325
 #, c-format
 msgid "Unrecognized option: \"%s\"\n"
-msgstr "Neatpažintas parametras: „%s“\n"
+msgstr "Nekonata opcio: \"%s\"\n"
 
 #: client/civclient.c:539
 msgid "Game started."
-msgstr "Žaidimas paleistas."
+msgstr "La ludo komencas."
 
 #: client/civclient.c:577
 msgid "There was an error while auto connecting; aborting."
@@ -7362,137 +7615,141 @@ msgstr ""
 #: client/climisc.c:176
 #, c-format
 msgid "Changing production of every %s into %s."
-msgstr ""
+msgstr "Ŝanĝado de produktado de ĉiu %s en %s."
 
 #: client/climisc.c:214
 msgid "?embassy:Both"
-msgstr "?embassy:Abu"
+msgstr ""
 
 #: client/climisc.c:216
+#, fuzzy
 msgid "?embassy:Yes"
-msgstr "?embassy:Taip"
+msgstr "Ambasado"
 
 #: client/climisc.c:219
 msgid "?embassy:With Us"
-msgstr "?embassy:Su mumis"
+msgstr ""
 
 #: client/climisc.c:222
 msgid "?embassy:Contact"
-msgstr "?embassy:Kontaktas"
+msgstr ""
 
 #: client/climisc.c:224
 msgid "?embassy:No Contact"
-msgstr "?embassy:NÄ—ra kontakto"
+msgstr ""
 
 #: client/climisc.c:236
 msgid "?vision:Both"
-msgstr "?vision:Abiems"
+msgstr "?vision:AmbaÅ­"
 
 #: client/climisc.c:238
 msgid "?vision:To Them"
-msgstr "?vision:Jiems"
+msgstr "?vision:al ili"
 
 #: client/climisc.c:241
 msgid "?vision:To Us"
-msgstr "?vision:Mums"
+msgstr "?vision:al ni"
 
 #: client/climisc.c:257 client/climisc.c:264
 #, c-format
 msgid "The %s give %s"
-msgstr "%s duoda %s"
+msgstr "La %s donas %sn"
 
 #: client/climisc.c:268
 #, c-format
 msgid "The %s give unknown city."
-msgstr "%s duoda nežinomą miestą."
+msgstr "La %s donas nekonatan urbon."
 
 #: client/climisc.c:273
 #, c-format
 msgid "The %s give %d gold"
-msgstr "%s duoda %d aukso"
+msgstr "La %s donas %d orajn monerojn"
 
 #: client/climisc.c:278
 #, c-format
 msgid "The %s give their worldmap"
-msgstr "%s davė savo pasaulio žemėlapį"
+msgstr "La %s donas ilian mapon de la mondo"
 
 #: client/climisc.c:282
 #, c-format
 msgid "The %s give their seamap"
-msgstr "%s davė savo jūros žemėlapį"
+msgstr "La %s donas ilian mar-mapon"
 
 #: client/climisc.c:286
 msgid "The parties agree on a cease-fire"
-msgstr "Šalys susitaria dėl trumpų paliaubų"
+msgstr "La partioj interkonsentas pri pafĉesigo"
 
 #: client/climisc.c:289
 msgid "The parties agree on a peace"
-msgstr "Å alys susitaria dÄ—l taikos"
+msgstr "La partioj interkonsentas pri paco"
 
 #: client/climisc.c:292
 msgid "The parties create an alliance"
-msgstr "Å alys susitaria dÄ—l sÄ…jungos"
+msgstr "La partioj kreas aliancon"
 
 #: client/climisc.c:295
 #, c-format
 msgid "The %s give shared vision"
-msgstr "%s duoda mums bendrÄ… regÄ—jimo laukÄ…"
+msgstr "La %s donas komunan vidon"
 
 #: client/climisc.c:299
-#, c-format
+#, fuzzy, c-format
 msgid "The %s give an embassy"
-msgstr "%s duoda ambasadÄ…"
+msgstr "La %s donas %sn"
 
 #: client/climisc.c:902
 msgid "Popup Request"
-msgstr ""
+msgstr "Åœpruc-mendado"
 
 #: client/climisc.c:932
 msgid "Exporting output window to civgame.log ..."
-msgstr "Įrašome išvesties langą į civgame.log ..."
+msgstr "Eksportante la fenestron de la mesaĝoj en civgame.log ..."
 
 #: client/climisc.c:936
 msgid "Export complete."
-msgstr "Eksportavimas baigtas."
+msgstr "La eksportado kompletiĝis."
 
 #: client/climisc.c:938
 msgid "Export failed, couldn't write to file."
-msgstr "Įrašymas nepavyko, negalime rašyti į failą."
+msgstr "La eksportado malsukcesis, ĉar estas neeble skribi en la dosiero."
 
 #: client/climisc.c:1038
 #, c-format
 msgid "You don't buy %s in %s!"
-msgstr "JÅ«s neperkate %s mieste %s!"
+msgstr "Vi ne aĉetis %sn en %s!"
 
 #: client/climisc.c:1056
 #, c-format
 msgid "%s costs %d gold and you only have %d gold."
-msgstr "%s kainuoja %d aukso, bet  jūs turite tik %d aukso."
+msgstr "%s kostas %d orajn monerojn kaj vi havas nur %d orajn monerojn."
 
 #: client/clinet.c:143
 msgid "Lost connection to server!"
-msgstr "Prarastas ryšys su serveriu!"
+msgstr "La konekto kun la servilo estis perdita!"
 
 #: client/clinet.c:186
 msgid "Failed looking up host."
-msgstr ""
+msgstr "La serĉo pri gastiga komputilo malsukcesis."
 
 #: client/clinet.c:210
 msgid "Connection in progress."
-msgstr "Jungiamasi."
+msgstr "La konekto estas plenumanta."
 
 #: client/clinet.c:284
 msgid "Disconnected from server."
-msgstr "Atsijungta nuo serverio."
+msgstr "Malkonektita de la servilo."
 
 #: client/clinet.c:469
 #, c-format
 msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
 msgstr ""
+"Estas neeble konektiĝi al la servilo \"%s\" ĉe la pordo %d kiel \"%s\" post %"
+"d provo(j)"
 
 #: client/clinet.c:484 client/clinet.c:486
 msgid "Connection to server refused. Please start the server."
-msgstr "Neįmanoma prisijungti prie serverio. Prašome paleisti serverį."
+msgstr ""
+"La konekto kun la servilo estis rifuzita. Bonvolu startigi la servilon."
 
 #: client/clinet.c:495 client/clinet.c:523
 #, c-format
@@ -7500,6 +7757,8 @@ msgid ""
 "Error contacting server \"%s\" at port %d as \"%s\":\n"
 " %s\n"
 msgstr ""
+"Eraro dum konektado kun la servilo \"%s\" ĉe la pordo %d kiel \"%s\":\n"
+" %s\n"
 
 #: client/clinet.c:514
 #, c-format
@@ -7507,590 +7766,602 @@ msgid ""
 "Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
 "%d times"
 msgstr ""
+"Aŭtomata konektado al la servilo \"%s\" ĉe la pordo %d kiel \"%s\" je ĉiu %f "
+"sekundoj por %d fojoj"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
+#, fuzzy
 msgid "novice"
-msgstr "pradedantis"
+msgstr "Novico"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
+#, fuzzy
 msgid "easy"
-msgstr "lengvas"
+msgstr "Facila"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
+#, fuzzy
 msgid "normal"
-msgstr "vidutinis"
+msgstr "Normala"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
+#, fuzzy
 msgid "hard"
-msgstr "sunkus"
+msgstr "Malfacila"
 
 #: client/connectdlg_common.c:83
+#, fuzzy
 msgid "experimental"
-msgstr "eksperimentinis"
+msgstr "Eksperimenta"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
-msgstr "Paleidžiamas serveris..."
+msgstr "Preparado de la servilo..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
-msgstr "Negaliu paleisti serverio."
+msgstr "Estas neeble startigi la servilon."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
-msgstr "Jūs turite paleisti vieną rankiniu būdu. Apgailestaujame..."
+msgstr "Vi devos mane startigi ĝin. Ni bedaŭras..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
-msgstr "Negalima prisijungti prie serverio."
+msgstr "Estas neeble konektiĝi al la servilo."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
-msgstr "Mes tikriausiai iš čia negalime jo paleisti."
+msgstr "Eble ni ne povas startigi ĝin de ĉi tie."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
-msgstr ""
+msgstr "Ni mastrumas la servilo (la nivelo de komand-rajto estas hack)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
-msgstr "Mes negalime kontroliuoti serverio, bandome jį išjungti."
+msgstr "Ni ne povas mastrumi la servilon, do ni provas haltigi ĝin."
 
 #: client/control.c:1104
 msgid "Only transporter units can be unloaded."
-msgstr "Išlaipinti galima tik iš transporto dalinių."
+msgstr "Nur la kargo-ŝipoj povas esti malŝargitaj."
 
 #: client/control.c:1353
 msgid "Only settler units can be put into auto mode."
-msgstr "Tik naujakuriai gali būti įvesti į auto būseną."
+msgstr "Nur la farmistoj povas esti aÅ­tomate mastrumitaj."
 
 #: client/control.c:1444
 msgid "Only nuclear units can do this."
-msgstr "Tik branduoliniai daliniai gali tai padaryti."
+msgstr "Nur la atomaj unuoj povas fari tion."
 
 #: client/control.c:1473
 msgid "Only paratrooper units can do this."
-msgstr "Tik parašiutininkai tai gali."
+msgstr "Nur la paraŝutistoj povas fari tion."
 
 #: client/control.c:1921
 msgid "Too far for this unit."
-msgstr "Per toli Å¡iam daliniui."
+msgstr "Tro malproksima por ĉi tiu unuo."
 
 #: client/control.c:2131 client/control.c:2161 client/control.c:2177
 msgid "Didn't find a route to the destination!"
-msgstr "Nerastas kelias iki tikslo."
+msgstr "Estas neeble trovi irvojon por la alvenpunkto!"
 
 #: client/control.c:2221
 msgid "Oh my! You seem to have no capital!"
-msgstr "O ne! Atrodo, kad neturi sostinÄ—s!"
+msgstr "Oh ve! Ŝajnas ke via nacio ne havas ĉefurbon!"
 
 #: client/helpdata.c:125
 msgid "Terrain     Road   Irrigation     Mining         Transform\n"
-msgstr "Reljefas   Kelias  DrÄ—k.sist.   Kasyba     Transformavimas\n"
+msgstr "Grundo      Vojo   Irigacio       Minejo         Transformado\n"
 
 #: client/helpdata.c:150
 msgid "(Railroads and fortresses require 3 turns, regardless of terrain.)"
-msgstr ""
-"(Geležinkeliams ir tvirtovėms reikia 3 ėjimų, neatsižvelgiant į reljefą.)"
+msgstr "(Fervojoj kaj fortresoj bezonas 3 vicojn, sendepende de la grundo)."
 
 #: client/helpdata.c:169
-#, c-format
+#, fuzzy, c-format
 msgid "Requires the %s technology.\n"
-msgstr "Reikalauja %s technologijos.\n"
+msgstr ""
+"Necesas la %s teĥnologio.\n"
+"\n"
 
 #: client/helpdata.c:173
-#, c-format
+#, fuzzy, c-format
 msgid "Requires the %s government.\n"
-msgstr "Reikalauja %s vyriausybÄ—s.\n"
+msgstr ""
+"Necesas la %s regsistemo.\n"
+"\n"
 
 #: client/helpdata.c:177
-#, c-format
+#, fuzzy, c-format
 msgid "Requires the %s building.\n"
-msgstr "Reikalauja %s pastato.\n"
+msgstr ""
+"Necesas la %s konstruaĵo.\n"
+"\n"
 
 #: client/helpdata.c:181
-#, c-format
+#, fuzzy, c-format
 msgid "Requires the %s terrain special.\n"
-msgstr "Reikalauja specialaus reljefo %s.\n"
+msgstr ""
+"Necesas la speciala %s grundo.\n"
+"\n"
 
 #: client/helpdata.c:185
-#, c-format
+#, fuzzy, c-format
 msgid "Requires the %s terrain.\n"
-msgstr "Reikalauja %s reljefo.\n"
+msgstr ""
+"Necesas la %s grundo.\n"
+"\n"
 
 #: client/helpdata.c:189
-#, c-format
+#, fuzzy, c-format
 msgid "Requires the %s nation.\n"
-msgstr "Reikalauja %s tautos.\n"
+msgstr ""
+"Necesas la %s nacio.\n"
+"\n"
 
 #: client/helpdata.c:193 client/helpdata.c:197 client/helpdata.c:201
-#, c-format
+#, fuzzy, c-format
 msgid "Only applies to %s units.\n"
-msgstr "Tinka tik %s daliniams.\n"
+msgstr ""
+"Oni aplikas nur al %s unuoj.\n"
+"\n"
 
 #: client/helpdata.c:205 client/helpdata.c:209
-#, c-format
+#, fuzzy, c-format
 msgid "Applies only to %s.\n"
-msgstr "Tinka tik %s.\n"
+msgstr ""
+"Oni aplikas nur al %s.\n"
+"\n"
 
 #: client/helpdata.c:213
-#, c-format
+#, fuzzy, c-format
 msgid "Requires a minimum size of %d.\n"
-msgstr "Reikalauja minimalaus dydžio %d.\n"
+msgstr ""
+"Necesas minimuma grado je %d.\n"
+"\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
-msgstr "Leidžia %s."
+msgstr "Tio ebligas %sn."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
-msgstr "Leidžia %s (kartu su %s)."
+msgstr "Tio ebligas %sn (kun %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
-msgstr " UpÄ—s"
+msgstr " Riveroj"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
-msgstr "Apgailestaujame, nÄ—ra pagalbos temai%s.\n"
+msgstr ""
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
 "This page was auto-generated.\n"
 "\n"
 msgstr ""
-"Apgailestaujame, nÄ—ra pagalbos temai %s.\n"
-"Šis puslapis buvo automatiškai sugeneruotas.\n"
-"\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
+#, fuzzy
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr ""
-"Reikalauja: Nieko.\n"
+"Necesas la %s konstruaĵo.\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
-msgstr "* %s atradimas padarys %s nebenaudingÄ….\n"
+msgstr ""
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
-msgstr "* Leidžia visiems žaidėjams su %s žiniomis statyti %s dalinius.\n"
+msgstr ""
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
-msgstr "* Leidžia %s (kartu su %s).\n"
+msgstr ""
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
-msgstr "* Leidiža %s.\n"
+msgstr ""
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
-msgstr "* Gali būti pastatytas tik, kai mieste yra %s.\n"
+msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
-msgstr "* Gali būti pastatytas tik, kai vyriausybė yra %s.\n"
+msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
-msgstr "* Negali būti statomas miestuose.\n"
+msgstr ""
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
-msgstr "* Niekada neturi gimtojo miesto.\n"
+msgstr ""
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
-msgstr "* Prarasdami šį dalinį Jūs pralaimėsite žaidimą!\n"
+msgstr ""
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
-msgstr "*Kiekvienas žaidėjas gali turėti tik vieną šio tipo dalinį.\n"
+msgstr ""
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
-msgstr "* Reikalauja %d gyventojų, kad pastatytum.\n"
+msgstr ""
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
-msgstr[0] "* Gali nešti ir papildyti degalais %d aviacijos dalinį.\n"
-msgstr[1] "* Gali nešti ir papildyti degalais %d aviacijos dalinius.\n"
-msgstr[2] "* Gali nešti ir papildyti degalais %d aviacijos dalinių.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: client/helpdata.c:812
-#, fuzzy, c-format
+#: client/helpdata.c:816
+#, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
-msgstr[0] "* Gali nešti ir papildyti degalais %d aviacijos dalinį iš klasių:\n"
+msgstr[0] ""
 msgstr[1] ""
-"* Gali nešti ir papildyti degalais %d aviacijos dalinius iš klasių:\n"
-msgstr[2] ""
-"* Gali nešti ir papildyti degalais %d aviacijos dalinių iš klasių:\n"
 
-#: client/helpdata.c:817
-#, fuzzy, c-format
+#: client/helpdata.c:821
+#, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
-msgstr[0] "* Gali nešti ir papildyti degalais %d aviacijos dalinį iš klasių:\n"
+msgstr[0] ""
 msgstr[1] ""
-"* Gali nešti ir papildyti degalais %d aviacijos dalinius iš klasių:\n"
-msgstr[2] ""
-"* Gali nešti ir papildyti degalais %d aviacijos dalinių iš klasių:\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
-msgstr "* Gali padÄ—ti statyti stebuklus (prideda %d gamybos).\n"
+msgstr ""
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
-msgstr "* Negali būti išformuotas.\n"
+msgstr ""
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
-msgstr "* Gali būti išformuotas mieste, atgaunant 50%% gamybos kainos.\n"
+msgstr ""
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
-msgstr "* Gali statyti naujus miestus.\n"
+msgstr ""
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
-msgstr "* Gali tiesti kelius ir geležinkelius.\n"
+msgstr ""
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
-msgstr "* Gali statyti kasyklas.\n"
+msgstr ""
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
-msgstr "* Gali statyti drÄ—kinimo sistemas.\n"
+msgstr ""
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
-msgstr "* Gali statyti dirbamąsias žemes.\n"
+msgstr ""
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
-msgstr "* Gali statyti dirbamąsias žemes (jei %s yra žinomas).\n"
+msgstr ""
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
-"* Gali statyti dirbamąsias žemes (jei bent 1 iš šių yra žinomas: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
-msgstr "* Gali statyti fortus.\n"
+msgstr ""
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
-msgstr "* Gali statyti fortus (jei %s yra žinomas).\n"
+msgstr ""
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
-msgstr "* Gali statyti fortus (jei bent 1 iš šių yra žinomas: %s).\n"
+msgstr ""
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
-msgstr "* Iš laukelių gali išvalyti taršą.\n"
+msgstr ""
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
-msgstr "* Iš laukelių gali išvalyti radioaktyviąsias dulkes.\n"
+msgstr ""
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
-msgstr "* Gali transformuoti laukelius.\n"
+msgstr ""
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
+#, fuzzy
 msgid "* Can build airbases.\n"
-msgstr "* Gali statyti oro bazes.\n"
+msgstr "Estas neeble fondi urbon"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
-msgstr "* galė plėšti ir taip sunakinti laukelių infrastruktūrą.\n"
+msgstr ""
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
-"* Gali atlikti diplomatinius veiksmus ir turi specialių šnipinųjimo "
-"gebėjimų.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
-msgstr "* Gali atlikti diplomatinius veiksmus.\n"
+msgstr ""
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
-msgstr "* Niekada nepralaimės diplomatas prieš diplomatą kovos.\n"
+msgstr ""
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
-msgstr "* Negali būti papirktas.\n"
+msgstr ""
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
-msgstr "* Gali pulti priešo oro dalinius.\n"
+msgstr ""
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
-msgstr "* Yra nematomas išskyrus kai būna šalia priešo dalinio arba miesto.\n"
+msgstr ""
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
-"* Gali atakuoti tik jūrų dalinius (negali atakuoti sausumos dalinių).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr ""
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
-msgstr "* Gali būti išmesti parašiutu iš draugiško miesto (Atstumas: %d).\n"
+msgstr ""
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr ""
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr ""
 
-#: client/helpdata.c:953
-#, fuzzy
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
-msgstr "  * Sunaudojamas įvykdžius ataką.\n"
+msgstr ""
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
-msgstr "* Atakos įvykdymas reiškia šio dalinio ėjimo baigtį.\n"
+msgstr ""
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
-msgstr "* Šio dalinio ataka sukelia branduolinį sprogimą!\n"
+msgstr ""
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
-msgstr "Puolamoji galia padvigubÄ—ja puolant miestus.\n"
+msgstr ""
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
-msgstr "* Ignoruoja miesto sienų efektus.\n"
+msgstr ""
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr ""
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
-msgstr "* Ignoruoja valdymo zonas.\n"
+msgstr ""
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
-msgstr "* Niekada netaps veteranu.\n"
+msgstr ""
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
-msgstr "* Kovodamas arba treniruodamasis gali tapti veteranu.\n"
+msgstr ""
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
 "at sea.\n"
 msgstr ""
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
-msgstr "* %s atradimas sumažina riziką iki 25%%.\n"
+msgstr ""
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
-msgstr "* %s sumažina riziką iki 12%%.\n"
+msgstr ""
 
 #. TRANS: List of possible unit types has this between
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
-msgstr " arba "
+msgstr " aÅ­ "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
-msgstr[0] "* Dalinys turi būti mieste arba ant %s po %d ėjimo.\n"
-msgstr[1] "* Dalinys turi būti mieste arba ant %s po %d ėjimų.\n"
-msgstr[2] "* Dalinys turi būti mieste arba ant %s po %d ėjimų.\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
-msgstr "Jei dabar pradėtume su %s, mums reikėtų %d lempučių."
+msgstr "Se ni deziras komenci kun %s, al ni necesas %d ampoloj."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
 "will require %d bulbs to complete."
 msgstr ""
+"Por atingi %sn, ni bezonas akiri %d aliajn teĥnologioj antaŭe. La tuta "
+"projekto bezonas %d ampolojn por plenumi."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
-msgstr "Jūs negalite išrasti šios technologijos."
+msgstr "Vi ne povas studi tiun ĉi teĥnologion."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
-" Šis skaičius gali kisti priklausomai nuo to, ką kiti žaidėjai išras.\n"
+" Tiu ĉi numero povas varii laŭ tio kion la aliaj ludantoj estas "
+"pristudantaj.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
-"* Pirmasis žaidėjas, atradęs %s, iš karto gauna papildomą technologiją.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
-msgstr "* Sumažina riziką iki 25%%.\n"
+msgstr ""
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
-msgstr "* Sumažina riziką iki 12%%.\n"
+msgstr ""
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
-msgstr "* Padidina gyventojų sukuriamą taršą.\n"
+msgstr ""
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
-msgstr "* %s gali statyti kelius upių laukeliuose.\n"
+msgstr ""
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
-msgstr "* Leidžia %s statyti fortus.\n"
+msgstr ""
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
-msgstr "* Leidžia %s statyti oro bazes.\n"
+msgstr ""
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
-msgstr "* Leidžia %s patobulinti kelius į geležinkelius.\n"
+msgstr ""
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
-msgstr "* Leidžia %s patobulinti drėkinimą į dirbamąją žemę.\n"
+msgstr ""
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
-msgstr "* Toks reljefas negali būti užterštas."
+msgstr ""
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
-msgstr "* Ant tokio reljefo negalite statyti miestų."
+msgstr ""
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
-msgstr "* Å io reljefo pakrantÄ— nesaugi."
+msgstr ""
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
-msgstr "* Å is reljefas nesaugus keliauti daliniams."
+msgstr ""
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
-msgstr "Sausumos daliniai negali keliauti vandenynais."
+msgstr ""
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
-msgstr "SavybÄ—s:\n"
+msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
-msgstr "?outputlist: Nieko "
+msgstr "?outputlist: Nenio "
 
-#: client/helpdata.c:1417
-#, fuzzy, c-format
+#: client/helpdata.c:1421
+#, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
 "become unhappy.\n"
@@ -8098,16 +8369,9 @@ msgid_plural ""
 "* Military units away from home and field units will cause %d citizens to "
 "become unhappy.\n"
 msgstr[0] ""
-"* Kariniai daliniai toli nuo namų ir lauko daliniai %d gyventojus padarys "
-"nelaimingÄ….\n"
 msgstr[1] ""
-"* Kariniai daliniai toli nuo namų ir lauko daliniai %d gyventojus padarys "
-"nelaimingÄ….\n"
-msgstr[2] ""
-"* Kariniai daliniai toli nuo namų ir lauko daliniai %d gyventojus padarys "
-"nelaimingÄ….\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8115,49 +8379,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
-#, fuzzy, c-format
+#: client/helpdata.c:1449
+#, c-format
 msgid "* You pay no %s upkeep for your units.\n"
-msgstr "* Fanatikams nereikia išlaikymo.\n"
+msgstr ""
 
-#: client/helpdata.c:1449
-#, fuzzy
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
-msgstr "* Fanatikams nereikia išlaikymo.\n"
+msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
-msgstr "* Pilietinio karo tikimybÄ— yra %d%%, jei prarasi savo sostinÄ™.\n"
+msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8165,25 +8428,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
-"Maksimali norma, kuriÄ… galite nustatyti mokslui, auksui ir prabangai yra %d%"
-"%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
-msgstr "Turi neribotus mokslo/aukso/prabangos tarifus.\n"
+msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8193,73 +8454,69 @@ msgid_plural ""
 "force %d unhappy citizens to become content.\n"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
-"* Jūsų miestai gali augti švęsdami.  Miestai turi būti mažiausiai %d dydžio, "
-"kad jie galėtų augti šiuo būdu.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
-msgstr "* Jūsų daliniai negali būti papirkti.\n"
+msgstr ""
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
-msgstr "* Jūsų miestai negali būti pakurstyti.\n"
+msgstr ""
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
-msgstr "* Turi senatÄ…, kuris gali sutrukdyti karo paskelbimui.\n"
+msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
-msgstr "* Leidžia partizanus, kai miestus užima priešai.\n"
+msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
-msgstr "* Fanatikams nereikia išlaikymo.\n"
+msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
-msgstr "* Neturi nelaimingų piliečių.\n"
+msgstr ""
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
-msgstr "* Veteranų daliniai %s.\n"
+msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
-msgstr "* Daliniai veteranai.\n"
+msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8267,7 +8524,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8275,112 +8532,112 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
-msgstr "* %s Å¡vaistymas greitai didÄ—s didÄ—jant atstumui nuo sostinÄ—s.\n"
+msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
-msgstr "* %s Å¡vaistymas didÄ—s didÄ—jant atstumui nuo sostinÄ—s.\n"
+msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
-msgstr "* %s Å¡vaistymas lÄ—tai didÄ—s didÄ—jant atstumui nuo sostinÄ—s.\n"
+msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
-msgstr "* Leidžia tau statyti %s.\n"
+msgstr ""
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
-msgstr ", "
+msgstr "?blistmore:, "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
-msgstr "%s%d nepatenkintų"
+msgstr "%s%d malkontenta(j)"
 
 #: client/mapctrl_common.c:382
 #, c-format
 msgid "You don't know how to build %s!"
-msgstr "Jūs nežinote, kaip statyti %s!"
+msgstr "Vi ne scias kiel konstrui %sn!"
 
 #: client/mapctrl_common.c:392
 #, c-format
 msgid "Copy %s to clipboard."
-msgstr "Nukopijuoti %s į iškarpinę."
+msgstr "Kopiu %sn en la poŝon."
 
 #: client/mapctrl_common.c:408
 msgid "Clipboard is empty."
-msgstr "Iškarpinė yra tuščia."
+msgstr "La poŝo estas malplena."
 
 #: client/options.c:98
 msgid "Graphics"
-msgstr "Grafika"
+msgstr "Grafikaĵoj"
 
 #: client/options.c:99
 msgid "Overview"
-msgstr "Apžvalga"
+msgstr "Priskribo"
 
 #: client/options.c:100
 msgid "Sound"
-msgstr "Garsas"
+msgstr "AÅ­do"
 
 #: client/options.c:101
 msgid "Interface"
-msgstr "SÄ…saja"
+msgstr "Interfaco"
 
 #: client/options.c:102
 msgid "Network"
-msgstr "Tinklas"
+msgstr "Reto"
 
 #: client/options.c:107
 msgid "Login name"
-msgstr "Prisijungimo vardas"
+msgstr "Nomo"
 
 #: client/options.c:108
 msgid ""
@@ -8390,7 +8647,7 @@ msgstr ""
 
 #: client/options.c:113
 msgid "Server"
-msgstr "Serveris"
+msgstr "Servilo"
 
 #: client/options.c:114
 msgid ""
@@ -8400,7 +8657,7 @@ msgstr ""
 
 #: client/options.c:119
 msgid "Server port"
-msgstr "Serverio prievadas"
+msgstr "Pordo de la servilo"
 
 #: client/options.c:120
 msgid ""
@@ -8410,7 +8667,7 @@ msgstr ""
 
 #: client/options.c:125 client/gui-win32/connectdlg.c:912 data/Freeciv.in:107
 msgid "Metaserver"
-msgstr "Metaserveris"
+msgstr "Metaservilo"
 
 #: client/options.c:126
 msgid ""
@@ -8421,7 +8678,7 @@ msgstr ""
 
 #: client/options.c:132
 msgid "Soundset"
-msgstr "Garsų rinkinys"
+msgstr "Sonaĵoj"
 
 #: client/options.c:133
 msgid ""
@@ -8431,7 +8688,7 @@ msgstr ""
 
 #: client/options.c:138
 msgid "Sound plugin"
-msgstr "Garso įskiepis"
+msgstr "Sona kromaĵo"
 
 #: client/options.c:139
 msgid ""
@@ -8442,7 +8699,7 @@ msgstr ""
 
 #: client/options.c:144 client/gui-sdl/gui_main.c:162
 msgid "Theme"
-msgstr "Tema"
+msgstr "Temo"
 
 #: client/options.c:145
 msgid "By changing this option you change the active theme."
@@ -8450,7 +8707,7 @@ msgstr ""
 
 #: client/options.c:148
 msgid "Tileset"
-msgstr "Laukelių rinkinys"
+msgstr "Grafikaĵo"
 
 #: client/options.c:149
 msgid ""
@@ -8460,7 +8717,7 @@ msgstr ""
 
 #: client/options.c:156
 msgid "Solid unit background color"
-msgstr ""
+msgstr "Solida fona koloro por la unuoj"
 
 #: client/options.c:157
 msgid ""
@@ -8470,7 +8727,7 @@ msgstr ""
 
 #: client/options.c:161 client/gui-sdl/optiondlg.c:960
 msgid "Sound bell at new turn"
-msgstr "Kiekvieno ėjimo pradžią pranešti garsu."
+msgstr "Sonu per bip-signalo la novan vicon"
 
 #: client/options.c:162
 msgid ""
@@ -8481,7 +8738,7 @@ msgstr ""
 
 #: client/options.c:168
 msgid "Unit movement animation time (milliseconds)"
-msgstr ""
+msgstr "DaÅ­ro de la animacio por la movoj de la unuoj (milisekundoj)"
 
 #: client/options.c:169
 msgid ""
@@ -8491,7 +8748,7 @@ msgstr ""
 
 #: client/options.c:174
 msgid "Mapview recentering time (milliseconds)"
-msgstr ""
+msgstr "Tempo por ree centrigo de la mapo (milisekundoj)"
 
 #: client/options.c:175
 msgid ""
@@ -8502,7 +8759,7 @@ msgstr ""
 
 #: client/options.c:180 client/gui-sdl/optiondlg.c:1014
 msgid "Show combat animation"
-msgstr "Rodyti mūšio animaciją"
+msgstr "Vidigu animacion de la batalado"
 
 #: client/options.c:181
 msgid ""
@@ -8512,7 +8769,7 @@ msgstr ""
 
 #: client/options.c:184
 msgid "Draw the citybar"
-msgstr ""
+msgstr "Desegnu urbostangon"
 
 #: client/options.c:185
 msgid ""
@@ -8523,7 +8780,7 @@ msgstr ""
 
 #: client/options.c:191
 msgid "Show icons in the technology tree"
-msgstr "Rodo ikonas technologijų medyje"
+msgstr "Vidigu ikonojn en la teĥnologia arbumo"
 
 #: client/options.c:192
 msgid ""
@@ -8533,7 +8790,7 @@ msgstr ""
 
 #: client/options.c:197
 msgid "Draw shield graphics for units"
-msgstr ""
+msgstr "Desegnu ŝildeton por unuoj"
 
 #: client/options.c:198
 msgid ""
@@ -8543,7 +8800,7 @@ msgstr ""
 
 #: client/options.c:202
 msgid "Manual Turn Done in AI Mode"
-msgstr ""
+msgstr "Mana vico-fino en IA-moduso"
 
 #: client/options.c:203
 msgid ""
@@ -8553,7 +8810,7 @@ msgstr ""
 
 #: client/options.c:207 client/gui-sdl/optiondlg.c:1121
 msgid "Auto Center on Units"
-msgstr ""
+msgstr "AÅ­tomata centrigo de la unuoj "
 
 #: client/options.c:208
 msgid ""
@@ -8563,7 +8820,7 @@ msgstr ""
 
 #: client/options.c:211 client/gui-sdl/optiondlg.c:1147
 msgid "Auto Center on Combat"
-msgstr "Automatiškai sucentruoti vykstant kovai"
+msgstr "AÅ­tomata centrigo de la bataloj"
 
 #: client/options.c:212
 msgid ""
@@ -8574,7 +8831,7 @@ msgstr ""
 
 #: client/options.c:217 client/gui-sdl/optiondlg.c:1174
 msgid "Focus on Awakened Units"
-msgstr ""
+msgstr "Enfazigu aktivajn unuojn"
 
 #: client/options.c:218
 msgid "Set this option to have newly awoken units be focused automatically."
@@ -8582,7 +8839,7 @@ msgstr ""
 
 #: client/options.c:221
 msgid "Allow goto into the unknown"
-msgstr "Leisti eiti į nežinomą"
+msgstr "Ebligu iri al la nekonataj landoj"
 
 #: client/options.c:222
 msgid ""
@@ -8592,7 +8849,7 @@ msgstr ""
 
 #: client/options.c:226
 msgid "Center map when Popup city"
-msgstr ""
+msgstr "Centrigu la mapon kiam urbo iĝas aktiva"
 
 #: client/options.c:227
 msgid ""
@@ -8602,7 +8859,7 @@ msgstr ""
 
 #: client/options.c:230
 msgid "Concise City Production"
-msgstr ""
+msgstr "Konciza produktado de la urbo"
 
 #: client/options.c:231
 msgid ""
@@ -8612,7 +8869,7 @@ msgstr ""
 
 #: client/options.c:234 client/gui-sdl/optiondlg.c:1252
 msgid "End Turn when done moving"
-msgstr "Baigti Ä—jimÄ… kai baigiasi Ä—jimai"
+msgstr "Finigu la vicon kiam ĉiuj movoj estas plenumitaj"
 
 #: client/options.c:235
 msgid ""
@@ -8622,7 +8879,7 @@ msgstr ""
 
 #: client/options.c:238 client/gui-sdl/optiondlg.c:1226
 msgid "Prompt for city names"
-msgstr ""
+msgstr "Invito por nomoj de la urboj"
 
 #: client/options.c:239
 msgid ""
@@ -8632,7 +8889,7 @@ msgstr ""
 
 #: client/options.c:242 client/gui-sdl/optiondlg.c:1200
 msgid "Pop up city dialog for new cities"
-msgstr ""
+msgstr "Malfermu ŝprucfenestron pri urbo por novaj urboj"
 
 #: client/options.c:243
 msgid ""
@@ -8642,7 +8899,7 @@ msgstr ""
 
 #: client/options.c:248
 msgid "Background layer"
-msgstr "Fono sluoksnis"
+msgstr "Fona tavolo"
 
 #: client/options.c:249
 msgid "The background layer of the overview shows just ocean and land."
@@ -8650,7 +8907,7 @@ msgstr ""
 
 #: client/options.c:252
 msgid "Terrain relief map layer"
-msgstr ""
+msgstr "Reliefa tavolo de grundoj"
 
 #: client/options.c:253
 msgid "The relief layer shows all terrains on the map."
@@ -8658,7 +8915,7 @@ msgstr ""
 
 #: client/options.c:256
 msgid "Borders layer"
-msgstr "Sienų sluoksnis"
+msgstr "Tavolo de landlimoj"
 
 #: client/options.c:257
 msgid ""
@@ -8667,7 +8924,7 @@ msgstr ""
 
 #: client/options.c:261
 msgid "Units layer"
-msgstr "Dalinių sluoksnis"
+msgstr "Tavolo de unuoj"
 
 #: client/options.c:262
 msgid "Enabling this will draw units on the overview."
@@ -8675,7 +8932,7 @@ msgstr ""
 
 #: client/options.c:265
 msgid "Cities layer"
-msgstr "Miestų sluoksnis"
+msgstr "Tavolo de urboj"
 
 #: client/options.c:266
 msgid "Enabling this will draw cities on the overview."
@@ -8683,7 +8940,7 @@ msgstr ""
 
 #: client/options.c:269
 msgid "Overview fog of war"
-msgstr "Karo rūko apžvalga"
+msgstr "Militnebulo en la trarigardo"
 
 #: client/options.c:270
 msgid "Enabling this will show fog of war on the overview."
@@ -8695,177 +8952,177 @@ msgstr ""
 
 #: client/options.c:516
 msgid "Cannot find your home directory"
-msgstr "Negaliu surasti Jūsų namų direktorijos"
+msgstr "Estas neeble trovi vian hejm-dosierujon"
 
 #: client/options.c:665 client/options.c:796
 msgid "Save failed, cannot find a filename."
-msgstr "IÅ¡saugoti nepavyko, negaliu surasti tokio failo pavadinimo."
+msgstr "La konservo malsukcesis, estas neeble trovi dosiernomon."
 
 #: client/options.c:678 client/options.c:859
 #, c-format
 msgid "Save failed, cannot write to file %s"
-msgstr ""
+msgstr "La konservo malsukcesis, estas neeble skribi en la dosiero %s"
 
 #: client/options.c:680 client/options.c:862
 #, c-format
 msgid "Saved settings to file %s"
-msgstr "Išsaugoti nustatymus į failą %s"
+msgstr "La agordaĵoj estas konservitaj en la dosiero %s"
 
 #: client/packhand.c:211 client/packhand.c:217
 #, fuzzy
 msgid "You were rejected from the game...."
-msgstr "Jūs buvote nepriimtas į žaidimą:"
+msgstr "Vi estis forpelitaj de la ludo: %s"
 
 #: client/packhand.c:229
 #, c-format
 msgid "Client capability string: %s"
-msgstr ""
+msgstr "Ĉeno de la klientokapacito: %s"
 
 #: client/packhand.c:232
 #, c-format
 msgid "Server capability string: %s"
-msgstr "Serverio galimybių eilutė: %s"
+msgstr "Ĉeno de la servilkapacito: %s"
 
 #: client/packhand.c:850
 #, c-format
 msgid "Start of turn %d"
-msgstr "%d ėjimo pradžia"
+msgstr "Komenco de la %da vico"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
-msgstr "DI režimas dabar yra  %s."
+msgstr "La IA-moduso nun estas %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
-msgstr "Įjungta"
+msgstr "aktiva"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
-msgstr "IÅ¡jungta"
+msgstr "malaktiva"
 
 #: client/plrdlg_common.c:198 client/gui-win32/plrdlg.c:163
 #: client/gui-xaw/plrdlg.c:246
+#, fuzzy
 msgid "R.I.P"
-msgstr "miręs"
+msgstr "R.I.P."
 
 #: client/plrdlg_common.c:202
 msgid "waiting"
-msgstr "laukia"
+msgstr "atenda"
 
 #: client/plrdlg_common.c:204 client/gui-sdl/plrdlg.c:649
 #: client/gui-win32/plrdlg.c:155 client/gui-xaw/plrdlg.c:238
 msgid "done"
-msgstr "paėjęs"
+msgstr "farita"
 
 #: client/plrdlg_common.c:206 client/gui-sdl/plrdlg.c:651
 #: client/gui-win32/plrdlg.c:157 client/gui-xaw/plrdlg.c:240
 msgid "moving"
-msgstr "eina"
+msgstr "movanta"
 
 #: client/plrdlg_common.c:249
 msgid "?Player:Name"
-msgstr "?Player:Vardas"
+msgstr "?Player:Nomo"
 
 #: client/plrdlg_common.c:250
 msgid "Username"
-msgstr "Vartotojo vardas"
+msgstr "Uzantonomo"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
-msgstr "VÄ—liava"
+msgstr "Flago"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
-msgstr "Tauta"
+msgstr "Nacio"
 
 #: client/plrdlg_common.c:253
 msgid "Border"
-msgstr "Siena"
+msgstr "Landlimo"
 
 #: client/plrdlg_common.c:254 client/gui-gtk-2.0/repodlgs.c:1319
 msgid "Score"
-msgstr "Taškai"
+msgstr "Poentaro"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
-msgstr "Komanda"
+msgstr "Grupo"
 
 #: client/plrdlg_common.c:257
 msgid "Attitude"
-msgstr "Požiūris"
+msgstr "Emo"
 
 #: client/plrdlg_common.c:258 client/gui-win32/diplodlg.c:612
 #: client/gui-win32/diplodlg.c:664 client/gui-win32/plrdlg.c:336
 msgid "Embassy"
-msgstr "Ambasada"
+msgstr "Ambasado"
 
 #: client/plrdlg_common.c:259 client/gui-win32/plrdlg.c:336
 msgid "Dipl.State"
-msgstr "Dipl. BÅ«sena"
+msgstr "Diplomatia stato"
 
 #: client/plrdlg_common.c:260 client/gui-win32/plrdlg.c:336
 msgid "Vision"
-msgstr "RegÄ—jimas"
+msgstr "Vido"
 
 #: client/plrdlg_common.c:262
 msgid "?Player_dlg:Host"
-msgstr ""
+msgstr "?Player_dlg:Gast. Komp"
 
 #: client/plrdlg_common.c:263
 msgid "?Player_dlg:Idle"
-msgstr ""
+msgstr "?Player_dlg:Nenifaro"
 
 #: client/plrdlg_common.c:264
 msgid "Ping"
-msgstr ""
+msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
-msgstr "Jūs negalite parduoti patobulinimų."
+msgstr "Vi ne povas vendi la urbajn plibonigojn."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
-msgstr "Parduota %d %s už %d aukso."
+msgstr "Venditaj %d %s por %d oraj moneroj."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
-msgstr "Joks %s negali būti parduotas."
+msgstr "%s ne povus esti venditaj."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
-msgstr "Negali išformuoti dalinių."
+msgstr "Vi ne povas dissolvi la unuojn."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
-msgstr "%s negali būti išformuotas."
+msgstr "%s ne povas esti dissolvitaj."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
-msgstr "IÅ¡formuotas %d %s."
+msgstr "Dissolvita(j) %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
-msgstr "Joks %s negali būti išformuotas."
+msgstr "%s ne povus esti dissolvitaj."
 
 #: client/servers.c:345
 msgid "Could not open temp file."
-msgstr "Negalima atverti laikino failo."
+msgstr ""
 
 #: client/servers.c:407
 msgid "Invalid $http_proxy or metaserver value, must start with 'http://'"
 msgstr ""
-"Bloga $http_proxy arba metaserverio reikšmė, turi prasidėti su 'http://'"
 
 #: client/servers.c:413
 msgid "Failed looking up metaserver's host"
@@ -8874,420 +9131,412 @@ msgstr ""
 #: client/text.c:85 client/text.c:86 client/text.c:91
 #: client/gui-sdl/mapview.c:752
 msgid "?nation:Neutral"
-msgstr "?nation:Neutrali"
+msgstr "?nation:NeÅ­trala"
 
 #: client/text.c:85 client/gui-sdl/mapview.c:752
 msgid "?nation:Hostile"
-msgstr "?nation:Priešiška"
+msgstr "?nation:Malamika"
 
 #: client/text.c:87 client/gui-sdl/mapview.c:754
 msgid "?nation:Peaceful"
-msgstr "?nation:Taiki"
+msgstr "?nation:Paca"
 
 #: client/text.c:87 client/gui-sdl/mapview.c:754
 msgid "?nation:Friendly"
-msgstr "?nation:Draugiška"
+msgstr "?nation:Amika"
 
 #: client/text.c:88 client/gui-sdl/mapview.c:755
 msgid "?nation:Mysterious"
-msgstr "?nation:Paslaptinga"
+msgstr "?nation:Mistera"
 
 #: client/text.c:88
 msgid "?nation:Friendly(team)"
-msgstr "?nation:Draugiška(komanda)"
+msgstr "?nation:Amika (grupo)"
 
 #: client/text.c:90 client/gui-sdl/mapview.c:785
 msgid "?city:Neutral"
-msgstr "?city:Neutralus"
+msgstr "?city:NeÅ­trala"
 
 #: client/text.c:90 client/gui-sdl/mapview.c:785
 msgid "?city:Hostile"
-msgstr "?city:Priešiškas"
+msgstr "?city:Malamika"
 
 #: client/text.c:92 client/gui-sdl/mapview.c:786
 msgid "?city:Peaceful"
-msgstr "?city:Taikus"
+msgstr "?city:Paca"
 
 #: client/text.c:92 client/gui-sdl/mapview.c:787
 msgid "?city:Friendly"
-msgstr "?city:Draugiškas"
+msgstr "?city:Amika"
 
 #: client/text.c:92 client/gui-sdl/mapview.c:787
 msgid "?city:Mysterious"
-msgstr "?city:Paslaptingas"
+msgstr "?city:Mistera"
 
 #: client/text.c:93
 msgid "?city:Friendly(team)"
-msgstr "?city:Draugiškas(komanda)"
+msgstr "?city:Amika(grupo)"
 
 #: client/text.c:100
 #, c-format
 msgid "Location: (%d, %d) [%d]"
-msgstr "Vieta: (%d, %d) [%d]"
+msgstr "Lokiĝo: (%d, %d) [%d]"
 
 #: client/text.c:109
 #, c-format
 msgid "Terrain: %s"
-msgstr "Reljefas: %s"
+msgstr "Grundo: %s"
 
 #: client/text.c:110
 #, c-format
 msgid "Food/Prod/Trade: %s"
-msgstr "Maistas/Gamyba/Prekyba: %s"
+msgstr "Nutraĵo/Prod/Komerco: %s"
 
 #: client/text.c:113
 msgid "Minor Tribe Village"
-msgstr ""
+msgstr "Vilaĝo de eta tribo"
 
 #: client/text.c:119
-#, fuzzy
 msgid "Our territory"
-msgstr "Mūsų teritorija"
+msgstr "Nia teritorio"
 
 #. TRANS: "Polish territory"
 #: client/text.c:122
-#, fuzzy, c-format
+#, c-format
 msgid "%s territory"
-msgstr "%s teritorija"
+msgstr "%s teritorio"
 
 #. TRANS: "Polish territory (5 turn cease-fire)"
 #: client/text.c:131
 #, c-format
 msgid "%s territory (%d turn cease-fire)"
 msgid_plural "%s territory (%d turn cease-fire)"
-msgstr[0] "%s teritorija (%d Ä—jimo paliaubos)"
-msgstr[1] "%s teritorija (%d ėjimų paliaubos)"
-msgstr[2] "%s teritorija (%d ėjimų paliaubos)"
+msgstr[0] "%s teritorio (%d vico de pafĉesigo)"
+msgstr[1] "%s teritorio (%d vicoj de pafĉesigo)"
 
 #. TRANS: "Polish territory (friendly)"
 #: client/text.c:140
-#, fuzzy, c-format
+#, c-format
 msgid "%s territory (%s)"
-msgstr "%s %s teritorija"
+msgstr "%s teritorio (%s)"
 
 #: client/text.c:145
 msgid "Unclaimed territory"
-msgstr "Nepriklausoma teritorija."
+msgstr "Nenies teritorio"
 
 #. TRANS: "City: Warsaw (Polish)"
 #: client/text.c:156
 #, c-format
 msgid "City: %s (%s)"
-msgstr "Miestas: %s (%s)"
+msgstr "Urbo:  %s (%s)"
 
 #. TRANS:  "City: Warsaw (Polish, 5 turn cease-fire)"
 #: client/text.c:166
 #, c-format
 msgid "City: %s (%s, %d turn cease-fire)"
 msgid_plural "City: %s (%s, %d turn cease-fire)"
-msgstr[0] "Miestas: %s (%s, %d Ä—jimo paliaubos)"
-msgstr[1] "Miestas: %s (%s, %d ėjimų paliaubos)"
-msgstr[2] "Miestas: %s (%s, %d ėjimų paliaubos)"
+msgstr[0] "Urbo: %s (%s, %d vico de pafĉesigo)"
+msgstr[1] "Urbo: %s (%s, %d vicoj de pafĉesigo)"
 
 #. TRANS: "City: Warsaw (Polish,friendly)"
 #: client/text.c:174
 #, c-format
 msgid "City: %s (%s, %s)"
-msgstr "Miestas: %s (%s, %s)"
+msgstr "Urbo: %s (%s, %s)"
 
 #. TRANS: previous lines gave other information about the city.
 #: client/text.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "?clistbegin: with %s"
-msgstr " su %s"
+msgstr "?clistbegin: kun %s"
 
 #. TRANS: "Trade from Warsaw: 5"
 #: client/text.c:202
 #, c-format
 msgid "Trade from %s: %d"
-msgstr ""
+msgstr "Komercado el %s: %d"
 
 #: client/text.c:210
 #, c-format
 msgid "Infrastructure: %s"
-msgstr "Infrastruktūra: %s"
+msgstr "Instalaĵo: %s"
 
 #: client/text.c:215
 #, c-format
 msgid "Activity: %s"
-msgstr ""
+msgstr "Ago: %s"
 
 #. TRANS: "Unit: Musketeers (Polish, Warsaw)"
 #. TRANS: "Unit: Musketeers (Polish,friendly)"
 #: client/text.c:226 client/text.c:253
 #, c-format
 msgid "Unit: %s (%s, %s)"
-msgstr "Dalinys: %s (%s, %s)"
+msgstr "Unuo: %s (%s, %s)"
 
 #. TRANS: "Unit: Musketeers (Polish)"
 #: client/text.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "Unit: %s (%s)"
-msgstr "Dalinys: %s (%s)"
+msgstr "Unuo: %s (%s)"
 
 #. TRANS:  "Unit: Musketeers (Polish, 5 turn cease-fire)"
 #: client/text.c:245
 #, c-format
 msgid "Unit: %s (%s, %d turn cease-fire)"
 msgid_plural "Unit: %s (%s, %d turn cease-fire)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Unuo: %s (%s, %d vico de pafĉesigo)"
+msgstr[1] "Unuo: %s (%s, %d vicoj de pafĉesigo)"
 
 #. TRANS: "Chance to win: A:95% D:46%"
 #: client/text.c:279
 #, c-format
 msgid "Chance to win: A:%d%% D:%d%%"
-msgstr "TikimybÄ— laimÄ—ti: P:%d%% G:%d%%"
+msgstr "Åœancoj pri venko: A:%d%% D:%d%%"
 
 #. TRANS: A is attack power, D is defense power, FP is firepower,
 #. * HP is hitpoints (current and max).
 #: client/text.c:286
 #, c-format
 msgid "A:%d D:%d FP:%d HP:%d/%d (%s)"
-msgstr ""
+msgstr "A:%d D:%d FP:%d ĈP:%d/%d (%s)"
 
 #. TRANS: "5 more" units on this tile
 #: client/text.c:295
 #, c-format
 msgid "  (%d more)"
-msgstr "  (dar %d)"
+msgstr "  (%d plue)"
 
 #. TRANS: on own line immediately following \n, ... <city>
 #: client/text.c:364
 #, c-format
 msgid "far from %s"
-msgstr "toli nuo %s"
+msgstr "fore de %s"
 
 #. TRANS: on own line immediately following \n, ... <city>
 #: client/text.c:367
 #, c-format
 msgid "near %s"
-msgstr "\"arti %s"
+msgstr "apud %s"
 
 #. TRANS: on own line immediately following \n, ... <city>
 #: client/text.c:370
 #, c-format
 msgid "in %s"
-msgstr ""
+msgstr "en %s"
 
 #. TRANS: on own line immediately following \n, ... <city>
 #: client/text.c:403
 #, c-format
 msgid "from %s"
-msgstr "iš %s"
+msgstr "de %s"
 
 #: client/text.c:466
 msgid "Progress: no research"
-msgstr "Pažanga: netyrinėjama"
+msgstr "Progreso: neniu studado"
 
 #: client/text.c:470
 msgid "Progress: no research target"
-msgstr "Progresas: nėra paieškos tikslo"
+msgstr "Progreso: neniu celo por la studado"
 
 #: client/text.c:475
 #, c-format
 msgid "Progress: %d turn/advance"
 msgid_plural "Progress: %d turns/advance"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Progreso: %d vico/eltrovo"
+msgstr[1] "Progreso: %d vicoj/eltrovo"
 
 #: client/text.c:480
 #, c-format
 msgid "%d bulb/turn"
 msgid_plural "%d bulbs/turn"
-msgstr[0] "%d lemputÄ—/Ä—jimÄ…"
-msgstr[1] "%d lemputÄ—s/Ä—jimÄ…"
-msgstr[2] "%d lempučių/ėjimą"
+msgstr[0] "%d ampolo/vico"
+msgstr[1] "%d ampoloj/vico"
 
 #: client/text.c:485
 #, c-format
 msgid ", %d bulb/turn from team"
 msgid_plural ", %d bulbs/turn from team"
-msgstr[0] ", %d lemputė/ėjimą iš komandos"
-msgstr[1] ", %d lemputės/ėjimą iš komandos"
-msgstr[2] ", %d lempučių/ėjimą iš komandos"
+msgstr[0] ", %d ampolo/vico por grupo"
+msgstr[1] ", %d ampoloj/vico por grupo"
 
 #: client/text.c:512
 #, c-format
 msgid "%d/- (never)"
-msgstr "%d/- (niekada)"
+msgstr "%d/- (neniam)"
 
 #: client/text.c:524
 #, c-format
 msgid "%d/%d (%d turn)"
 msgid_plural "%d/%d (%d turns)"
-msgstr[0] "%d/%d (%d Ä—jimas)"
-msgstr[1] "%d/%d (%d Ä—jimai)"
-msgstr[2] "%d/%d (%d ėjimų)"
+msgstr[0] "%d/%d (%d vico)"
+msgstr[1] "%d/%d (%d vicoj)"
 
 #: client/text.c:527
 #, c-format
 msgid "%d/%d (never)"
-msgstr "%d/%d (niekada)"
+msgstr "%d/%d (neniam)"
 
 #: client/text.c:564
 #, c-format
 msgid "%d step"
 msgid_plural "%d steps"
-msgstr[0] "%d žingsnis"
-msgstr[1] "%d žingsniai"
-msgstr[2] "%d žingsnių"
+msgstr[0] "%d paŝo"
+msgstr[1] "%d paŝoj"
 
 #: client/text.c:566
 #, c-format
 msgid "%d bulb"
 msgid_plural "%d bulbs"
-msgstr[0] "%d lemputÄ—"
-msgstr[1] "%d lemputÄ—s"
-msgstr[2] "%d lempučių"
+msgstr[0] "%d ampolo"
+msgstr[1] "%d ampoloj"
 
 #: client/text.c:570 client/agents/cma_fec.c:269 client/agents/cma_fec.c:313
 #: client/gui-gtk-2.0/citydlg.c:1421 client/gui-win32/citydlg.c:460
 #, c-format
 msgid "%d turn"
 msgid_plural "%d turns"
-msgstr[0] "%d Ä—jimas"
-msgstr[1] "%d Ä—jimai"
-msgstr[2] "%d ėjimų"
+msgstr[0] "%d vico"
+msgstr[1] "%d vicoj"
 
 #: client/text.c:592
 #, c-format
 msgid "Population: %s"
-msgstr "Gyventojai: %s"
+msgstr "Populacio: %s"
 
 #: client/text.c:595
 #, c-format
 msgid "Year: %s (T%d)"
-msgstr "Metai: %s (Ä–%d)"
+msgstr "Jaro: %s (T%d)"
 
 #: client/text.c:598
 #, c-format
 msgid "Gold: %d (%+d)"
-msgstr "Auksas: %d (%+d)"
+msgstr "Oro: %d (%+d)"
 
 #: client/text.c:600
-#, c-format
+#, fuzzy, c-format
 msgid "Tax: %d Lux: %d Sci: %d"
-msgstr ""
+msgstr "Imp: %d Lukso: %d Sci:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Moviĝanta: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
-msgstr ""
+msgstr "Moviĝanta: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
-msgstr "(Paspauskite norėdami sužinoti daugiau informacijos)"
+msgstr "(Alklaku por havi pli informojn)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
-msgstr "%s žmonių"
+msgstr "%s Popolo"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
-msgstr "Ä–jimas: %d"
+msgstr "Vico: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
-msgstr "Aukso: %d"
+msgstr "Oro: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr ""
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
-#, c-format
+#: client/text.c:639
+#, fuzzy, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
-msgstr ""
+msgstr "Procento: Oro:%d%%  Lukso:%d%%  Scienco:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
-msgstr "TyrinÄ—jama %s: %s"
+msgstr "Studante %sn: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
-msgstr "Globalinio atšilimo tikimybė: %d%% (%+d%%/ėjimą)"
+msgstr "Probablo pri ĝenerala varmiĝo: %d%% (%+d%%/vico)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
-msgstr "Branduolinės žiemos tikimybė: %d%% (%+d%%/ėjimą)"
+msgstr "Probablo pri atomvintro: %d%% (%+d%%/vico)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
-msgstr "VyriausybÄ—: %s"
+msgstr "Regsistemo: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
-msgstr[0] "%d dalinys"
-msgstr[1] "%d daliniai"
-msgstr[2] "%d dalinių"
+msgstr[0] "%d unuo"
+msgstr[1] "%d unuoj"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
-msgstr ""
+msgstr "?goto:Neatingebla"
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
-msgstr "Ä–jimai iki tikslo: %d"
+msgstr "Vicoj al la celo: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
-msgstr ""
+msgstr "Vicoj al la celo: de %d ĝis %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
-msgstr[0] "Pažymėtas %d dalinys"
-msgstr[1] "Pažymėti %d daliniai"
-msgstr[2] "Pažymėti %d dalinių"
+msgstr[0] "%d elektita unuo"
+msgstr[1] "%d elektitaj unuoj"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
-msgstr "Daliniai nepažymėti."
+msgstr "Neniu unuo estas elektita."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
-msgstr ""
+msgstr "Aliuloj: %d civiloj; %d militistoj"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
-msgstr ""
+msgstr "Aliuloj: %d civiloj"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
-msgstr ""
+msgstr "Aliuloj: %d militistoj"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
-msgstr "Nėra tobulintinų dalinių!"
+msgstr "Neniu ĝisdatigenda unuo."
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
-msgstr "Nei vienas iš šių dalinių negali būti patobulintas."
+msgstr "Neniu el ĉi tiuj unuoj estas ĝisdatigebla."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9296,247 +9545,241 @@ msgid_plural ""
 "Upgrade %d units for %d gold?\n"
 "Treasury contains %d gold."
 msgstr[0] ""
-"Patobulinti %d dalinį už %d aukso?\n"
-"Ižde yra %d aukso."
+"Ĉu vi deziras modernigi %d unuon per %d oraj moneroj?\n"
+"La ŝtata kaso entenas %d orajn monerojn."
 msgstr[1] ""
-"Patobulinti %d dalinius už %d aukso?\n"
-"Ižde yra %d aukso."
-msgstr[2] ""
-"Patobulinti %d dalinių už %d aukso?\n"
-"Ižde yra %d aukso."
+"Ĉu vi deziras modernigi %d unuojn per %d oraj moneroj?\n"
+"La ŝtata kaso entenas %d orajn monerojn."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
-msgstr "Rodo Jūsų pažangą, beieškant dabar nustatytos technologijos."
+msgstr "Vidigu la evoluon de la studado pri la nuna teĥnologio."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
-msgstr "Nėra paieškų tikslo."
+msgstr "Neniu celo pri studado."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
-msgstr "Rodo globalinio atšilimo eigą:"
+msgstr "Vidigu la evoluon de la ĝenerala varmiĝo:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
-msgstr "Užterštumo norma: %d%%"
+msgstr "Procento de poluado: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
-msgstr "Katastrofinio klimato atšilimo tikimybė kiekvienu ėjimu: %d%%"
+msgstr "Probablo pri katastrofa varmiĝo en ciu turno: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
-msgstr "Rodo branduolinės žiemos galimybės progresą:"
+msgstr "Vidigu la evoluon de la atomvintro:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
-msgstr "Radioaktyvių dulkių kritimo norma: %d%%"
+msgstr "Radioaktiveco: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
-msgstr "Branduolinės žiemos pasireiškimo tikimybė kiekvienu ėjimu: %d%%"
+msgstr "Probablo pri katastrofa vintro en ciu turno: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
-msgstr "Rodo Jūsų dabartinę vyriausybę:"
+msgstr "Vidigu vian nunan regsistemon:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
-msgstr "Gyventojai:      %5d"
+msgstr "Populacio:       %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
-msgstr "Palaikymas:      %5d %%"
+msgstr "Bazo:            %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
-msgstr "Energija:        %5d %%"
+msgstr "Energio:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
-msgstr[0] "MasÄ—:           %5d tona"
-msgstr[1] "Mass:           %5d tonos"
-msgstr[2] "Mass:            %5d tonų"
+msgstr[0] "Maso:           %5d tuno"
+msgstr[1] "Maso:           %5d tunoj"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
-msgstr "KelionÄ—s laikas: %5.1f years"
+msgstr "Vojaĝodaŭro:  %5.1f jaroj"
 
-# Kaip išvert N/A?
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
-msgstr "KelionÄ—s laikas:     N/A"
+msgstr "Vojaĝodaŭro:     -     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
-msgstr "SÄ—kmÄ—s tikim.:   %5d %%"
+msgstr "Sukcesprobablo: %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
-msgstr "Atvykimo metai: %8s"
+msgstr "Alvenjaro:  %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
-msgstr "?timeout:išjungta"
+msgstr "?timeout:-"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
-msgstr "?dys/hrs:%02dd %02dh"
+msgstr "?dys/hrs:%02dg %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
-msgstr ""
+msgstr "?duration:troo"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
-msgstr ""
+msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
-msgstr ""
+msgstr "%s de la %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
-msgstr "StebÄ—tojas: %s"
+msgstr "Observanto: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
-msgstr "Pastatai: "
+msgstr "Konstruaĵoj: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
-msgstr "NÄ—ra. "
+msgstr "Neniu. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
-msgstr "."
+msgstr "?clistend:."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
-msgstr "Stebuklai: "
+msgstr "Mirindaĵoj: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
-msgstr ""
+msgstr "Urboj: %d sume, %d trans la sojlo de %d urboj."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d kontenta civitano antaÅ­ la puno"
+msgstr[1] "%d kontentaj civitanoj antaÅ­ la puno"
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
-#, fuzzy, c-format
+#: client/text.c:1257
+#, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
-msgstr[0] "* Neturi nelaimingų piliečių.\n"
-msgstr[1] "* Neturi nelaimingų piliečių.\n"
-msgstr[2] "* Neturi nelaimingų piliečių.\n"
+msgstr[0] "%d aldona malkontenta civitano."
+msgstr[1] "%d aldonaj malkontentaj civitanoj."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
-msgstr ""
+msgstr "Milita leĝo plenumanta ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
-msgstr "nÄ—ra maksimumo,"
+msgstr "neniu maksimumo, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d unuo maksimume, "
+msgstr[1] "%d unuoj maksimume, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
-msgstr ""
+msgstr "%d por unuo). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
-msgstr "Kariniai daliniai lauke gali kelti nepasitenkinimÄ…."
+msgstr "Armeaj unuoj en la areo povus kaÅ­zi malkontenton. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
-msgstr "Kariniai daliniai neveikia laimingumo efekto. "
+msgstr "Armeaj unuoj ne havas feliĉigantan efikon. "
 
-#: client/text.c:1312
-#, c-format
+#: client/text.c:1316
+#, fuzzy, c-format
 msgid "Luxury: %d total."
-msgstr "Prabanga: %d iš viso."
+msgstr "Lukso: %d sume."
 
 #: client/tilespec.c:865
 msgid "No usable default tileset found, aborting!"
-msgstr "Nėra tinkamo laukelių rinkinio, todėl baigiamas darbas!"
+msgstr "Neniu defaŭlta grafikaĵo estas trovita, do oni eliras!"
 
 #: client/tilespec.c:1338
+#, fuzzy
 msgid ""
 "Client does not support isometric tilesets. Using default tileset instead."
-msgstr ""
+msgstr "La kliento ne subtenas izometrian grafikaĵon."
 
 #: client/tilespec.c:1347
+#, fuzzy
 msgid ""
 "Client does not support overhead view tilesets. Using default tileset "
 "instead."
-msgstr ""
+msgstr "La kliento ne subtenas trarigardantajn grafikaĵojn."
 
 #: client/tilespec.c:3968
 #, c-format
@@ -9551,6 +9794,8 @@ msgid ""
 "The citizen governor can't fulfill the requirements for %s. Passing back "
 "control."
 msgstr ""
+"La aŭtomata urba regado ne kapablas plene ekipi %sn. Do ĝi rezignis pri la "
+"regado."
 
 #: client/agents/cma_core.c:409 client/agents/cma_core.c:429
 #, c-format
@@ -9558,22 +9803,23 @@ msgid ""
 "The citizen governor has gotten confused dealing with %s.  You may want to "
 "have a look."
 msgstr ""
+"La aŭtomata urba regado konfuzis la renkontiĝon kun %s. Estus bone kontroli."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
-msgstr "nÄ—ra"
+msgstr "neniu"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
-msgstr "pasirinktinis"
+msgstr "persona"
 
 #: client/agents/cma_fec.c:342
 msgid " happy"
-msgstr " laimingi"
+msgstr " kontenta"
 
 #: client/agents/cma_fec.c:353
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Name: %s\n"
 "Food:       %10s Gold:    %10s\n"
@@ -9584,60 +9830,71 @@ msgid ""
 "          City grows: %s\n"
 "Production completed: %s"
 msgstr ""
+"Nomo: %s\n"
+"Nutraĵo:   %10s Oro:     %10s\n"
+"Produktado: %10s Lukso:   %10s\n"
+"Komerco:    %10s Scienco: %10s\n"
+"\n"
+"  Civitanoj (L/A/S/E): %s\n"
+"         Urba pliiĝo: %s\n"
+"    Produktado finita: %s"
 
 #: client/agents/cma_fec.c:418
 msgid "?cma:Very happy"
-msgstr "?cma:Labai laimingi"
+msgstr "?cma:Tre kontenta"
 
 #: client/agents/cma_fec.c:419
 msgid "?cma:Max food"
-msgstr "?cma:Daugiausia maisto"
+msgstr "?cma:Maksimumigo de nutraĵo"
 
 #: client/agents/cma_fec.c:420
 msgid "?cma:Max production"
-msgstr "?cma:Daugiausia gamybos"
+msgstr "?cma:Maksimumigo de produktado"
 
 #: client/agents/cma_fec.c:421
 msgid "?cma:Max gold"
-msgstr "?cma:Daugiausia aukso"
+msgstr "?cma:Maksimumigo de oro"
 
 #: client/agents/cma_fec.c:422
 msgid "?cma:Max science"
-msgstr "?cma:Daugiausia mokslo"
+msgstr "?cma:Maksimumigo de scienco"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:85 client/gui-win32/dialogs.c:1363
 msgid "Ooops..."
 msgstr "Ooops..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
-msgstr "Šis dalinys negali būti papirktas!"
+msgstr "Ĉi tiu unuo ne estas subaĉetebla!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
 "Treasury contains %d gold."
 msgstr ""
-"Papirkti priešo dalinį už %d aukso?\n"
-"Ižde yra %d aukso."
+"Ĉu vi deziras subaĉeti unuon per %d oraj moneroj?\n"
+"La ŝtata kaso entenas %d orajn monerojn."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:95
 #: client/gui-sdl/diplomat_dialog.c:701 client/gui-sdl/diplomat_dialog.c:1377
 #: client/gui-win32/dialogs.c:1370 data/Freeciv.in:2419 data/Freeciv.in:2432
 msgid "Bribe Enemy Unit"
-msgstr "Papirkti priešo dalinį"
+msgstr "Subaĉetu malamikan unuon"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
 "Treasury contains %d gold."
 msgstr ""
-"Dalinio papirkimas kainuoja %d aukso.\n"
-"Ižde yra %d aukso."
+"La subaĉeto de unuo kostas %d orajn monerojn.\n"
+"La ŝtata kaso entenas %d orajn monerojn."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:103
 #: client/gui-gtk-2.0/diplomat_dialog.c:560
@@ -9645,191 +9902,198 @@ msgstr ""
 #: client/gui-win32/dialogs.c:1380 client/gui-win32/dialogs.c:1565
 #: data/Freeciv.in:2454
 msgid "Traitors Demand Too Much!"
-msgstr "IÅ¡davikai reikalauja per daug!"
+msgstr "La perfiduloj postulis tro altan pagon!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:234
 #: client/gui-sdl/diplomat_dialog.c:650 client/gui-win32/dialogs.c:1278
 #: data/Freeciv.in:2285 data/Freeciv.in:2318 data/Freeciv.in:2335
 msgid "Steal Technology"
-msgstr "Pavogti technologijÄ…"
+msgstr "Forŝtelu teĥnologion"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:239
 msgid "_Steal"
-msgstr "_Pavogti"
+msgstr "_Forŝtelu"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:248
 #: client/gui-sdl/diplomat_dialog.c:250 client/gui-win32/dialogs.c:1288
 #: data/Freeciv.in:2350
 msgid "Select Advance to Steal"
-msgstr "Pasirinkite technologijÄ…, kuriÄ… norite pavogti"
+msgstr "Elektu forŝtelendan avanaĵon"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:268
 msgid "_Advances:"
-msgstr "_Pasiekimai:"
+msgstr "_Avanaĵoj:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:308
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
-msgstr "Šnipo nuožiūra"
+msgstr "LaÅ­ la opinio de la spiono"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:378 client/gui-win32/dialogs.c:1478
 #: data/Freeciv.in:2377
 msgid "Sabotage Improvements"
-msgstr "Sabotuoti patobulinimus"
+msgstr "Saboto de la plibonigoj"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:383
 msgid "_Sabotage"
-msgstr "_Sabotuoti"
+msgstr "_Sabotado"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:392
 #: client/gui-sdl/diplomat_dialog.c:846 client/gui-win32/dialogs.c:1488
 #: data/Freeciv.in:2392
 msgid "Select Improvement to Sabotage"
-msgstr "Pasirinkite patobulinimą, kurį norite sabotuoti"
+msgstr "Elektu sabotendan plibonigon"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:412 client/gui-gtk-2.0/citydlg.c:840
 msgid "_Improvements:"
-msgstr "_Patobulinimai"
+msgstr "_Urbaj plibonigoj:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
-msgstr "Miesto produkcija"
+msgstr "Produktado de la urbo"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
-msgstr "JÅ«s negalite sukleti revoliucijos mieste %s."
+msgstr "Vi ne povas instigi al ribelo en %s."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:544
 #: client/gui-sdl/diplomat_dialog.c:1178 client/gui-win32/dialogs.c:1550
 msgid "City can't be incited!"
-msgstr "Mieste negali būti sukelta revoliucija."
+msgstr "La urbo ne estas instigebla al ribelo!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
 "Treasury contains %d gold."
 msgstr ""
-"Pakurstyti revoliuciją už %d aukso?\n"
-"Ižde yra %d aukso."
+"Ĉu vi deziras instigi al ribelo per %d oraj moneroj?\n"
+"La ŝtata kaso entenas %d orajn monerojn."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:552
 #: client/gui-sdl/diplomat_dialog.c:1136 client/gui-win32/dialogs.c:1557
 #: data/Freeciv.in:2443
 msgid "Incite a Revolt!"
-msgstr "Pakurstyti revoliucijÄ…!"
+msgstr "Instigu al ribelo!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
 "Treasury contains %d gold."
 msgstr ""
-"Revoliucijai pradÄ—ti reikia %d aukso.\n"
-"Ižde yra %d aukso."
+"La instigo al ribelo kostas %d orajn monerojn.\n"
+"La ŝtata kaso entenas %d orajn monerojn."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
 "What is your command?"
 msgstr ""
-"Jūsų %s atvyko į %s.\n"
-"Koks Jūsų nurodymas?"
+"Via %s alvenis al %s.\n"
+"Kion vi ordonas nun?"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:627
 #: client/gui-sdl/diplomat_dialog.c:556 client/gui-win32/dialogs.c:1607
 #: data/Freeciv.in:2273
 msgid "Choose Your Diplomat's Strategy"
-msgstr "Pasirinkite savo diplomato strategijÄ…"
+msgstr "Elektu strategion por via diplomato"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:628
 #: client/gui-gtk-2.0/diplomat_dialog.c:652 client/gui-win32/dialogs.c:1608
 #: client/gui-win32/dialogs.c:1629
+#, fuzzy
 msgid "Establish _Embassy"
-msgstr "Įsteigti _ambasadą"
+msgstr "Starigu _komercan kurson"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:629
 #: client/gui-gtk-2.0/diplomat_dialog.c:653 client/gui-win32/dialogs.c:1609
 #: client/gui-win32/dialogs.c:1630
 msgid "_Investigate City"
-msgstr "_IÅ¡tyrinÄ—ti miestÄ…"
+msgstr "En_ketu urbon"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:630 client/gui-win32/dialogs.c:1610
 msgid "_Sabotage City"
-msgstr "_Sabotuoti miestÄ…"
+msgstr "_Sabotu urbon"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:631
 #: client/gui-gtk-2.0/diplomat_dialog.c:656 client/gui-win32/dialogs.c:1611
 #: client/gui-win32/dialogs.c:1633
 msgid "Steal _Technology"
-msgstr "Pavogti _technologijÄ…"
+msgstr "Forŝtelu _teĥnologion"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:632
 #: client/gui-gtk-2.0/diplomat_dialog.c:657 client/gui-win32/dialogs.c:1612
 #: client/gui-win32/dialogs.c:1634
 msgid "Incite a _Revolt"
-msgstr "Pakurstyti _revoliucijÄ…"
+msgstr "Instigu al _ribelo"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:633
 #: client/gui-gtk-2.0/diplomat_dialog.c:658
 #: client/gui-gtk-2.0/caravan_dialog.c:119 client/gui-win32/dialogs.c:1054
 msgid "_Keep moving"
-msgstr "_Toliau judÄ—ti"
+msgstr "_Estu moviĝanta"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:651
 #: client/gui-sdl/diplomat_dialog.c:552 client/gui-win32/dialogs.c:1628
 #: data/Freeciv.in:2299
 msgid "Choose Your Spy's Strategy"
-msgstr "Pasirinkite Jūsų šnipo strategiją"
+msgstr "Elektu strategion por via spiono"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:654 client/gui-win32/dialogs.c:1631
 msgid "_Poison City"
-msgstr "_Apnuodyti miestÄ…"
+msgstr "_Venenu la urbon"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:655 client/gui-win32/dialogs.c:1632
 msgid "Industrial _Sabotage"
-msgstr "Industrinis _sabotažas"
+msgstr "_Industria saboto"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:692
 #: client/gui-sdl/diplomat_dialog.c:561 client/gui-win32/dialogs.c:1659
 #: data/Freeciv.in:2430
 msgid "Subvert Enemy Unit"
-msgstr ""
+msgstr "Ataku malamikan unuon"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
-msgstr ""
+msgstr "La diplomato atendas viajn ordonojn"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
-#, fuzzy
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
-msgstr "Pone, šnipas laukia jūsų nurodymų"
+msgstr "La spiono atendas viajn ordonojn"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:696 client/gui-win32/dialogs.c:1663
 msgid "_Bribe Enemy Unit"
-msgstr "_Papirkti priešo dalinį"
+msgstr "Sub_aĉetu malamikan unuon"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:697 client/gui-win32/dialogs.c:1664
 msgid "_Sabotage Enemy Unit"
-msgstr ""
+msgstr "_Sabotu malamikan unuon"
 
 #: client/gui-gtk-2.0/caravan_dialog.c:80
 #, c-format
 msgid "Help build _Wonder (%d remaining)"
-msgstr "PadÄ—ti statyti _stebuklÄ… (liko %d)"
+msgstr "Helpu konstrui mirindaĵon (%d ceterajn)"
 
 #: client/gui-gtk-2.0/caravan_dialog.c:85 client/gui-win32/dialogs.c:1053
 msgid "Help build _Wonder"
-msgstr "PadÄ—ti statyti _stebuklÄ…"
+msgstr "_Helpu konstrui mirindaĵon"
 
 #: client/gui-gtk-2.0/caravan_dialog.c:100 client/gui-win32/dialogs.c:1038
 #: client/gui-xaw/dialogs.c:443
@@ -9838,270 +10102,269 @@ msgid ""
 "Your caravan from %s reaches the city of %s.\n"
 "What now?"
 msgstr ""
-"Jūsų karavanas iš %s pasiekia miestą %s.\n"
-"Kas dabar?"
+"Via karavano alvenis de %s al %s.\n"
+"Kion nun?"
 
 #: client/gui-gtk-2.0/caravan_dialog.c:114 client/gui-win32/dialogs.c:1049
 #: data/Freeciv.in:2259
 msgid "Your Caravan Has Arrived"
-msgstr "Jūsų karavanas atvyko"
+msgstr "Via karavano alvenis"
 
 #: client/gui-gtk-2.0/caravan_dialog.c:116 client/gui-win32/dialogs.c:1051
 msgid "Establish _Traderoute"
-msgstr "Įsteigti _prekybos maršrutą"
+msgstr "Starigu _komercan kurson"
 
 #: client/gui-gtk-2.0/caravan_dialog.c:117 client/gui-win32/dialogs.c:1052
 msgid "Enter Marketplace"
-msgstr "Aplankyti turgų"
+msgstr "Eniru la bazaron"
 
 #: client/gui-gtk-2.0/chatline.c:144 client/gui-win32/chatline.c:134
 #: client/gui-xaw/chatline.c:120
 msgid "Cleared output window."
-msgstr "Išvesties langas išvalytas."
+msgstr "La fenestro de mesaĝoj estas vakigita."
 
 #: client/gui-gtk-2.0/citydlg.c:578 client/gui-win32/citydlg.c:662
 msgid "Food:"
-msgstr "Maistas:"
+msgstr "Nutr.:"
 
 #: client/gui-gtk-2.0/citydlg.c:579 client/gui-win32/citydlg.c:663
 msgid "Prod:"
-msgstr "Gamyba:"
+msgstr "Prod.:"
 
 #: client/gui-gtk-2.0/citydlg.c:580 client/gui-win32/citydlg.c:664
 msgid "Trade:"
-msgstr "Prekyba:"
+msgstr "Kom.:"
 
 #: client/gui-gtk-2.0/citydlg.c:581 client/gui-gtk-2.0/inteldlg.c:44
 #: client/gui-win32/citydlg.c:665
 msgid "Gold:"
-msgstr "Auksas:"
+msgstr "Oro:"
 
 #: client/gui-gtk-2.0/citydlg.c:582 client/gui-gtk-2.0/inteldlg.c:48
 #: client/gui-win32/citydlg.c:666
+#, fuzzy
 msgid "Luxury:"
-msgstr "Prabanga:"
+msgstr "Lukso:"
 
 #: client/gui-gtk-2.0/citydlg.c:583 client/gui-gtk-2.0/inteldlg.c:47
 #: client/gui-win32/citydlg.c:667
 msgid "Science:"
-msgstr "Mokslas:"
+msgstr "Scienco:"
 
 #: client/gui-gtk-2.0/citydlg.c:584 client/gui-win32/citydlg.c:668
 msgid "Granary:"
-msgstr "Svirnas:"
+msgstr "Grenejo:"
 
 #: client/gui-gtk-2.0/citydlg.c:585 client/gui-win32/citydlg.c:669
 msgid "Change in:"
-msgstr "Keičiasi po:"
+msgstr "Ŝanĝu en:"
 
 #: client/gui-gtk-2.0/citydlg.c:586 client/gui-win32/citydlg.c:670
 msgid "Corruption:"
-msgstr "Korupcija:"
+msgstr "Subaĉetado:"
 
 #: client/gui-gtk-2.0/citydlg.c:587 client/gui-win32/citydlg.c:671
 msgid "Waste:"
-msgstr "Atliekos:"
+msgstr "Malŝparo:"
 
 #: client/gui-gtk-2.0/citydlg.c:588 client/gui-win32/citydlg.c:672
 msgid "Pollution:"
-msgstr "Tarša:"
+msgstr "Poluado:"
 
 #: client/gui-gtk-2.0/citydlg.c:642 client/gui-gtk-2.0/inteldlg.c:191
 msgid "_Overview"
-msgstr "_Apžvalga"
+msgstr "_Priskribo"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
-msgstr "Informacija"
+msgstr "Pri"
 
 #: client/gui-gtk-2.0/citydlg.c:678 client/gui-sdl/citydlg.c:2522
 #: client/gui-win32/citydlg.c:782
 msgid "City map"
-msgstr "Miesto žemėlapis"
+msgstr "Urba mapo"
 
 #: client/gui-gtk-2.0/citydlg.c:772
 msgid "Press ENTER or double-click to sell an improvement."
-msgstr ""
-"NorÄ—dami parduoti patobulinimÄ… paspauskite ENTER arba greitai spustelkite "
-"pele du kartus."
+msgstr "Premu ENENKLAVOn aŭ duoble alklaku por vendi urban plibonigaĵon."
 
 #: client/gui-gtk-2.0/citydlg.c:790 client/gui-gtk-2.0/citydlg.c:910
 msgid "Production:"
-msgstr "Gamyba:"
+msgstr "Produktado:"
 
 #: client/gui-gtk-2.0/citydlg.c:827 client/gui-gtk-2.0/citydlg.c:920
 #, c-format
 msgid "%d/%d %d turns"
-msgstr ""
+msgstr "%d/%d %d vicoj"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
-msgstr "_Pirkti"
+msgstr "Aĉ_etu"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
-msgstr "_Gamyba"
+msgstr "_Produktado"
 
 #: client/gui-gtk-2.0/citydlg.c:949
 msgid "_Happiness"
-msgstr "_LaimÄ—"
+msgstr "_Kontenteco"
 
 #: client/gui-gtk-2.0/citydlg.c:1002
 msgid "_Governor"
-msgstr "_Valdytojas"
+msgstr "_Regado"
 
 #: client/gui-gtk-2.0/citydlg.c:1025
 msgid "_Settings"
-msgstr "_Nustatymai"
+msgstr "_Agordoj"
 
 #: client/gui-gtk-2.0/citydlg.c:1028
 msgid "Entertainers"
-msgstr "Linksmintojai"
+msgstr "Vervigantoj"
 
 #: client/gui-gtk-2.0/citydlg.c:1029 client/gui-win32/citydlg.c:1989
 #: client/gui-xaw/citydlg.c:2401
 msgid "Scientists"
-msgstr "Mokslininkai"
+msgstr "Sciencistoj"
 
 #: client/gui-gtk-2.0/citydlg.c:1030 client/gui-win32/citydlg.c:1991
 #: client/gui-xaw/citydlg.c:2401
 msgid "Taxmen"
-msgstr "Mokesčių rinkėjai"
+msgstr "Impostistoj"
 
 #: client/gui-gtk-2.0/citydlg.c:1033 client/gui-win32/citydlg.c:1994
 msgid "Disband if build settler at size 1"
-msgstr "Panaikinti, jei stato kolonistą būdamas dydžio 1"
+msgstr "Forlasu se vi havas farmaron je 1a grando"
 
 #: client/gui-gtk-2.0/citydlg.c:1036
 msgid "Overview page"
-msgstr "Apžvalgos puslapis"
+msgstr "Paĝo pri priskribo"
 
 #: client/gui-gtk-2.0/citydlg.c:1037
 msgid "Production page"
-msgstr "Gamybos puslapis"
+msgstr "Paĝo pri produktado"
 
 #: client/gui-gtk-2.0/citydlg.c:1038
 msgid "Happiness page"
-msgstr "LaimÄ—s puslapis"
+msgstr "Paĝo pri kontenteco"
 
 #: client/gui-gtk-2.0/citydlg.c:1039
 msgid "Governor page"
-msgstr "Valdytojo puslapis"
+msgstr "Paĝo pri regado"
 
 #: client/gui-gtk-2.0/citydlg.c:1040
 msgid "This Settings page"
-msgstr "Nustatymų puslapis"
+msgstr "Tiu ĉi paĝo pri agordoj"
 
 #: client/gui-gtk-2.0/citydlg.c:1041
 msgid "Last active page"
-msgstr "Paskutinis aktyvus puslapis"
+msgstr "Lasta aktiva paĝo"
 
 #: client/gui-gtk-2.0/citydlg.c:1067 client/gui-sdl/citydlg.c:968
 #: client/gui-win32/citydlg.c:1986
 msgid "New citizens are"
-msgstr "Nauji piliečiai yra"
+msgstr "La novaj civitanoj estas"
 
 #: client/gui-gtk-2.0/citydlg.c:1087
 msgid "Next time open"
-msgstr "KitÄ… kartÄ… atverti"
+msgstr "Malfermu venontfoje"
 
 #: client/gui-gtk-2.0/citydlg.c:1109
 msgid "City"
-msgstr "Miestas"
+msgstr "Urbo"
 
 #: client/gui-gtk-2.0/citydlg.c:1116
 msgid "_Rename..."
-msgstr "_Pervadinti..."
+msgstr "_Renomu..."
 
 #: client/gui-gtk-2.0/citydlg.c:1251
 msgid "_List present units..."
-msgstr ""
+msgstr "_Listo pri la ĉeestantaj unuoj..."
 
 #: client/gui-gtk-2.0/citydlg.c:1261
 msgid "_Prev city"
-msgstr "_Ankstesnis miestas"
+msgstr "_AntaÅ­a urbo"
 
 #: client/gui-gtk-2.0/citydlg.c:1266
 msgid "_Next city"
-msgstr "_Kitas miestas"
+msgstr "_Sekva urbo"
 
 #: client/gui-gtk-2.0/citydlg.c:1319
 #, c-format
 msgid "<b>%s</b> - %s citizens"
-msgstr "<b>%s</b> – %s piliečių"
+msgstr "<b>%s</b> - %s civitanoj"
 
 #: client/gui-gtk-2.0/citydlg.c:1324 client/gui-sdl/citydlg.c:3606
 msgid " - DISORDER"
-msgstr " - NETVARKA"
+msgstr " - RIBELO"
 
 #: client/gui-gtk-2.0/citydlg.c:1326 client/gui-sdl/citydlg.c:3609
 msgid " - celebrating"
-msgstr " - švenčia"
+msgstr " - celebrado"
 
 #: client/gui-gtk-2.0/citydlg.c:1328 client/gui-sdl/citydlg.c:3612
 msgid " - happy"
-msgstr " - laimingi"
+msgstr " - kontenteco"
 
 #: client/gui-gtk-2.0/citydlg.c:1414 client/gui-sdl/citydlg.c:3298
 #: client/gui-win32/citydlg.c:453
 msgid "blocked"
-msgstr "užblokuota"
+msgstr "blokita"
 
 #: client/gui-gtk-2.0/citydlg.c:1744
 #, c-format
 msgid "Supported units %d"
-msgstr "Palaikomi daliniai %d"
+msgstr "Subtenitaj unuoj %d"
 
 #: client/gui-gtk-2.0/citydlg.c:1858
 #, c-format
 msgid "Present units %d"
-msgstr "Esantys daliniai %d"
+msgstr "Ĉeestantaj unuoj %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
-msgstr ""
+msgstr "C_entrigu"
 
 #: client/gui-gtk-2.0/citydlg.c:1987 client/gui-gtk-2.0/citydlg.c:2040
 #: client/gui-win32/citydlg.c:1479 client/gui-win32/citydlg.c:1510
 msgid "_Activate unit"
-msgstr "_Aktyvuoti dalinį"
+msgstr "_Aktivigu unuon"
 
 #: client/gui-gtk-2.0/citydlg.c:1993 client/gui-gtk-2.0/citydlg.c:2046
 #: client/gui-win32/citydlg.c:1481 client/gui-win32/citydlg.c:1512
 msgid "Activate unit, _close dialog"
-msgstr "Aktyvuoti dalinį, _uždaryti dialogą"
+msgstr "Aktivigu unuon kaj _fermu la fenestron"
 
 #: client/gui-gtk-2.0/citydlg.c:1999 client/gui-gtk-2.0/citydlg.c:2095
 #: client/gui-win32/citydlg.c:1483 client/gui-win32/citydlg.c:1518
 msgid "_Disband unit"
-msgstr "_Išformuoti dalinį"
+msgstr "Dissolvu _unuon"
 
 #: client/gui-gtk-2.0/citydlg.c:2052
 msgid "_Load unit"
-msgstr "_Įkelti dalinį"
+msgstr "_Åœargu unuon"
 
 #: client/gui-gtk-2.0/citydlg.c:2062
 msgid "_Unload unit"
-msgstr "_Iškelti dalinį"
+msgstr "_Malŝargu unuon"
 
 #: client/gui-gtk-2.0/citydlg.c:2073 client/gui-win32/citydlg.c:1514
 msgid "_Sentry unit"
-msgstr ""
+msgstr "_Gardosoldato"
 
 #: client/gui-gtk-2.0/citydlg.c:2084 client/gui-win32/citydlg.c:1516
 msgid "_Fortify unit"
-msgstr "_Įtvirtinti dalinį"
+msgstr "_Fortigado"
 
 #: client/gui-gtk-2.0/citydlg.c:2101 client/gui-win32/citydlg.c:1520
 msgid "Make new _homecity"
-msgstr ""
+msgstr "Kreu novan hejmurbon"
 
 #: client/gui-gtk-2.0/citydlg.c:2108
 msgid "U_pgrade unit"
-msgstr "_Patobulinti dalinį!"
+msgstr "Äœis_datigu unuon"
 
 #: client/gui-gtk-2.0/citydlg.c:2426 client/gui-sdl/citydlg.c:1159
 #: client/gui-win32/citydlg.c:903 client/gui-xaw/citydlg.c:1890
@@ -10110,14 +10373,14 @@ msgid ""
 "Buy %s for %d gold?\n"
 "Treasury contains %d gold."
 msgstr ""
-"Pirkti %s už %d aukso?\n"
-"Ižde yra %d aukso."
+"Ĉu vi deziras aĉeti %sn per %d oraj moneroj?\n"
+"La ŝtata kaso entenas %d orajn monerojn."
 
 #: client/gui-gtk-2.0/citydlg.c:2429 client/gui-gtk-2.0/citydlg.c:2441
 #: client/gui-win32/citydlg.c:906 client/gui-win32/citydlg.c:915
 #: data/Freeciv.in:2220 data/Freeciv.in:2250
 msgid "Buy It!"
-msgstr "Pirkti!"
+msgstr "Aĉetu ĝin!"
 
 #: client/gui-gtk-2.0/citydlg.c:2438 client/gui-sdl/citydlg.c:1164
 #: client/gui-win32/citydlg.c:912 client/gui-xaw/citydlg.c:1899
@@ -10126,54 +10389,54 @@ msgid ""
 "%s costs %d gold.\n"
 "Treasury contains %d gold."
 msgstr ""
-"%s kainuoja %d aukso.\n"
-"Ižde yra %d aukso."
+"%s kostas %d orajn monerojn.\n"
+"La ŝtata kaso entenas %d orajn monerojn."
 
 #: client/gui-gtk-2.0/citydlg.c:2491 client/gui-sdl/citydlg.c:1406
 #: client/gui-win32/citydlg.c:957 client/gui-xaw/citydlg.c:2301
 #, c-format
 msgid "Sell %s for %d gold?"
-msgstr "Parduoti %s už %d aukso?"
+msgstr "Ĉu vi deziras vendi %sn por %d oraj moneroj?"
 
 #: client/gui-gtk-2.0/citydlg.c:2496 client/gui-win32/citydlg.c:962
 #: data/Freeciv.in:2239
 msgid "Sell It!"
-msgstr "Parduoti!"
+msgstr "Vendu ĝin!"
 
 #: client/gui-gtk-2.0/citydlg.c:2572 client/gui-win32/citydlg.c:1201
 msgid "Rename City"
-msgstr "Pervadinti miestÄ…"
+msgstr "Renomu urbon"
 
 #: client/gui-gtk-2.0/citydlg.c:2573 client/gui-win32/citydlg.c:1202
 #: client/gui-xaw/citydlg.c:1380
 msgid "What should we rename the city to?"
-msgstr "Kaip mes turÄ—tume pervadinti miestÄ…?"
+msgstr "Kiu estas la nova nomo de la urbo?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
-msgstr "_Keisti"
+msgstr "Ŝan_ĝu"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
-msgstr ""
+msgstr "Aldonu _unuan"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
-msgstr ""
+msgstr "Aldonu _sekvan"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
-msgstr ""
+msgstr "Aldonu _lastan"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
-msgstr "_Pašymėti"
+msgstr "_Elektu"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
-msgstr "_Rodyti"
+msgstr "_Ekrano"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10181,100 +10444,105 @@ msgstr "_Rodyti"
 #: client/gui-xaw/menu.c:218 data/Freeciv.in:410 data/Freeciv.in:419
 #: data/Freeciv.in:1561
 msgid "Cities"
-msgstr "Miestai"
+msgstr "Urboj"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
-msgstr ""
+msgstr "_Enketado"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
 #: client/gui-sdl/helpdlg.c:297 client/gui-win32/menu.c:342
 #: client/gui-xaw/menu.c:241
 msgid "Improvements"
-msgstr "Patobulinimai"
+msgstr "Urbaj plibonigoj"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
-msgstr "Stebuklai"
+msgstr "Mirindaĵoj"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
-msgstr "Visi miestai"
+msgstr "Ĉiu urbo"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
-msgstr "Nėra miestų"
+msgstr "Neniu urbo"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
-msgstr "Invertuoti pažymėjimą"
+msgstr "Renversu elektaĵon"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
-msgstr "Statomi dalinai"
+msgstr "Prepari unuojn"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
-msgstr "Statomi patobulinimai"
+msgstr "Prepari plibonigojn"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
-msgstr "Statomi stebuklai"
+msgstr "Konstrui mirindaĵojn"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
-msgstr "Statomas dalinys"
+msgstr "Fondi urbon"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
-msgstr "Statomas patobulinimas"
+msgstr "Prepari plibonigon"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
-msgstr "Statomas stebuklas"
+msgstr "Konstrui mirindaĵon"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
-msgstr "PakrantÄ—s miestai"
+msgstr "Marbordaj urboj"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
-msgstr "Ta pati sala"
+msgstr "Sama insulo"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
-msgstr "Palaikomi daliniai"
+msgstr "Subtenitaj unuoj"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
-msgstr "Esantys daliniai"
+msgstr "Ĉeestantaj unuoj"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
-msgstr "Miesto patobulinimai"
+msgstr "Plibonigoj en la urbo"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
-msgstr "Stebuklai mieste"
+msgstr "Mirindaĵoj en la urbo"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
-msgstr "Prieinami daliniai"
+msgstr "Disponeblaj unuoj"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
-msgstr "Prieinami patobulinimai"
+msgstr "Disponeblaj plibonigoj"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
-msgstr "Prieinami stebuklai"
+msgstr "Disponeblaj mirindaĵoj"
+
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Elspezo:"
 
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
@@ -10291,31 +10559,31 @@ msgstr ""
 #: client/gui-gtk-2.0/cma_fe.c:302 client/gui-win32/cma_fe.c:482
 #: client/gui-win32/repodlgs.c:380 client/gui-xaw/repodlgs.c:755
 msgid "Results"
-msgstr "Rezultatai"
+msgstr "Rezultoj"
 
 #: client/gui-gtk-2.0/cma_fe.c:316 client/gui-sdl/cma_fe.c:887
 #: client/gui-win32/cma_fe.c:215
 msgid "Minimal Surplus"
-msgstr "Minimalus perteklius"
+msgstr "Minim.  troo  "
 
 #: client/gui-gtk-2.0/cma_fe.c:319 client/gui-sdl/cma_fe.c:890
 #: client/gui-win32/cma_fe.c:216
 msgid "Factor"
-msgstr ""
+msgstr "Faktoro"
 
 #: client/gui-gtk-2.0/cma_fe.c:354 client/gui-sdl/cma_fe.c:937
 #: client/gui-win32/cma_fe.c:220 client/gui-xaw/cma_fe.c:179
 #: client/gui-xaw/cma_fe.c:221
 msgid "Celebrate"
-msgstr "Švęsti"
+msgstr "Celebrado"
 
 #: client/gui-gtk-2.0/cma_fe.c:463
 msgid "Governor Enabl_ed"
-msgstr "Valdytojas į_galintas"
+msgstr "_Ebligu reganton"
 
 #: client/gui-gtk-2.0/cma_fe.c:468
 msgid "Governor Disabl_ed"
-msgstr "Valdytojas _uždraustas"
+msgstr "Mal_ebligu reganton"
 
 #: client/gui-gtk-2.0/cma_fe.c:536 client/gui-sdl/cma_fe.c:236
 #: client/gui-sdl/cma_fe.c:308 client/gui-win32/cma_fe.c:385
@@ -10337,212 +10605,210 @@ msgstr ""
 msgid "Remove this preset?"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
-msgstr ""
+msgstr "Iru al _loko"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
-msgstr ""
+msgstr "_Enketi la urbon"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
-msgstr "JÅ«s sakote, kad norite revoliucijos?"
+msgstr "Ĉu vi deziras la revolucion?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
-msgstr "Revoliucija!"
+msgstr "Revolucio!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
-msgstr "KÄ… plÄ—Å¡ti"
+msgstr "Kio estas disrabenda"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
-msgstr "Pasirinkite, kÄ… plÄ—Å¡ti:"
+msgstr "Kio estas disrabenda:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
-msgstr "Dalinys"
+msgstr "Unuo"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
-msgstr "Vardas"
+msgstr "Nomo"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
-msgstr "Dalinio pasirinkimas"
+msgstr "Elekto de unuo"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
-msgstr "_Paruošti visus"
+msgstr "_Vekigu ĉiujn"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
-msgstr ""
+msgstr "PaÅ­zigu la gardo_soldaton"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
-msgstr "Tautų _grupės:"
+msgstr "Naciaj _grupoj:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
-msgstr "Kokia tauta Jūs būsite?"
+msgstr "Kiu nacio vi deziras esti?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
-msgstr "Pasirinkite tautÄ…"
+msgstr "Elektu nacion"
 
-#: client/gui-gtk-2.0/dialogs.c:772
-#, fuzzy
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
-msgstr "AtsitiktinÄ— tauta"
+msgstr "_Hazarda nacio"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
-msgstr "IÅ¡sirinkite tautÄ…"
+msgstr "Elektu nacion"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
-msgstr "_YpatybÄ—s"
+msgstr "_Ecoj"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
-msgstr "_Vadovas"
+msgstr "_Estro:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
-msgstr "_Moteris"
+msgstr "_Ina"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
-msgstr "_Vyras"
+msgstr "_Malina"
 
-#: client/gui-gtk-2.0/dialogs.c:861
-#, fuzzy
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
-msgstr "_Miestų stilius"
+msgstr "Urbaj _stiloj:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
-#, fuzzy
+#: client/gui-gtk-2.0/dialogs.c:902
 msgid "_Description"
-msgstr "_Legenda"
+msgstr "_Priskribo"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
-msgstr "Jūs privalote nurodyti savo lytį."
+msgstr "Vi devas elekti vian sekson."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
-msgstr "Jūs privalote nurodyti miestų stilių."
+msgstr "Vi devas elekti vian urban stilon"
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
-msgstr "Jūs turite įvesti galiojantį vardą."
+msgstr "Vi devas tajpi validan nomon."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
-msgstr "Patobulinti dalinį!"
+msgstr "Äœisdatigu unuojn!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
 msgid "Upgrade Obsolete Units"
-msgstr "Patobulinti pasenusius dalinius."
+msgstr "Äœisdatigu arkaikajn unuojn"
 
 #: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
 #: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
 msgid "World-map"
-msgstr "Pasaulio žemėlapis"
+msgstr "Ter-mapo"
 
 #: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
 #: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
 msgid "Sea-map"
-msgstr "Jūros žemėlapis"
+msgstr "Mar-mapo"
 
 #: client/gui-gtk-2.0/diplodlg.c:243
 msgid "_Maps"
-msgstr "Že_mėlapiai"
+msgstr "_Mapoj"
 
 #: client/gui-gtk-2.0/diplodlg.c:274
 msgid "_Advances"
-msgstr "_Pasiekimai"
+msgstr "_Avanaĵoj"
 
 #: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:910
 #: client/gui-win32/menu.c:399
 msgid "_Cities"
-msgstr "_Miestai"
+msgstr "_Urboj"
 
 #: client/gui-gtk-2.0/diplodlg.c:333
 msgid "_Give shared vision"
-msgstr ""
+msgstr "Doni komunan vidon"
 
 #: client/gui-gtk-2.0/diplodlg.c:346
 msgid "Give _embassy"
-msgstr "Duoti _ambasadÄ…"
+msgstr ""
 
 #: client/gui-gtk-2.0/diplodlg.c:376
 msgid "_Pacts"
-msgstr "_Paktai"
+msgstr "_Paktoj"
 
 #: client/gui-gtk-2.0/diplodlg.c:466
 #, c-format
 msgid "Diplomacy: %s"
-msgstr "Diplomatija: %s"
+msgstr "Diplomatio: %s"
 
 #: client/gui-gtk-2.0/diplodlg.c:473
 msgid "_Cancel meeting"
-msgstr "_Atšaukti susitikimą"
+msgstr "_Nuligi renkontiĝon"
 
 #: client/gui-gtk-2.0/diplodlg.c:475
 msgid "Accept _treaty"
-msgstr "Primti _sutartį"
+msgstr "Konsenti"
 
 #: client/gui-gtk-2.0/diplodlg.c:503
 msgid "C_lauses:"
-msgstr "_SÄ…lygos:"
+msgstr "K_laÅ­zoj:"
 
 #: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
 msgid "_Gold:"
-msgstr "_Auksas:"
+msgstr "_Oro:"
 
 #: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
 msgid "_Add Clause..."
-msgstr "_PridÄ—ti sÄ…lygÄ…"
+msgstr "_Aldonu klaÅ­zon..."
 
 #: client/gui-gtk-2.0/diplodlg.c:699
 msgid "--- This treaty is blank. Please add some clauses. ---"
-msgstr "---Sutartis tuščia. Pridėk kokių nors sąlygų. ---"
+msgstr ""
 
 #: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
 #: client/gui-win32/diplodlg.c:263 client/gui-xaw/diplodlg.c:949
 msgid "Invalid amount of gold specified."
-msgstr "Pateiktas blogas aukso kiekis."
+msgstr "Nevalida kvanto da oro estis specifita."
 
 #: client/gui-gtk-2.0/finddlg.c:64 client/gui-sdl/finddlg.c:129
 #: client/gui-sdl/mapctrl.c:1591 client/gui-win32/finddlg.c:115
 #: client/gui-xaw/menu.c:128 data/Freeciv.in:1066
 msgid "Find City"
-msgstr "Rasti miestÄ…"
+msgstr "Trovu urbon"
 
 #: client/gui-gtk-2.0/finddlg.c:105 client/gui-gtk-2.0/gotodlg.c:175
 msgid "Ci_ties:"
-msgstr "_Miestai:"
+msgstr "_Urboj:"
 
 #: client/gui-gtk-2.0/gamedlgs.c:227 client/gui-win32/ratesdlg.c:295
+#, fuzzy
 msgid "Select tax, luxury and science rates"
-msgstr ""
+msgstr "Elektu impostan, luksan kaj sciencan kvantojn"
 
 #: client/gui-gtk-2.0/gamedlgs.c:259 client/gui-gtk-2.0/gamedlgs.c:279
 #: client/gui-gtk-2.0/gamedlgs.c:299 client/gui-sdl/repodlgs.c:1894
@@ -10550,43 +10816,43 @@ msgstr ""
 #: client/gui-win32/ratesdlg.c:318 client/gui-win32/ratesdlg.c:324
 #: data/Freeciv.in:1311 data/Freeciv.in:1329 data/Freeciv.in:1348
 msgid "Lock"
-msgstr ""
+msgstr "Bloku"
 
 #: client/gui-gtk-2.0/gamedlgs.c:354 client/gui-win32/ratesdlg.c:331
 #: client/gui-xaw/ratesdlg.c:98
 #, c-format
 msgid "%s max rate: %d%%"
-msgstr ""
+msgstr "Maks. procento por %s: %d%%"
 
 #: client/gui-gtk-2.0/gamedlgs.c:456 client/gui-win32/optiondlg.c:106
 #: data/Freeciv.in:1228
 msgid "Set local options"
-msgstr ""
+msgstr "Agordu lokajn opciojn"
 
 #: client/gui-gtk-2.0/gotodlg.c:122 client/gui-win32/gotodlg.c:153
 #: client/gui-win32/gotodlg.c:161 data/Freeciv.in:1104
 msgid "Goto/Airlift Unit"
-msgstr "Eiti į/perkelti dalinį"
+msgstr "Iru al/Flugtransportu unuon"
 
 #: client/gui-gtk-2.0/gotodlg.c:127
 msgid "Air_lift"
-msgstr ""
+msgstr "F_lugtransportu"
 
 #: client/gui-gtk-2.0/gotodlg.c:129
 msgid "_Goto"
-msgstr "_Eiti į"
+msgstr "_Iru al"
 
 #: client/gui-gtk-2.0/gotodlg.c:140 client/gui-sdl/gotodlg.c:234
 msgid "Select destination"
-msgstr "Pasirinkti tikslÄ…"
+msgstr "Elektu alvenpunkton"
 
 #: client/gui-gtk-2.0/gotodlg.c:183
 msgid "Show _All Cities"
-msgstr "Rodyti _visus miestus"
+msgstr "Vidigu _ĉiujn urbojn"
 
 #: client/gui-gtk-2.0/gui_main.c:150
 msgid "Show Map Scrollbars"
-msgstr ""
+msgstr "Vidigu rulumstangojn"
 
 #: client/gui-gtk-2.0/gui_main.c:151
 msgid "Disable this option to hide the scrollbars on the map view."
@@ -10594,7 +10860,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/gui_main.c:155
 msgid "Keyboardless goto"
-msgstr "Nereikalaujantis klaviatūros eiti į"
+msgstr "\"Iru al\" senklavare"
 
 #: client/gui-gtk-2.0/gui_main.c:156
 msgid ""
@@ -10604,7 +10870,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/gui_main.c:161
 msgid "Keep dialogs on top"
-msgstr ""
+msgstr "Tenu la dialgofenestrojn supre"
 
 #: client/gui-gtk-2.0/gui_main.c:162
 msgid ""
@@ -10614,7 +10880,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/gui_main.c:166
 msgid "Show worklist task icons"
-msgstr "Rodyti darbų sąrašų užduočių ikonas"
+msgstr "Vidigu ikonojn de la taskoj de la laborlisto"
 
 #: client/gui-gtk-2.0/gui_main.c:167
 msgid ""
@@ -10624,7 +10890,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/gui_main.c:171
 msgid "Enable status report tabs"
-msgstr ""
+msgstr "Ebligu la langetojn de la raportoj pri la stato"
 
 #: client/gui-gtk-2.0/gui_main.c:172
 msgid ""
@@ -10634,7 +10900,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/gui_main.c:177 client/gui-win32/gui_main.c:110
 msgid "Better fog-of-war drawing"
-msgstr "Gerenis karo rūko piešimas"
+msgstr "Plejbona bildigo de militnebulo"
 
 #: client/gui-gtk-2.0/gui_main.c:178 client/gui-win32/gui_main.c:111
 msgid ""
@@ -10656,12 +10922,12 @@ msgstr "Freeciv"
 #: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
 #: data/Freeciv.in:2618
 msgid "Turn Done"
-msgstr "Ä–jimas baigtas"
+msgstr "Fino de la vico"
 
 #: client/gui-gtk-2.0/gui_main.c:1095 client/gui-sdl/mapctrl.c:1566
 #: client/gui-sdl/mapview.c:1082
 msgid "Shift+Return"
-msgstr "Shift+Return"
+msgstr "Åœvkl+Enenklavo"
 
 #: client/gui-gtk-2.0/gui_main.c:1127 client/gui-gtk-2.0/menu.c:770
 #: client/gui-gtk-2.0/menu.c:772 client/gui-gtk-2.0/menu.c:774
@@ -10679,11 +10945,11 @@ msgstr "Shift+Return"
 #: client/gui-gtk-2.0/menu.c:820 client/gui-gtk-2.0/menu.c:822
 #: data/Freeciv.in:2028
 msgid "View"
-msgstr "Rodymas"
+msgstr "Videbligo"
 
 #: client/gui-gtk-2.0/gui_main.c:1208
 msgid "Chat"
-msgstr "Pokalbis"
+msgstr "_Babillineo"
 
 #: client/gui-gtk-2.0/gui_main.c:1224 client/gui-win32/gui_main.c:538
 #: data/Freeciv.in:2809
@@ -10692,71 +10958,81 @@ msgid ""
 "under certain conditions; See the \"Copying\" item on the Help menu.\n"
 "Now.. Go give'em hell!"
 msgstr ""
-"Freeciv yra nemokama programa ir jūs galite platinti ją\n"
-"pagal tam tikras sąlygas; Žiūrėk punktą „Kopijavimas“ pagalbos menu.\n"
-"Dabar.. Eikite ir duokite jiems velnių!"
+"Freeciv estas libera programaro kaj vi bonvolu disdoni kopiojn de ĝi\n"
+"laŭ specifaj kondiĉoj; legu la \"Permesilo\" eron en menuo de Helpo.\n"
+"Nun... diablo ilin prenu!"
 
 #: client/gui-gtk-2.0/gui_main.c:1491
 msgid "Not _ready"
-msgstr "_Nepasiruošęs"
+msgstr "Ne preta"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
-msgstr "_Pasiruošęs"
+msgstr "_Preta"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
-msgstr "_PradÄ—ti"
+msgstr "_Startigu"
+
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Prenu tiun ĉi ludanton"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
-msgstr "IÅ¡sirink _tautÄ…"
+msgstr "Elektu _nacion"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
-msgstr "_StebÄ—ti"
+msgstr "_Observi"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
-#, fuzzy
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
-msgstr "_NebestebÄ—ti"
+msgstr "Ne _observi"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
+#, fuzzy
 msgid "<AI>"
-msgstr "<DI>"
+msgstr "AI"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
+#, fuzzy
 msgid "<Novice AI>"
-msgstr "<Pradedantysis DI>"
+msgstr "Novico"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
+#, fuzzy
 msgid "<Easy AI>"
-msgstr "<Lengvas DI>"
+msgstr "Facila"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
+#, fuzzy
 msgid "<Normal AI>"
-msgstr "<Vidutinis DI>"
+msgstr "Normala"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
+#, fuzzy
 msgid "<Hard AI>"
-msgstr "<Sunkus DI>"
+msgstr "Malfacila"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
-msgstr "AtsitiktinÄ—"
+msgstr "Hazarda"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
-msgstr "StebÄ—tojas"
+msgstr "Observanto"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
-msgstr "Atsijungęs"
+msgstr "Malkonektigita"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
-msgstr "Ar tikrai norite išeiti?"
+msgstr "Ĉu vi deziras eliri?"
 
 #: client/gui-gtk-2.0/gui_stuff.c:577
 #, c-format
@@ -10764,17 +11040,19 @@ msgid ""
 "Close Tab:\n"
 "%s"
 msgstr ""
+"Fermu langeton:\n"
+"%s"
 
 #: client/gui-gtk-2.0/gui_stuff.c:577
 msgid "Ctrl+W"
-msgstr "Ctrl+W"
+msgstr "Strkl+W"
 
 #: client/gui-gtk-2.0/happiness.c:112 client/gui-sdl/citydlg.c:2042
 #: client/gui-sdl/citydlg.c:3721 client/gui-win32/citydlg.c:726
 #: client/gui-win32/happiness.c:86 client/gui-xaw/menu.c:249
 #: data/helpdata.txt:1391
 msgid "Happiness"
-msgstr "LaimÄ—"
+msgstr "Kontenteco"
 
 #: client/gui-gtk-2.0/helpdlg.c:88 client/gui-gtk-2.0/helpdlg.c:91
 #: client/gui-gtk-2.0/helpdlg.c:95 client/gui-sdl/helpdlg.c:344
@@ -10782,13 +11060,13 @@ msgstr "LaimÄ—"
 #: client/gui-win32/helpdlg.c:82 client/gui-win32/helpdlg.c:86
 #: data/Freeciv.in:636 data/Freeciv.in:778
 msgid "Cost:"
-msgstr "Kaina:"
+msgstr "Kosto:"
 
 #: client/gui-gtk-2.0/helpdlg.c:88 client/gui-sdl/helpdlg.c:352
 #: client/gui-sdl/helpdlg.c:744 client/gui-win32/helpdlg.c:79
 #: data/Freeciv.in:653
 msgid "Upkeep:"
-msgstr "IÅ¡laikymas:"
+msgstr "Tenado:"
 
 #: client/gui-gtk-2.0/helpdlg.c:88 client/gui-gtk-2.0/helpdlg.c:91
 #: client/gui-gtk-2.0/helpdlg.c:99 client/gui-sdl/helpdlg.c:363
@@ -10796,78 +11074,78 @@ msgstr "IÅ¡laikymas:"
 #: client/gui-win32/helpdlg.c:82 client/gui-win32/helpdlg.c:90
 #: data/Freeciv.in:694
 msgid "Requirement:"
-msgstr "Reikalinga:"
+msgstr "Necesaĵoj:"
 
 #: client/gui-gtk-2.0/helpdlg.c:91 client/gui-gtk-2.0/helpdlg.c:99
 #: client/gui-sdl/helpdlg.c:395 client/gui-sdl/helpdlg.c:809
 #: client/gui-win32/helpdlg.c:82 client/gui-win32/helpdlg.c:90
 #: data/Freeciv.in:732
 msgid "Obsolete by:"
-msgstr "Pasensta prie:"
+msgstr "Arkaika kun:"
 
 #: client/gui-gtk-2.0/helpdlg.c:95 client/gui-sdl/helpdlg.c:768
 #: client/gui-win32/helpdlg.c:86 data/Freeciv.in:795
 msgid "Attack:"
-msgstr "Puolimas:"
+msgstr "Atako:"
 
 #: client/gui-gtk-2.0/helpdlg.c:96 client/gui-sdl/helpdlg.c:769
 #: client/gui-win32/helpdlg.c:87 data/Freeciv.in:813
 msgid "Defense:"
-msgstr "Gynyba:"
+msgstr "Defendo:"
 
 #: client/gui-gtk-2.0/helpdlg.c:96 client/gui-sdl/helpdlg.c:770
 #: client/gui-win32/helpdlg.c:87 data/Freeciv.in:831
 msgid "Move:"
-msgstr ""
+msgstr "Movo:"
 
 #: client/gui-gtk-2.0/helpdlg.c:97 client/gui-sdl/helpdlg.c:772
 #: client/gui-win32/helpdlg.c:88
 msgid "FirePower:"
-msgstr "Å aunamoji galia:"
+msgstr "Pafpovo:"
 
 #: client/gui-gtk-2.0/helpdlg.c:97 client/gui-sdl/helpdlg.c:773
 #: client/gui-win32/helpdlg.c:88 data/Freeciv.in:876
 msgid "Hitpoints:"
-msgstr "Gyvybės taškai:"
+msgstr "Pafceloj:"
 
 #: client/gui-gtk-2.0/helpdlg.c:98 client/gui-win32/helpdlg.c:89
 #: data/Freeciv.in:912
 msgid "Basic Upkeep:"
-msgstr "Pradinė išlaikymo kaina:"
+msgstr "Baza tenado:"
 
 #: client/gui-gtk-2.0/helpdlg.c:98 client/gui-sdl/helpdlg.c:771
 #: client/gui-win32/helpdlg.c:89 data/Freeciv.in:894
 msgid "Vision:"
-msgstr "RegÄ—jimo laukas:"
+msgstr "Vido:"
 
 #: client/gui-gtk-2.0/helpdlg.c:104 client/gui-win32/helpdlg.c:95
 msgid "Move/Defense:"
-msgstr "Ä–jimai/Gynyba:"
+msgstr "Movo/defendo:"
 
 #: client/gui-gtk-2.0/helpdlg.c:104 client/gui-win32/helpdlg.c:95
 msgid "Food/Res/Trade:"
-msgstr ""
+msgstr "Nutraĵo/Prod/Kom:"
 
 #: client/gui-gtk-2.0/helpdlg.c:105 client/gui-win32/helpdlg.c:96
 #: data/Freeciv.in:972
 msgid "Resources:"
-msgstr "Resursai:"
+msgstr "Risurcoj:"
 
 #: client/gui-gtk-2.0/helpdlg.c:106 client/gui-win32/helpdlg.c:97
 msgid "Road Rslt/Time:"
-msgstr ""
+msgstr "Vojo Rez/Tempo:"
 
 #: client/gui-gtk-2.0/helpdlg.c:106 client/gui-win32/helpdlg.c:97
 msgid "Irrig. Rslt/Time:"
-msgstr ""
+msgstr "Irig. Rez/Tempo:"
 
 #: client/gui-gtk-2.0/helpdlg.c:107 client/gui-win32/helpdlg.c:98
 msgid "Mine Rslt/Time:"
-msgstr ""
+msgstr "Minejo Rez/Tempo:"
 
 #: client/gui-gtk-2.0/helpdlg.c:107 client/gui-win32/helpdlg.c:98
 msgid "Trans. Rslt/Time:"
-msgstr ""
+msgstr "Trans. Rez/Tempo:"
 
 #: client/gui-gtk-2.0/helpdlg.c:111 client/gui-win32/helpdlg.c:165
 #: client/gui-win32/helpdlg.c:501 client/gui-win32/helpdlg.c:544
@@ -10876,43 +11154,43 @@ msgstr ""
 #: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
 #: client/gui-xaw/helpdlg.c:878
 msgid "(Never)"
-msgstr "(Niekada)"
+msgstr "(Neniam)"
 
 #: client/gui-gtk-2.0/helpdlg.c:129 client/gui-xaw/helpdlg.c:123
 #: client/gui-xaw/menu.c:253 data/helpdata.txt:37
 msgid "About"
-msgstr "Apie"
+msgstr "Pri"
 
 #: client/gui-gtk-2.0/helpdlg.c:196 client/gui-xaw/helpdlg.c:269
 msgid "Removed"
-msgstr "Pašalinta"
+msgstr "Formovita"
 
 #: client/gui-gtk-2.0/helpdlg.c:426 client/gui-win32/helpdlg.c:424
 #: data/Freeciv.in:576
 msgid "Freeciv Help Browser"
-msgstr "Freeciv pagalbos naršyklė"
+msgstr "Helpilo pri Freeciv"
 
 #: client/gui-gtk-2.0/helpdlg.c:654
 msgid "Expand All"
-msgstr "IÅ¡skleisti viskÄ…:"
+msgstr "Etendu ĉion"
 
 #: client/gui-gtk-2.0/helpdlg.c:655
 msgid "Collapse All"
-msgstr "Sutraukti viskÄ…:"
+msgstr "Maletendu ĉion"
 
 #: client/gui-gtk-2.0/helpdlg.c:939 client/gui-gtk-2.0/helpdlg.c:966
 #: client/gui-gtk-2.0/helpdlg.c:978 client/gui-gtk-2.0/helpdlg.c:987
 #: client/gui-gtk-2.0/helpdlg.c:1004 client/gui-sdl/helpdlg.c:978
 msgid "Allows"
-msgstr "Leidžia"
+msgstr "Ebligas"
 
 #: client/gui-gtk-2.0/helpdlg.c:951
 msgid "Obsoletes"
-msgstr "Pasensta"
+msgstr "Igas arkaika"
 
 #: client/gui-gtk-2.0/helpdlg.c:991 client/gui-gtk-2.0/helpdlg.c:1008
 msgid "with"
-msgstr "su"
+msgstr "kun"
 
 #: client/gui-gtk-2.0/helpdlg.c:996 client/gui-gtk-2.0/helpdlg.c:1013
 msgid "?techhelp:"
@@ -10922,13 +11200,13 @@ msgstr "?techhelp:"
 #: client/gui-xaw/helpdlg.c:996
 #, c-format
 msgid "+%d Trade / %d"
-msgstr ""
+msgstr "+%d Komerco / %d"
 
 #: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
 #: client/gui-xaw/helpdlg.c:1000
 #, c-format
 msgid "no extra / %d"
-msgstr ""
+msgstr "neniu pluso / %d"
 
 #: client/gui-gtk-2.0/helpdlg.c:1067 client/gui-gtk-2.0/helpdlg.c:1071
 #: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:598
@@ -10937,81 +11215,82 @@ msgstr ""
 #: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
 #: client/gui-xaw/helpdlg.c:1039
 msgid "n/a"
-msgstr "nÄ—ra"
+msgstr "-"
 
 #: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
 #: client/gui-xaw/helpdlg.c:1009
 #, c-format
 msgid "+%d Food / %d"
-msgstr "+%d maisto / %d"
+msgstr "+%d Nutraĵo / %d"
 
 #: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
 #: client/gui-xaw/helpdlg.c:1023
 #, c-format
 msgid "+%d Res. / %d"
-msgstr "+%d res. / %d"
+msgstr "+%d Prod. / %d"
 
 #: client/gui-gtk-2.0/inteldlg.c:41
 msgid "Ruler:"
-msgstr "Valdovas:"
+msgstr "Estro:"
 
 #: client/gui-gtk-2.0/inteldlg.c:42
 msgid "Government:"
-msgstr "VyriausybÄ—:"
+msgstr "Regsistemo:"
 
 #: client/gui-gtk-2.0/inteldlg.c:43
 msgid "Capital:"
-msgstr "SostinÄ—:"
+msgstr "Ĉefurbo:"
 
 #: client/gui-gtk-2.0/inteldlg.c:46
 msgid "Tax:"
-msgstr "Mokesčiai:"
+msgstr "Impostado:"
 
 #: client/gui-gtk-2.0/inteldlg.c:50
 msgid "Researching:"
-msgstr "TyrinÄ—jimai:"
+msgstr "Studado:"
 
 #: client/gui-gtk-2.0/inteldlg.c:239
 msgid "_Diplomacy"
-msgstr "_Diplomatija"
+msgstr "_Diplomacio"
 
 #: client/gui-gtk-2.0/inteldlg.c:274
 msgid "_Techs"
-msgstr "_Technologijos"
+msgstr "_Teĥnologioj"
 
 #: client/gui-gtk-2.0/inteldlg.c:299
 #, c-format
 msgid "Foreign Intelligence: %s Empire"
-msgstr "Užsienio žvalgyba: %s imperija"
+msgstr "Spionado: Imperio %s"
 
 #: client/gui-gtk-2.0/mapctrl.c:195 client/gui-sdl/mapctrl.c:2565
 #: client/gui-sdl/menu.c:839 client/gui-sdl/menu.c:1021
 #: client/gui-win32/mapctrl.c:353
 msgid "Build New City"
-msgstr "Statyti naujÄ… miestÄ…"
+msgstr "Konstruu novan urbon"
 
 #: client/gui-gtk-2.0/mapctrl.c:196 client/gui-sdl/mapctrl.c:2594
 #: client/gui-win32/mapctrl.c:354 client/gui-xaw/mapctrl.c:89
 msgid "What should we call our new city?"
-msgstr "Kaip turėtume pavadinti mūsų naująjį miestą?"
+msgstr "Kiel ni devas nomi nian novan urbon?"
 
 #: client/gui-gtk-2.0/mapview.c:147
+#, fuzzy
 msgid "Shows your current luxury/science/tax rates;click to toggle them."
 msgstr ""
+"Vidigu la nunan kvanto pri lukso/scienco/imposto; alklaku ĉi tie por "
+"mastrumi ilin."
 
 #: client/gui-gtk-2.0/mapview.c:692 client/gui-win32/canvas.c:275
 msgid "Better fog will only work in truecolor.  Disabling it"
-msgstr ""
-"Geresnis rūkas bus naudojamas dirbant tikrų spalvų režimu, todėl palaikymas "
-"išjungiamas."
+msgstr "Nebulo plenumas bone nur en verkolora moduso.  Malebligu ĝin"
 
 #: client/gui-gtk-2.0/menu.c:250
 msgid "Leaving a local game will end it!"
-msgstr "Išėjimas iš vietinio žaidimo jį užbaigs"
+msgstr "Forlaso de loka ludo estas la fino de la ludo mem!"
 
 #: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
 msgid "_Game"
-msgstr "Žai_dimas"
+msgstr "_Ludo"
 
 #: client/gui-gtk-2.0/menu.c:702 client/gui-gtk-2.0/menu.c:704
 #: client/gui-gtk-2.0/menu.c:706 client/gui-gtk-2.0/menu.c:708
@@ -11024,64 +11303,66 @@ msgstr "Žai_dimas"
 #: client/gui-gtk-2.0/menu.c:738 client/gui-gtk-2.0/menu.c:740
 #: data/Freeciv.in:2026
 msgid "Game"
-msgstr "Žaidimas"
+msgstr "Ludo"
 
 #: client/gui-gtk-2.0/menu.c:704 client/gui-gtk-2.0/menu.c:706
 #: client/gui-gtk-2.0/menu.c:708
 msgid "_Chat"
-msgstr "_Pokalbis"
+msgstr "_Babillineo"
 
 #: client/gui-gtk-2.0/menu.c:706 client/gui-win32/menu.c:314
 msgid "_Clear Log"
-msgstr "_Valyti žurnalą"
+msgstr "_Vakigu protokolon"
 
 #: client/gui-gtk-2.0/menu.c:708 client/gui-win32/menu.c:313
 msgid "_Write Log"
-msgstr ""
+msgstr "_Skribu protokolon"
 
 #: client/gui-gtk-2.0/menu.c:710 client/gui-win32/menu.c:304
 msgid "Local _Options"
-msgstr "Vietiniai _nustatymai"
+msgstr "Lokaj _opcioj"
 
 #: client/gui-gtk-2.0/menu.c:712 client/gui-win32/menu.c:305
 msgid "_Message Options"
-msgstr "_Pranešimų nustatymai"
+msgstr "Opcioj de _mesaĝoj"
 
 #: client/gui-gtk-2.0/menu.c:717
 msgid "_Reload Tileset"
-msgstr ""
+msgstr "_Reŝargu grafikaĵon"
 
 #: client/gui-gtk-2.0/menu.c:720
 msgid "Save Options on _Exit"
-msgstr "Išsaugoti nustatymus _išeinant"
+msgstr "Konservu opciojn _elirante"
 
 #: client/gui-gtk-2.0/menu.c:722
+#, fuzzy
 msgid "Sa_ve Options"
-msgstr "IÅ¡saugoti _nustatymus"
+msgstr "Foraj opcioj"
 
 #: client/gui-gtk-2.0/menu.c:726 client/gui-win32/menu.c:308
 msgid "Server O_ptions"
-msgstr "Serverio n_ustatymai"
+msgstr "O_pcioj de la servilo"
 
 #: client/gui-gtk-2.0/menu.c:730 client/gui-win32/menu.c:310
 msgid "_Save Game"
-msgstr "_Išsaugoti žaidimą"
+msgstr "_Konservu ludon"
 
 #: client/gui-gtk-2.0/menu.c:733 client/gui-win32/menu.c:311
 msgid "Save Game _As..."
-msgstr "Išsaugoti žaidimą _kaip..."
+msgstr "Konservu ludon k_iel..."
 
 #: client/gui-gtk-2.0/menu.c:738
 msgid "_Leave"
-msgstr "IÅ¡ei_ti"
+msgstr "_Forlasu"
 
 #: client/gui-gtk-2.0/menu.c:740 client/gui-win32/menu.c:317
 msgid "_Quit"
-msgstr "_IÅ¡jungti"
+msgstr "_Eliro"
 
 #: client/gui-gtk-2.0/menu.c:745 client/gui-win32/menu.c:321
+#, fuzzy
 msgid "Gov_ernment"
-msgstr "_VyriausybÄ—"
+msgstr "Regsistemo"
 
 #: client/gui-gtk-2.0/menu.c:747 client/gui-gtk-2.0/menu.c:749
 #: client/gui-gtk-2.0/menu.c:751 client/gui-gtk-2.0/menu.c:753
@@ -11089,122 +11370,123 @@ msgstr "_VyriausybÄ—"
 #: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
 #: client/gui-xaw/menu.c:248 data/Freeciv.in:2027 data/helpdata.txt:1320
 msgid "Government"
-msgstr "VyriausybÄ—"
+msgstr "Regsistemo"
 
 #: client/gui-gtk-2.0/menu.c:749 client/gui-win32/menu.c:322
 msgid "_Tax Rates"
-msgstr ""
+msgstr "_Impostado"
 
 #: client/gui-gtk-2.0/menu.c:753 client/gui-win32/menu.c:324
 msgid "_Find City"
-msgstr "_Rasti miestÄ…"
+msgstr "_Trovu urbon"
 
 #: client/gui-gtk-2.0/menu.c:755 client/gui-win32/menu.c:325
 msgid "_Worklists"
-msgstr "_Darbų sąrašai"
+msgstr "_Laborlistoj"
 
 #: client/gui-gtk-2.0/menu.c:759 client/gui-gtk-2.0/menu.c:761
 #: client/gui-gtk-2.0/menu.c:764 client/gui-win32/menu.c:327
+#, fuzzy
 msgid "_Change Government"
-msgstr "_Keisti vyriausybÄ™"
+msgstr "_Regsistemo"
 
 #: client/gui-gtk-2.0/menu.c:761
 msgid "_Revolution..."
-msgstr "_Revoliucija..."
+msgstr "_Revolucio..."
 
 #: client/gui-gtk-2.0/menu.c:764 client/gui-gtk-2.0/menu.c:970
 #: client/gui-win32/menu.c:431
 msgid "_Government"
-msgstr "_VyriausybÄ—"
+msgstr "_Regsistemo"
 
 #: client/gui-gtk-2.0/menu.c:768 client/gui-gtk-2.0/menu.c:916
 #: client/gui-win32/menu.c:334
 msgid "_View"
-msgstr "_Rodymas"
+msgstr "_Videbligo"
 
 #: client/gui-gtk-2.0/menu.c:772
 msgid "City Outlines"
-msgstr ""
+msgstr "Limoj de la urbo"
 
 #: client/gui-gtk-2.0/menu.c:774 client/gui-win32/menu.c:335
 msgid "Map _Grid"
-msgstr ""
+msgstr "Map_krado"
 
 #: client/gui-gtk-2.0/menu.c:776 client/gui-win32/menu.c:336
 msgid "National _Borders"
-msgstr "NacionalinÄ—s _sienos"
+msgstr "Landlimoj"
 
 #: client/gui-gtk-2.0/menu.c:778 client/gui-win32/menu.c:337
 msgid "City _Names"
-msgstr "Miestų _vardai"
+msgstr "_Nomoj de la urboj"
 
 #: client/gui-gtk-2.0/menu.c:780 client/gui-win32/menu.c:338
 msgid "City G_rowth"
-msgstr ""
+msgstr "_Pliiĝoj de la urboj"
 
 #: client/gui-gtk-2.0/menu.c:782 client/gui-win32/menu.c:339
 msgid "City _Productions"
-msgstr ""
+msgstr "_Produktadoj de la urbo"
 
 #: client/gui-gtk-2.0/menu.c:784 client/gui-sdl/optiondlg.c:1719
 msgid "Draw city worker map grid"
-msgstr "Piešti miesto darbuotojų žemėlapio tinklą"
+msgstr "Desegnu mapkradon de la urbaj laboristoj"
 
 #: client/gui-gtk-2.0/menu.c:788 client/gui-sdl/optiondlg.c:1635
 #: client/gui-win32/menu.c:340 client/gui-xaw/menu.c:148
 #: client/gui-xaw/menu.c:246 manual/civmanual.c:220 data/helpdata.txt:1220
 msgid "Terrain"
-msgstr "Reljefas"
+msgstr "Grundo"
 
 #: client/gui-gtk-2.0/menu.c:790 client/gui-win32/menu.c:341
 #: client/gui-xaw/menu.c:149
 msgid "Coastline"
-msgstr "PakrantÄ—"
+msgstr "Marbordo"
 
 #: client/gui-gtk-2.0/menu.c:796 client/gui-win32/menu.c:343
 msgid "Roads & Rails"
-msgstr "Keliai ir geležinkeliai"
+msgstr "Vojoj kaj fervojoj"
 
 #: client/gui-gtk-2.0/menu.c:800 client/gui-sdl/optiondlg.c:1933
 #: client/gui-win32/menu.c:345 client/gui-xaw/menu.c:152
 msgid "Mines"
-msgstr "Kasyklos"
+msgstr "Minejoj"
 
 #: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
 msgid "Fortress & Airbase"
-msgstr "Fortai ir oro bazÄ—s"
+msgstr "Fortresoj kaj Aviaj Bazoj"
 
 #: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
 #: client/gui-xaw/menu.c:154
 msgid "Specials"
-msgstr ""
+msgstr "Specialaj risurcoj"
 
 #: client/gui-gtk-2.0/menu.c:806 client/gui-win32/menu.c:349
 #: client/gui-xaw/menu.c:155
 msgid "Pollution & Fallout"
-msgstr "Užterštumas ir radioaktyvios dulkės"
+msgstr "Poluo kaj radioaktiveco"
 
 #: client/gui-gtk-2.0/menu.c:812 client/gui-win32/menu.c:352
 #: client/gui-xaw/menu.c:158
 msgid "Focus Unit"
-msgstr ""
+msgstr "Aktiva unuo"
 
 #: client/gui-gtk-2.0/menu.c:814 client/gui-sdl/optiondlg.c:1854
 #: client/gui-win32/menu.c:353 client/gui-xaw/menu.c:159
 msgid "Fog of War"
-msgstr "Karo rūkas"
+msgstr "Milit-nebulo"
 
 #: client/gui-gtk-2.0/menu.c:818
 msgid "_Full Screen"
-msgstr "_Visas ekranas"
+msgstr "_Plenekrane"
 
 #: client/gui-gtk-2.0/menu.c:822
 msgid "_Center View"
-msgstr ""
+msgstr "_Centrigu la vidon"
 
 #: client/gui-gtk-2.0/menu.c:825 client/gui-win32/menu.c:358
 msgid "_Orders"
-msgstr "_Nurodymai"
+msgstr "_Ordonoj"
 
 #: client/gui-gtk-2.0/menu.c:827 client/gui-gtk-2.0/menu.c:829
 #: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:833
@@ -11227,159 +11509,159 @@ msgstr "_Nurodymai"
 #: client/gui-gtk-2.0/menu.c:899 client/gui-gtk-2.0/menu.c:901
 #: client/gui-gtk-2.0/menu.c:903 data/Freeciv.in:2029
 msgid "Orders"
-msgstr "Nurodymai"
+msgstr "Ordonoj"
 
 #: client/gui-gtk-2.0/menu.c:829 client/gui-gtk-2.0/menu.c:1444
 #: client/gui-win32/menu.c:359
 msgid "_Build City"
-msgstr "_Statyti miestÄ…"
+msgstr "_Fondu urbon (_B)"
 
 #: client/gui-gtk-2.0/menu.c:831 client/gui-gtk-2.0/menu.c:1466
 #: client/gui-gtk-2.0/menu.c:1472 client/gui-win32/menu.c:360
 msgid "Build _Road"
-msgstr "Statyti _keliÄ…"
+msgstr "Konst_ruu vojon"
 
 #: client/gui-gtk-2.0/menu.c:833 client/gui-gtk-2.0/menu.c:1360
 #: client/gui-win32/menu.c:361
 msgid "Build _Irrigation"
-msgstr "Statyti _drÄ—kinimÄ…"
+msgstr "Preparu _irigacion"
 
 #: client/gui-gtk-2.0/menu.c:835 client/gui-gtk-2.0/menu.c:1361
 #: client/gui-win32/menu.c:362
 msgid "Build _Mine"
-msgstr "Statyti ka_syklÄ…"
+msgstr "Konstruu _minejon"
 
 #: client/gui-gtk-2.0/menu.c:837 client/gui-gtk-2.0/menu.c:1362
 msgid "Transf_orm Terrain"
-msgstr ""
+msgstr "Transf_ormu grundon"
 
 #: client/gui-gtk-2.0/menu.c:839 client/gui-gtk-2.0/menu.c:1508
 #: client/gui-win32/menu.c:364
 msgid "Build _Fortress"
-msgstr "Statyti _FortÄ…"
+msgstr "Konstruu _fortreson"
 
 #: client/gui-gtk-2.0/menu.c:841 client/gui-win32/menu.c:365
 msgid "Build Airbas_e"
-msgstr "Statyti _oro bazÄ™"
+msgstr "Konstruu avian bazon"
 
 #: client/gui-gtk-2.0/menu.c:843 client/gui-gtk-2.0/menu.c:1514
 #: client/gui-win32/menu.c:366
 msgid "Clean _Pollution"
-msgstr "Valyti _taršą"
+msgstr "_Malpolui"
 
 #: client/gui-gtk-2.0/menu.c:845 client/gui-win32/menu.c:367
 msgid "Clean _Nuclear Fallout"
-msgstr "Valyti _radioaktyviÄ…sias dulkes"
+msgstr "Malpolui _radioaktivan refalon"
 
 #: client/gui-gtk-2.0/menu.c:849 client/gui-win32/menu.c:369
 msgid "_Sentry"
-msgstr ""
+msgstr "_Gardosoldato"
 
 #: client/gui-gtk-2.0/menu.c:855 client/gui-win32/menu.c:372
 msgid "Make _Homecity"
-msgstr ""
+msgstr "Igu ĝin _hejmurbo"
 
 #: client/gui-gtk-2.0/menu.c:857 client/gui-win32/menu.c:373
 msgid "_Load"
-msgstr "Į_kelti"
+msgstr "_Åœargu"
 
 #: client/gui-gtk-2.0/menu.c:859
 msgid "_Unload Transporter"
-msgstr ""
+msgstr "_Malŝargu kargon"
 
 #: client/gui-gtk-2.0/menu.c:861 client/gui-win32/menu.c:374
 msgid "_Unload"
-msgstr ""
+msgstr "_Malŝargu"
 
 #: client/gui-gtk-2.0/menu.c:863 client/gui-win32/menu.c:375
 msgid "Wake up o_thers"
-msgstr "Pažadinti _kitus"
+msgstr "Vekigu la a_liajn"
 
 #: client/gui-gtk-2.0/menu.c:867
 msgid "_Auto Settler"
-msgstr ""
+msgstr "_AÅ­tomata farmigo"
 
 #: client/gui-gtk-2.0/menu.c:869 client/gui-win32/menu.c:378
 msgid "Auto E_xplore"
-msgstr "Automatiškai _tyrinėti"
+msgstr "AÅ­tomata e_ksplorado"
 
 #: client/gui-gtk-2.0/menu.c:871 client/gui-gtk-2.0/menu.c:873
 #: client/gui-gtk-2.0/menu.c:875
 msgid "_Connect"
-msgstr "_Sujungti"
+msgstr "_Kunligu"
 
 #: client/gui-gtk-2.0/menu.c:871 client/gui-win32/menu.c:380
 msgid "_Road"
-msgstr "_Kelias"
+msgstr "_Vojo"
 
 #: client/gui-gtk-2.0/menu.c:873 client/gui-win32/menu.c:381
 msgid "Rai_l"
-msgstr "_Geležinkelis"
+msgstr "_Fervojo"
 
 #: client/gui-gtk-2.0/menu.c:875 client/gui-win32/menu.c:382
 msgid "_Irrigate"
-msgstr "_DrÄ—kinti"
+msgstr "_Irigacio"
 
 #: client/gui-gtk-2.0/menu.c:877
 msgid "Go _to"
-msgstr "_Eiti į"
+msgstr "Iru _al"
 
 #: client/gui-gtk-2.0/menu.c:877
 msgid "_Build city"
-msgstr "_Statyti miestÄ…"
+msgstr "Konstruu ur_bon"
 
 #: client/gui-gtk-2.0/menu.c:879
 msgid "Patrol (_Q)"
-msgstr "Patruliuoti (_Q)"
+msgstr "Patrolado (_Q)"
 
 #: client/gui-gtk-2.0/menu.c:881 client/gui-win32/menu.c:385
 msgid "_Go to"
-msgstr "_Eiti į"
+msgstr "_Iru al"
 
 #: client/gui-gtk-2.0/menu.c:883
 msgid "Go\\/Airlift to City"
-msgstr ""
+msgstr "Iru\\/Flugtransportu al urbo"
 
 #: client/gui-gtk-2.0/menu.c:885 client/gui-sdl/menu.c:450
 #: client/gui-win32/menu.c:387 client/gui-xaw/menu.c:203
 msgid "Return to nearest city"
-msgstr "Grįžti į artimiausią miestą"
+msgstr "Revenu al la pli apuda urbo"
 
 #: client/gui-gtk-2.0/menu.c:889 client/gui-win32/menu.c:389
 #: client/gui-xaw/menu.c:205
 msgid "Disband Unit"
-msgstr "Išformuoti dalinį"
+msgstr "Dissolvu unuon"
 
 #: client/gui-gtk-2.0/menu.c:891 client/gui-sdl/citydlg.c:532
 #: data/Freeciv.in:1186
 msgid "Upgrade unit"
-msgstr "Patobulinti dalinį"
+msgstr "Äœisdatigu unuon"
 
 #: client/gui-gtk-2.0/menu.c:893
 msgid "Diplomat\\/Spy Actions"
-msgstr ""
+msgstr "Diplomatiaj\\/Spionaj agoj"
 
 #: client/gui-gtk-2.0/menu.c:895 client/gui-sdl/menu.c:399
 #: client/gui-win32/menu.c:391 client/gui-xaw/menu.c:209
 msgid "Explode Nuclear"
-msgstr "Susprogduinti atominÄ™ jÄ—gainÄ™"
+msgstr "Atomeksplodo"
 
 #: client/gui-gtk-2.0/menu.c:899
 msgid "Select same type"
-msgstr "Pažymėti tokio pat tipo"
+msgstr "Elektu saman specon"
 
 #: client/gui-gtk-2.0/menu.c:901 client/gui-win32/menu.c:393
 msgid "_Wait"
-msgstr "_Laukti"
+msgstr "_Atendu"
 
 #: client/gui-gtk-2.0/menu.c:903 client/gui-win32/menu.c:394
 #: client/gui-xaw/menu.c:213
 msgid "Done"
-msgstr "Baigta"
+msgstr "Finita"
 
 #: client/gui-gtk-2.0/menu.c:906 client/gui-win32/menu.c:398
 msgid "_Reports"
-msgstr "_Ataskaitos"
+msgstr "_Raportoj"
 
 #: client/gui-gtk-2.0/menu.c:908 client/gui-gtk-2.0/menu.c:910
 #: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:914
@@ -11389,53 +11671,51 @@ msgstr "_Ataskaitos"
 #: client/gui-gtk-2.0/menu.c:928 client/gui-gtk-2.0/menu.c:930
 #: client/gui-gtk-2.0/menu.c:932 data/Freeciv.in:2030
 msgid "Reports"
-msgstr "Ataskaitos"
+msgstr "Raportoj"
 
 #: client/gui-gtk-2.0/menu.c:912 client/gui-gtk-2.0/menu.c:958
 #: client/gui-win32/menu.c:400 client/gui-win32/menu.c:425
 msgid "_Units"
-msgstr "_Daliniai"
+msgstr "_Unuoj"
 
 #. TRANS: Nations report action
 #: client/gui-gtk-2.0/menu.c:914 client/gui-win32/menu.c:402
-#, fuzzy
 msgid "_Nations"
-msgstr "_Tautos"
+msgstr "_Nacioj"
 
 #: client/gui-gtk-2.0/menu.c:918 client/gui-win32/menu.c:403
 msgid "_Economy"
-msgstr "_Ekonomika"
+msgstr "_Ekonomio"
 
 #. TRANS: Research report action
 #: client/gui-gtk-2.0/menu.c:920 client/gui-win32/menu.c:405
-#, fuzzy
 msgid "_Research"
-msgstr "_TyrinÄ—jimai"
+msgstr "_Studado"
 
 #: client/gui-gtk-2.0/menu.c:924 client/gui-win32/menu.c:407
 msgid "_Wonders of the World"
-msgstr "Pasaulio _stebuklai"
+msgstr "_Mirindaĵoj de la mondo"
 
 #: client/gui-gtk-2.0/menu.c:926 client/gui-win32/menu.c:408
 msgid "_Top Five Cities"
-msgstr "Penki _geriausi miestai"
+msgstr "La k_vin urboj pli gravaj"
 
 #: client/gui-gtk-2.0/menu.c:928 client/gui-win32/menu.c:409
 msgid "_Messages"
-msgstr "_Pranešimai"
+msgstr "_Mesaĝoj"
 
 #: client/gui-gtk-2.0/menu.c:930 client/gui-win32/menu.c:410
 msgid "_Demographics"
-msgstr "_Demografiniai duomenys"
+msgstr "_Demografio"
 
 #: client/gui-gtk-2.0/menu.c:932 client/gui-gtk-2.0/plrdlg.c:471
 #: client/gui-win32/menu.c:411
 msgid "_Spaceship"
-msgstr "_ErdvÄ—laivis"
+msgstr "_Kosmoŝipo"
 
 #: client/gui-gtk-2.0/menu.c:936 client/gui-win32/menu.c:415
 msgid "_Help"
-msgstr "_Pagalba"
+msgstr "_Helpilo"
 
 #: client/gui-gtk-2.0/menu.c:938 client/gui-gtk-2.0/menu.c:940
 #: client/gui-gtk-2.0/menu.c:942 client/gui-gtk-2.0/menu.c:944
@@ -11453,75 +11733,75 @@ msgstr "_Pagalba"
 #: data/Freeciv.in:1466 data/Freeciv.in:2031 data/Freeciv.in:2101
 #: data/Freeciv.in:2188 data/Freeciv.in:2194
 msgid "Help"
-msgstr "Pagalba"
+msgstr "Helpilo"
 
 #: client/gui-gtk-2.0/menu.c:940 client/gui-win32/menu.c:416
 msgid "Language_s"
-msgstr "_Kalbos"
+msgstr "L_ingvoj"
 
 #: client/gui-gtk-2.0/menu.c:942 client/gui-win32/menu.c:417
 msgid "Co_nnecting"
-msgstr ""
+msgstr "Ku_nligo"
 
 #: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:418
 msgid "C_ontrols"
-msgstr ""
+msgstr "Regil_oj"
 
 #: client/gui-gtk-2.0/menu.c:946 client/gui-win32/menu.c:419
 msgid "C_hatline"
-msgstr ""
+msgstr "_Babillineo"
 
 #: client/gui-gtk-2.0/menu.c:948 client/gui-win32/menu.c:420
 msgid "_Worklist Editor"
-msgstr "_Darbų sąrašo redaktorius"
+msgstr "Redaktu _laborliston"
 
 #: client/gui-gtk-2.0/menu.c:950 client/gui-win32/menu.c:421
 msgid "Citizen _Management"
-msgstr "Piliečių _valdymas"
+msgstr "_Mastrumo de civitanoj"
 
 #: client/gui-gtk-2.0/menu.c:952 client/gui-win32/menu.c:422
 msgid "_Playing"
-msgstr ""
+msgstr "_Ludado"
 
 #: client/gui-gtk-2.0/menu.c:956 client/gui-win32/menu.c:424
 msgid "City _Improvements"
-msgstr "Miestų _patobulinimai"
+msgstr "_Urbaj plibonigoj"
 
 #: client/gui-gtk-2.0/menu.c:960 client/gui-win32/menu.c:426
 msgid "Com_bat"
-msgstr "_MÅ«Å¡is"
+msgstr "_Batalo"
 
 #: client/gui-gtk-2.0/menu.c:962 client/gui-win32/menu.c:427
 msgid "_ZOC"
-msgstr ""
+msgstr "_Influareo"
 
 #: client/gui-gtk-2.0/menu.c:964 client/gui-win32/menu.c:428
 msgid "Techno_logy"
-msgstr "_Technologija"
+msgstr "Teĥno_logio"
 
 #: client/gui-gtk-2.0/menu.c:966 client/gui-win32/menu.c:429
 msgid "_Terrain"
-msgstr ""
+msgstr "_Grundo"
 
 #: client/gui-gtk-2.0/menu.c:968 client/gui-win32/menu.c:430
 msgid "Won_ders"
-msgstr "_Stebuklai"
+msgstr "Mirin_daĵoj"
 
 #: client/gui-gtk-2.0/menu.c:972 client/gui-win32/menu.c:432
 msgid "Happin_ess"
-msgstr "_Laimingumas"
+msgstr "Kontent_eco"
 
 #: client/gui-gtk-2.0/menu.c:974 client/gui-win32/menu.c:433
 msgid "Space _Race"
-msgstr "_KosminÄ— rasÄ—"
+msgstr "Konku_ro por la kosmo"
 
 #: client/gui-gtk-2.0/menu.c:978 client/gui-win32/menu.c:435
 msgid "_Copying"
-msgstr "_Kopijavimas"
+msgstr "_Permesilo"
 
 #: client/gui-gtk-2.0/menu.c:980 client/gui-win32/menu.c:436
 msgid "_About"
-msgstr "_Apie"
+msgstr "_Pri"
 
 #: client/gui-gtk-2.0/menu.c:1264
 #, c-format
@@ -11531,51 +11811,50 @@ msgstr "%s..."
 #: client/gui-gtk-2.0/menu.c:1352
 #, c-format
 msgid "Change to %s (_I)"
-msgstr "Keisti į %s (_D)"
+msgstr "Ŝanĝu en %s (_I)"
 
-# Atrodo čia kasykla
 #: client/gui-gtk-2.0/menu.c:1353
 #, c-format
 msgid "Change to %s (_M)"
-msgstr "Keisti į %s (_K)"
+msgstr "Ŝanĝu en %s (_M)"
 
 #: client/gui-gtk-2.0/menu.c:1354
 #, c-format
 msgid "Transf_orm to %s"
-msgstr "Transformuoti į %s"
+msgstr "Transf_ormu en %s"
 
 #: client/gui-gtk-2.0/menu.c:1427
 msgid "Help _Build Wonder"
-msgstr "PadÄ—ti pastatyti _stebuklÄ…"
+msgstr "Helpu konstrui mirindaĵon (_B)"
 
 #: client/gui-gtk-2.0/menu.c:1441
 msgid "Add to City (_B)"
-msgstr "Pridėti į miestą (_S)"
+msgstr "Aldonu al urbo (_B)"
 
 #: client/gui-gtk-2.0/menu.c:1449
 msgid "Make Trade _Route"
-msgstr ""
+msgstr "Kreu komercan _kurson"
 
 #: client/gui-gtk-2.0/menu.c:1463
 msgid "Build _Railroad"
-msgstr "Tiesti _geležinkelį"
+msgstr "Konstruu _fervojon"
 
 #: client/gui-gtk-2.0/menu.c:1486
 msgid "Bu_ild Farmland"
-msgstr "Suformuoti _dirbamąją žemę"
+msgstr "Konstruu fa_rmaron"
 
 #: client/gui-gtk-2.0/menu.c:1506
 msgid "_Fortify"
-msgstr "Į_tvirtinti"
+msgstr "_Fortigado"
 
 #: client/gui-gtk-2.0/menu.c:1512
 msgid "_Paradrop"
-msgstr ""
+msgstr "_Paraŝuti"
 
 #: client/gui-gtk-2.0/messagedlg.c:62 client/gui-win32/messagedlg.c:175
 #: client/gui-xaw/menu.c:112 data/Freeciv.in:1254
 msgid "Message Options"
-msgstr "Pranešimų nustatymai"
+msgstr "Opcio de mesaĝoj"
 
 #: client/gui-gtk-2.0/messagedlg.c:71
 msgid ""
@@ -11583,32 +11862,35 @@ msgid ""
 "<b>Out</b>put window ; <b>Mes</b>sages window ; <b>Pop</b>up individual "
 "window"
 msgstr ""
+"Kie oni vidigas la mesaĝojn?\n"
+"<b>Fen</b> en normala fenestro ; <b>Mes</b> en la fenestro de la mesaĝoj ; "
+"<b>Pop</b> en unu ŝprucfenestro"
 
 #: client/gui-gtk-2.0/messagedlg.c:117
 msgid "Event"
-msgstr "Įvykis"
+msgstr "Evento"
 
 #: client/gui-gtk-2.0/messagedlg.c:127
 msgid "Out"
-msgstr ""
+msgstr "Fen"
 
 #: client/gui-gtk-2.0/messagedlg.c:134
 msgid "Mes"
-msgstr ""
+msgstr "Mes"
 
 #: client/gui-gtk-2.0/messagedlg.c:141
 msgid "Pop"
-msgstr ""
+msgstr "Åœpruc."
 
 #: client/gui-gtk-2.0/messagewin.c:155 client/gui-sdl/messagewin.c:247
 #: client/gui-win32/messagewin.c:132 client/gui-xaw/menu.c:228
 #: data/Freeciv.in:3273 data/Freeciv.in:3274 data/Freeciv.in:3283
 msgid "Messages"
-msgstr "Pranešimai"
+msgstr "Mesaĝoj"
 
 #: client/gui-gtk-2.0/plrdlg.c:330
 msgid "?show:Dead Players"
-msgstr "?show:Mirę žaidėjai"
+msgstr "?show:Mortintaj Ludantoj"
 
 #. TRANS: Nations report title
 #. TRANS: Nations report action
@@ -11618,265 +11900,262 @@ msgstr "?show:Mirę žaidėjai"
 #: client/gui-sdl/plrdlg.c:608 client/gui-win32/plrdlg.c:344
 #: client/gui-xaw/menu.c:221 data/Freeciv.in:3192 data/Freeciv.in:3193
 msgid "Nations"
-msgstr "Tautos"
+msgstr "Nacioj"
 
 #: client/gui-gtk-2.0/plrdlg.c:443
 msgid "_Intelligence"
-msgstr "_Žvalgyba"
+msgstr "_Spionado"
 
 #: client/gui-gtk-2.0/plrdlg.c:450
 msgid "_Meet"
-msgstr "_Susitikti"
+msgstr "_Renkontiĝo"
 
 #: client/gui-gtk-2.0/plrdlg.c:457
 msgid "Cancel _Treaty"
-msgstr "_Atšaukti sutartį"
+msgstr "Nuligu kontra_kton"
 
 #: client/gui-gtk-2.0/plrdlg.c:464
 msgid "_Withdraw vision"
-msgstr ""
+msgstr "_Repripensu la vidon"
 
 #: client/gui-gtk-2.0/plrdlg.c:495
 msgid "_AI"
-msgstr "_DI"
+msgstr "_AI"
 
 #: client/gui-gtk-2.0/plrdlg.c:501
 msgid "_Toggle AI Mode"
-msgstr ""
+msgstr "_Mastrumu AI-moduson"
 
 #: client/gui-gtk-2.0/pages.c:208
 msgid "Start _New Game"
-msgstr "Pradėti _naują žaidimą"
+msgstr "Startigu _novan ludon"
 
 #: client/gui-gtk-2.0/pages.c:214
 msgid "Start _Scenario Game"
-msgstr "Žaisti _scenarijų"
+msgstr "Startigu scenejon"
 
 #: client/gui-gtk-2.0/pages.c:220
 msgid "_Load Saved Game"
-msgstr "Į_kelti išsaugotą žaidimą"
+msgstr "Åœargu konservitan _ludon"
 
 #: client/gui-gtk-2.0/pages.c:229
 msgid "C_onnect to Network Game"
-msgstr "_Prisijungti prie tinklo žaidimo"
+msgstr "K_onekto al retan ludon"
 
 #: client/gui-gtk-2.0/pages.c:236
-#, fuzzy
 msgid "Connect to Gaming _Zone"
-msgstr "Prisijungti prie tinklo žaidimo"
+msgstr "Konekto al _areon de ludo"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
-msgstr "Slaptažodžiai nesutampa. Įvesk slaptažodį."
+msgstr "Ne kongruas pasvorto, reen enigu pasvorton."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
-msgstr "Serverio pavadinimas"
+msgstr "Servilnomo"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
-msgstr "Prievadas"
+msgstr "Pordo"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
-msgstr "Versija"
+msgstr "Versio"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
-msgstr "BÅ«sena"
+msgstr "Stato"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
-msgstr "Žaidėjai"
+msgstr "Ludantoj"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
-msgstr "Komentaras"
+msgstr "Komento"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
-msgstr "_Vietinis tinklas"
+msgstr "Loka _Reto"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
-msgstr "Interneto _metaserveris"
+msgstr "Interreta _Metaservilo"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
-msgstr ""
+msgstr "_Gast.komp:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
-msgstr "_Prievadas:"
+msgstr "_Pordo:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
-msgstr ""
+msgstr "_Nomo:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
-msgstr "_Slaptažodis"
+msgstr "Pas_vorto:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
-msgstr "_Patvirtinti slaptažodį"
+msgstr "Konf_irmu pasvorton:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
-msgstr "'_Prisijungti"
+msgstr "K_onektu"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
-msgstr "Ryšio pavadinimas: %s"
+msgstr "Nomo de la konekto: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
-msgstr "Žaidėjo vardas: %s"
+msgstr "Nomo de la ludanto: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
-msgstr "Mazgas: %s"
+msgstr "Gast.komp: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
-msgstr ""
+msgstr "Pri ludanto/konekto"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
-msgstr "%s informacija"
+msgstr "Pri %s"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
-msgstr "Pasirinkite tautÄ…"
+msgstr "Elektu nacion"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
-msgstr "Stebėti šį žaidėją"
+msgstr "Observu tiun ĉi ludanton"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
-msgstr "Pasiimti šitą žaidėją"
+msgstr "Prenu tiun ĉi ludanton"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
-msgstr "Nutraukti susijungimÄ…"
+msgstr "Fermu konekton"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
-msgstr "Pašalinti žaidėją"
+msgstr "Formovu ludanton"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
-msgstr "Priimti į %s"
+msgstr "Enigu en %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
-#, fuzzy
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
-msgstr "_Žaidėjų skaičius (įskaitant DI):"
+msgstr "Nombro de _ludantoj (inkluziva de la AI):"
 
-#: client/gui-gtk-2.0/pages.c:1462
-#, fuzzy
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
-msgstr "_DI meistriškumo lygis:"
+msgstr "Lerteco de _AI:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
-msgstr ""
+msgstr "_Versio de la reguloj:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
-msgstr "Daugiau žaidimo _nustatymų"
+msgstr "Pluaj opcioj de la ludo..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
-msgstr "Įrašas"
+msgstr "Raporto"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
-msgstr "Reitingas"
+msgstr "Skribado"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
-msgstr "Pasiruošęs"
+msgstr "Preta"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
-msgstr "Vadas"
+msgstr "Estro"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
-msgstr "Pasirinkite išsaugotą žaidimą įkėlimui"
+msgstr "Elektu konservitan ludon"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
-msgstr "Pasirinkite išsaugotą žaidimą į_kėlimui:"
+msgstr "Elektu ŝargendan konvervitan _ludon:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
-msgstr "_Naršyti..."
+msgstr "_Foliumu..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
-msgstr "Pasirinkite scenarijų"
+msgstr "Elektu scenejon"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
-msgstr "Pasirinkite _scenarijų"
+msgstr "Elektu _scenejon:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
-msgstr "Tipas"
+msgstr "Speco"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
-msgstr ""
+msgstr "Elektu _nacion por ludi:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
-msgstr ""
+msgstr "Elektu lokon por konservi"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
-msgstr "Išsaugoti žaidimą"
+msgstr "Konservu ludon"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
-msgstr "_Išsaugoti žaidimai:"
+msgstr "Konservitaj _ludoj:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
-msgstr ""
+msgstr "Konservu dosiernomon:"
 
 #. TRANS: Research report title
 #. TRANS: Research report action
@@ -11890,93 +12169,90 @@ msgstr ""
 #: client/gui-xaw/menu.c:224 client/gui-xaw/repodlgs.c:274
 #: client/gui-xaw/repodlgs.c:485 data/Freeciv.in:1366
 msgid "Research"
-msgstr "TyrinÄ—jimai"
+msgstr "Studado"
 
 #: client/gui-gtk-2.0/repodlgs.c:295 client/gui-win32/repodlgs.c:283
 msgid "Researching"
-msgstr "TyrinÄ—jama"
+msgstr "Studado"
 
 #: client/gui-gtk-2.0/repodlgs.c:316 client/gui-win32/repodlgs.c:293
 #: data/Freeciv.in:1429
 msgid "Goal"
-msgstr "Tikslas"
+msgstr "Celo"
 
-# Pavadinimas?
 #: client/gui-gtk-2.0/repodlgs.c:635
 msgid "?Building:Name"
-msgstr "?Building:Pavadinimas"
+msgstr "?Building:Nomo"
 
 #: client/gui-gtk-2.0/repodlgs.c:636 client/gui-win32/repodlgs.c:462
 msgid "Count"
-msgstr ""
+msgstr "Nombro"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
 msgid "Cost"
-msgstr "Kaina"
+msgstr "Kosto"
 
-# santrumpa???
 #: client/gui-gtk-2.0/repodlgs.c:638 client/gui-sdl/repodlgs.c:2031
 #: client/gui-win32/repodlgs.c:468
 msgid "U Total"
-msgstr ""
+msgstr "Kompleta kosto"
 
 #: client/gui-gtk-2.0/repodlgs.c:708
 msgid "Total Cost:"
-msgstr "Visa kaina:"
+msgstr "Kompleta kosto:"
 
 #: client/gui-gtk-2.0/repodlgs.c:714
 msgid "Sell _Obsolete"
-msgstr "Parduoti _pasenusius"
+msgstr "Vendu _arkaikaĵon"
 
 #: client/gui-gtk-2.0/repodlgs.c:719
 msgid "Sell _All"
-msgstr "Parduoti _viskÄ…"
+msgstr "Vendu _ĉion"
 
 #: client/gui-gtk-2.0/repodlgs.c:797
 #, c-format
 msgid "Do you really wish to sell your %s?\n"
-msgstr "Ar tikrai norite parduoti savo %s?\n"
+msgstr "Ĉu vi deziras vendi %s?\n"
 
 #: client/gui-gtk-2.0/repodlgs.c:800
 msgid "Sell Improvements"
-msgstr "Parduoti patobulinimus"
+msgstr "Vendu Plibonigaĵojn"
 
 #: client/gui-gtk-2.0/repodlgs.c:826
 msgid "Sell-Off: Results"
-msgstr ""
+msgstr "Vendado: Rezultoj"
 
 #: client/gui-gtk-2.0/repodlgs.c:886
 #, c-format
 msgid "Income: %d    Total Costs: %d"
-msgstr ""
+msgstr "Enspezo: %d    Elspezo: %d"
 
 #: client/gui-gtk-2.0/repodlgs.c:933 client/gui-win32/repodlgs.c:695
 msgid "Unit Type"
-msgstr "Dalinio tipas"
+msgstr "Speco de unuo"
 
-# santrumpa???
 #: client/gui-gtk-2.0/repodlgs.c:934 client/gui-win32/repodlgs.c:696
 msgid "?Upgradable unit [short]:U"
-msgstr ""
+msgstr "?Upgradable unuo [mallonge]:U"
 
 #: client/gui-gtk-2.0/repodlgs.c:935 client/gui-win32/repodlgs.c:697
 msgid "In-Prog"
-msgstr "Gamyboje"
+msgstr "En programo"
 
 #: client/gui-gtk-2.0/repodlgs.c:936 client/gui-win32/repodlgs.c:698
 msgid "Active"
-msgstr "Aktyvūs"
+msgstr "Aktiva"
 
 #: client/gui-gtk-2.0/repodlgs.c:1009
 msgid "Find _Nearest"
-msgstr "Rasti _artimiausiÄ…"
+msgstr "Trovu la pli _proksiman"
 
 #: client/gui-gtk-2.0/repodlgs.c:1014
 msgid "_Upgrade"
-msgstr "_Patobulinti"
+msgstr "Äœisdatig_u"
 
 #: client/gui-gtk-2.0/repodlgs.c:1156 client/gui-sdl/repodlgs.c:185
 #: client/gui-win32/repodlgs.c:568 client/gui-xaw/repodlgs.c:1005
@@ -11985,67 +12261,67 @@ msgid ""
 "Upgrade as many %s to %s as possible for %d gold each?\n"
 "Treasury contains %d gold."
 msgstr ""
-"Patobulinti kiek įmanoma daugiau %s į %s po %d aukso?\n"
-"Ižde yra %d aukso."
+"Ĉu oni ĝisdatigi kiom eble plej multe %sn al %s per %d oraj moneroj?\n"
+"Åœata kaso entenas %d orajn monerojn."
 
 #: client/gui-gtk-2.0/repodlgs.c:1260
 msgid "Totals:"
-msgstr "IÅ¡ viso:"
+msgstr "Sumoj:"
 
 #: client/gui-gtk-2.0/repodlgs.c:1283
 msgid "Player\n"
-msgstr "Žaidėjas\n"
+msgstr "Ludanto\n"
 
 #: client/gui-gtk-2.0/repodlgs.c:1284
 msgid "Score\n"
-msgstr "Taškai\n"
+msgstr "Poentaro\n"
 
 #: client/gui-gtk-2.0/repodlgs.c:1285
 msgid "Population\n"
-msgstr "Gyventojai\n"
+msgstr "Populacio\n"
 
 #: client/gui-gtk-2.0/repodlgs.c:1286
 msgid ""
 "Trade\n"
 "(M goods)"
 msgstr ""
-"Prekyba\n"
-"(M prekių)"
+"Komerco\n"
+"(M da havaĵoj)"
 
 #: client/gui-gtk-2.0/repodlgs.c:1287
 msgid ""
 "Production\n"
 "(M tons)"
 msgstr ""
-"Gamyba\n"
-"(M tonų)"
+"Produzione\n"
+"(M tunoj)"
 
 #: client/gui-gtk-2.0/repodlgs.c:1288
 msgid "Cities\n"
-msgstr "Miestai\n"
+msgstr "Urboj\n"
 
 #: client/gui-gtk-2.0/repodlgs.c:1289
 msgid "Technologies\n"
-msgstr "Technologijos\n"
+msgstr "Teĥnologioj\n"
 
 #: client/gui-gtk-2.0/repodlgs.c:1290
 msgid ""
 "Military Service\n"
 "(months)"
 msgstr ""
-"KarinÄ— tarnyba\n"
-"(mÄ—nesiais)"
+"Militservo\n"
+"(monatoj)"
 
 #: client/gui-gtk-2.0/repodlgs.c:1291
 msgid "Wonders\n"
-msgstr "Stebuklai\n"
+msgstr "Mirindaĵoj\n"
 
 #: client/gui-gtk-2.0/repodlgs.c:1292
 msgid ""
 "Research Speed\n"
 "(%)"
 msgstr ""
-"Tyrinėjimų greitis\n"
+"Rapideco de studado\n"
 "(%)"
 
 #: client/gui-gtk-2.0/repodlgs.c:1293
@@ -12053,61 +12329,61 @@ msgid ""
 "Land Area\n"
 "(sq. mi.)"
 msgstr ""
-"Žemės plotas\n"
-"(kv.myl.)"
+"Esplorita areo\n"
+"(kv. Km)"
 
 #: client/gui-gtk-2.0/repodlgs.c:1294
 msgid ""
 "Settled Area\n"
 "(sq. mi.)"
 msgstr ""
-"Apgyvendintas plotas\n"
-"(kv.myl.)"
+"Koloniita areo\n"
+"(kv. Km)"
 
 #: client/gui-gtk-2.0/repodlgs.c:1295
 msgid ""
 "Literacy\n"
 "(%)"
 msgstr ""
-"Raštingumas\n"
+"Alfabetiĝo\n"
 "(%)"
 
 #: client/gui-gtk-2.0/repodlgs.c:1296
 msgid "Spaceship\n"
-msgstr "ErdvÄ—laivis\n"
+msgstr "Kosmoŝipo\n"
 
 #: client/gui-gtk-2.0/repodlgs.c:1478 data/Freeciv.in:3390
 #: data/Freeciv.in:3399
 msgid "Game Settings"
-msgstr "Žaidimo nustatymai"
+msgstr "Lud-agordoj"
 
 #: client/gui-gtk-2.0/repodlgs.c:1583 client/gui-xaw/repodlgs.c:1399
 msgid "true"
-msgstr "teigiama"
+msgstr "vera"
 
 #: client/gui-gtk-2.0/repodlgs.c:1583 client/gui-xaw/repodlgs.c:1399
 msgid "false"
-msgstr "neigiama"
+msgstr "malvera"
 
 #: client/gui-gtk-2.0/repodlgs.c:1593 client/gui-xaw/repodlgs.c:1409
 msgid "(hidden)"
-msgstr "(paslÄ—pta)"
+msgstr "(kaŝita)"
 
 #: client/gui-gtk-2.0/spaceshipdlg.c:221
 msgid "_Launch"
-msgstr "_Paleisti"
+msgstr "_Ä´eto"
 
 #: client/gui-gtk-2.0/theme_dlg.c:57
 msgid "Theme suggested"
-msgstr "Siūloma tema"
+msgstr "Sugestita temo"
 
 #: client/gui-gtk-2.0/theme_dlg.c:60
 msgid "Load theme"
-msgstr "Įkelti temą"
+msgstr "Åœargu temon"
 
 #: client/gui-gtk-2.0/theme_dlg.c:62
 msgid "Keep current theme"
-msgstr ""
+msgstr "Tenu nunan temon"
 
 #: client/gui-gtk-2.0/theme_dlg.c:69
 #, c-format
@@ -12115,19 +12391,20 @@ msgid ""
 "Tileset suggests using %s theme.\n"
 "You are currently using %s."
 msgstr ""
+"La sugestita grafikaĵo uzas %sn temon.\n"
+"Vi nun estas uzanta %sn."
 
 #: client/gui-gtk-2.0/tileset_dlg.c:51
 msgid "Prefered tileset"
-msgstr ""
+msgstr "Favorata grafikaĵo"
 
 #: client/gui-gtk-2.0/tileset_dlg.c:54
-#, fuzzy
 msgid "Load tileset"
-msgstr "Įkeliamos taisyklės"
+msgstr "Ŝargu grafikaĵon"
 
 #: client/gui-gtk-2.0/tileset_dlg.c:56
 msgid "Keep current tileset"
-msgstr ""
+msgstr "Tenu nunan grafikaĵon"
 
 #: client/gui-gtk-2.0/tileset_dlg.c:63
 #, c-format
@@ -12136,71 +12413,74 @@ msgid ""
 "It might not work with other tilesets.\n"
 "You are currently using tileset %s."
 msgstr ""
+"Modpack konsilas uzi %s grafikaĵon.\n"
+"ĝi povus ne plenumi kun alia grafikaĵo.\n"
+"Vi estas uzanta %s grafikaĵon."
 
 #: client/gui-gtk-2.0/wldlg.c:178
 msgid "new"
-msgstr "naujas"
+msgstr "nova"
 
 #: client/gui-gtk-2.0/wldlg.c:242 client/gui-win32/wldlg.c:415
 msgid "Edit worklists"
-msgstr "Redaguoti darbų sąrašus:"
+msgstr "Redaktu laborlistojn"
 
 #: client/gui-gtk-2.0/wldlg.c:292
 msgid "_Worklists:"
-msgstr "_Darbų sąrašai:"
+msgstr "_Laborlistoj:"
 
 #: client/gui-gtk-2.0/wldlg.c:543
 msgid "Edit Global _Worklists"
-msgstr "Keisti globalius _darbų sąrašus"
+msgstr "_Redaktu ĝeneralajn laborlistojn"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
-msgstr "Ä–jimai"
+msgstr "Vicoj"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
-msgstr ""
+msgstr "Fonto de taskoj:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
-msgstr "Rodyti _būsimus objektus"
+msgstr "Vidigu estontajn celojn"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
-msgstr ""
+msgstr "Celo de la _Laborlisto:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
-msgstr ""
+msgstr "_Aldonu al ĝenerala laborlisto"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
-msgstr "_Keisti produkcijÄ…"
+msgstr "Ŝan_ĝu produktadon"
 
 #: client/gui-sdl/caravan_dialog.c:132
 #, c-format
 msgid "Your caravan has arrived at %s"
-msgstr "Jūsų karavanas atvyko į %s"
+msgstr "Via karavano alvenis al %s"
 
 #: client/gui-sdl/caravan_dialog.c:157
 #, c-format
 msgid "Establish Traderoute with %s ( %d R&G + %d trade )"
-msgstr ""
+msgstr "Starigu komercan kurson kun %s ( %d R&G + %d poentoj de komerco )"
 
 #: client/gui-sdl/caravan_dialog.c:164
 #, c-format
 msgid "Enter Marketplace ( %d R&G bonus )"
-msgstr ""
+msgstr "Eniru la bazaron ( %d R&G pluso )"
 
 #: client/gui-sdl/caravan_dialog.c:182 data/Freeciv.in:2263
 msgid "Help build Wonder"
-msgstr "PadÄ—ti statyti stebuklÄ…"
+msgstr "Helpu konstrui Mirindaĵon"
 
 #: client/gui-sdl/caravan_dialog.c:195 client/gui-sdl/diplomat_dialog.c:679
 #: data/Freeciv.in:2266 data/Freeciv.in:2290 data/Freeciv.in:2325
 msgid "Keep moving"
-msgstr "JudÄ—ti toliau"
+msgstr "Daŭrigu moviĝi"
 
 #: client/gui-sdl/chatline.c:201 client/gui-sdl/citydlg.c:3684
 #: client/gui-sdl/cma_fe.c:469 client/gui-sdl/cma_fe.c:876
@@ -12218,57 +12498,57 @@ msgstr "JudÄ—ti toliau"
 #: client/gui-sdl/repodlgs.c:3056 client/gui-sdl/repodlgs.c:3321
 #: client/gui-sdl/spaceshipdlg.c:162
 msgid "Close Dialog (Esc)"
-msgstr ""
+msgstr "Fermu fenestron (ESC)"
 
 #: client/gui-sdl/chatline.c:773
 #, c-format
 msgid "Total users logged in : %d"
-msgstr "Iš viso prisijungusių vartotojų yra %d"
+msgstr "Sumo de la konektitaj uzantoj: %d"
 
 #: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
 msgid "Back"
-msgstr "Atgal"
+msgstr "AntaÅ­e"
 
 #: client/gui-sdl/chatline.c:832 data/Freeciv.in:3379
 msgid "Start"
-msgstr "PradÄ—ti"
+msgstr "Komencu"
 
 #: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
 #: client/gui-win32/connectdlg.c:775
 msgid "Load Game"
-msgstr "Įkelti žaidimą"
+msgstr "Åœargu ludon"
 
 #: client/gui-sdl/chatline.c:865
 msgid "Server Settings"
-msgstr "Serverio nustatymai"
+msgstr "Agordoj de servilo"
 
 #: client/gui-sdl/citydlg.c:425
 msgid "Unit commands"
-msgstr "Dalinio komandos"
+msgstr "Komandoj por la unuoj"
 
 #: client/gui-sdl/citydlg.c:449 data/Freeciv.in:1162 data/Freeciv.in:1198
 msgid "Activate unit"
-msgstr "Aktyvuoti dalinį"
+msgstr "Aktivigu unuon"
 
 #: client/gui-sdl/citydlg.c:460 data/Freeciv.in:1166 data/Freeciv.in:1202
 msgid "Activate unit, close dialog"
-msgstr "Aktyvuoti dalinį, uždaryti langą"
+msgstr "Aktivigu unuon kaj fermu la fenestron"
 
 #: client/gui-sdl/citydlg.c:473 data/Freeciv.in:1170
 msgid "Sentry unit"
-msgstr "Dalinį pastatyti sargybai"
+msgstr "Gardosoldato"
 
 #: client/gui-sdl/citydlg.c:488 data/Freeciv.in:1174
 msgid "Fortify unit"
-msgstr "Įtvirtinti dalinį"
+msgstr "Fortigado"
 
 #: client/gui-sdl/citydlg.c:504 data/Freeciv.in:1178 data/Freeciv.in:1206
 msgid "Disband unit"
-msgstr "Išformuoti dalinį"
+msgstr "Dissolvu unuon"
 
 #: client/gui-sdl/citydlg.c:518 data/Freeciv.in:1182
 msgid "Make new homecity"
-msgstr ""
+msgstr "Kreu novan hejmurbon"
 
 #: client/gui-sdl/citydlg.c:546 client/gui-sdl/citydlg.c:1418
 #: client/gui-sdl/connectdlg.c:307 client/gui-sdl/connectdlg.c:616
@@ -12289,7 +12569,7 @@ msgstr ""
 #: data/Freeciv.in:2505 data/Freeciv.in:2515 data/Freeciv.in:3364
 #: data/Freeciv.in:3422
 msgid "Cancel"
-msgstr "Atšaukti"
+msgstr "Nuligu"
 
 #: client/gui-sdl/citydlg.c:719 client/gui-sdl/mapview.c:959
 msgid ""
@@ -12297,28 +12577,27 @@ msgid ""
 "veteran"
 msgstr ""
 "\n"
-"veteranas"
+"veterano"
 
 #: client/gui-sdl/citydlg.c:947
 msgid ""
 "Disband if build\n"
 "settler at size 1"
 msgstr ""
-"Panaikinti, jei stato\n"
-"kolonistą, esant dydžio 1"
+"Forlasu se vi havas\n"
+"1a-grandan farmaron"
 
 #: client/gui-sdl/citydlg.c:1171
 msgid "Sorry, you have already bought here in this turn."
-msgstr "Apgailestaujame, čia jau pirkote šiuo ėjimu."
+msgstr "Bedaŭre, vi jam aĉetis ĉi tie en ĉi vico."
 
 #: client/gui-sdl/citydlg.c:1174
 msgid "Sorry, you can't buy here in this turn."
-msgstr "Apgailestaujame, negalite čia pirkti šiuo ėjimu."
+msgstr "Bedaŭre, vi ne povas aĉeti ĉi tie en ĉi vico."
 
 #: client/gui-sdl/citydlg.c:1178
-#, fuzzy
 msgid "Buy it?"
-msgstr "Ar pirkti?"
+msgstr "Ĉu vi aĉetas ĝin?"
 
 #: client/gui-sdl/citydlg.c:1204 client/gui-sdl/cma_fe.c:327
 #: client/gui-sdl/diplodlg.c:1335 client/gui-sdl/diplomat_dialog.c:1211
@@ -12349,128 +12628,127 @@ msgstr "Ne"
 #: data/Freeciv.in:2222 data/Freeciv.in:2241 data/Freeciv.in:2421
 #: data/Freeciv.in:2445 data/Freeciv.in:2464 data/Freeciv.in:2475
 msgid "Yes"
-msgstr "Taip"
+msgstr "Jes"
 
 #: client/gui-sdl/citydlg.c:1393
-#, fuzzy
 msgid "Sell it?"
-msgstr "Ar parduoti?"
+msgstr "Ĉu vi vendas ĝin?"
 
 #: client/gui-sdl/citydlg.c:1426 client/gui-win32/citydlg.c:787
 msgid "Sell"
-msgstr "Parduoti"
+msgstr "Vendu"
 
 #: client/gui-sdl/citydlg.c:1734 client/gui-sdl/citydlg.c:3766
 msgid "City options"
-msgstr "Miesto nustatymai"
+msgstr "Opcioj por la urbo"
 
 #: client/gui-sdl/citydlg.c:1779
 #, c-format
 msgid "Supported units: %d"
-msgstr "Palaikomi daliniai: %d"
+msgstr "Subtenitaj unuoj: %d"
 
 #: client/gui-sdl/citydlg.c:1837
 #, c-format
 msgid "Present units: %d"
-msgstr "Esantys daliniai: %d"
+msgstr "Ĉeestantaj unuoj: %d"
 
 #: client/gui-sdl/citydlg.c:1886 client/gui-sdl/citydlg.c:3733
 #: client/gui-win32/citydlg.c:778
 msgid "City info"
-msgstr "Miesto informacija"
+msgstr "Pri urbo"
 
 #: client/gui-sdl/citydlg.c:1907
 #, c-format
 msgid "Pollution: %d"
-msgstr "Tarša: %d"
+msgstr "Poluo: %d"
 
 #: client/gui-sdl/citydlg.c:1935
 msgid "Pollution: none"
-msgstr "Tarša: jokios"
+msgstr "Poluo: nenio"
 
 #: client/gui-sdl/citydlg.c:1948
 msgid "Trade routes: "
-msgstr "Prekybos maršrutai: "
+msgstr "Komercaj kursoj:"
 
 #: client/gui-sdl/citydlg.c:1997
 #, c-format
 msgid "Trade: +%d"
-msgstr "Prekyba: +%d"
+msgstr "Komerco: +%d"
 
 #: client/gui-sdl/citydlg.c:2537
 msgid "Citizens"
-msgstr "Piliečiai"
+msgstr "Civitanoj"
 
 #: client/gui-sdl/citydlg.c:2551
 msgid "City improvements"
-msgstr "Miesto patobulinimai"
+msgstr "Urbaj plibonigoj"
 
 #: client/gui-sdl/citydlg.c:2566
 #, c-format
 msgid "Food: %d per turn"
-msgstr "Maistas: %d per Ä—jimÄ…"
+msgstr "Nutraĵo: %d povice"
 
 #: client/gui-sdl/citydlg.c:2603
 #, c-format
 msgid "?food:Surplus: %d"
-msgstr "?food:Perteklius: %d"
+msgstr "?food:Troo : %d"
 
 #: client/gui-sdl/citydlg.c:2651
 #, c-format
 msgid "Production: %d (%d) per turn"
-msgstr "Gamyba: %d (%d) per Ä—jimÄ…"
+msgstr "Produktado: %d (%d) povice"
 
 #: client/gui-sdl/citydlg.c:2697
 #, c-format
 msgid "?production:Support: %d"
-msgstr "?production:IÅ¡laikymas: %d"
+msgstr "?production:Produktaĵo: %d"
 
 #: client/gui-sdl/citydlg.c:2735
 #, c-format
 msgid "Trade: %d per turn"
-msgstr "Prekyba: %d per Ä—jimÄ…"
+msgstr "Komerco: %d povice"
 
 #: client/gui-sdl/citydlg.c:2769
 #, c-format
 msgid "Corruption: %d"
-msgstr "Korupcija: %d"
+msgstr "Subaĉetado: %d"
 
 #: client/gui-sdl/citydlg.c:2806
 #, c-format
 msgid "Gold: %d (%d) per turn"
-msgstr "Auksas: %d (%d) per Ä—jimÄ…"
+msgstr "Oro: %d (%d) povice"
 
 #: client/gui-sdl/citydlg.c:2853
 #, c-format
 msgid "Upkeep: %d"
-msgstr "IÅ¡laikymas: %d"
+msgstr "Tenado: %d"
 
 #: client/gui-sdl/citydlg.c:2892
 #, c-format
 msgid "Science: %d per turn"
-msgstr "Mokslas: %d per Ä—jimÄ…"
+msgstr "Scienco: %d povice"
 
 #: client/gui-sdl/citydlg.c:2932
-#, c-format
+#, fuzzy, c-format
 msgid "Luxury: %d per turn"
-msgstr "Prabanga: %d per Ä—jimÄ…"
+msgstr "Lukso: %d povice"
 
 #: client/gui-sdl/citydlg.c:2970
 msgid "City growth: blocked"
-msgstr "Miestas auga: užblokuota"
+msgstr "Urba pliiĝo: blokita"
 
 #: client/gui-sdl/citydlg.c:2972
 msgid "City growth: never"
-msgstr "Miestas auga: niekada"
+msgstr "Urba pliiĝo: neniam"
 
 #: client/gui-sdl/citydlg.c:2976
 #, c-format
 msgid "City shrinks: %d %s"
-msgstr "Miestas mažėja: %d %s"
+msgstr "Urba malpliiĝo: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12482,365 +12760,362 @@ msgstr "Miestas mažėja: %d %s"
 #: client/gui-sdl/wldlg.c:1372 client/gui-sdl/wldlg.c:1486
 msgid "turn"
 msgid_plural "turns"
-msgstr[0] "Ä—jimas"
-msgstr[1] "Ä—jimai"
-msgstr[2] "ėjimų"
+msgstr[0] "vico"
+msgstr[1] "vicoj"
 
 #: client/gui-sdl/citydlg.c:2980
-#, c-format
+#, fuzzy, c-format
 msgid "City growth: %d %s"
-msgstr "Miestas auga: %d %s"
+msgstr "Urba pliiĝo: %d vico"
 
 #: client/gui-sdl/citydlg.c:3019 client/gui-sdl/citydlg.c:3131
 msgid "Stock"
-msgstr "Atsargos"
+msgstr "Stoko"
 
 #: client/gui-sdl/citydlg.c:3030 data/default/buildings.ruleset:317
 #: data/civ2/buildings.ruleset:296 data/civ1/buildings.ruleset:243
 msgid "Granary"
-msgstr "Svirnas"
+msgstr "Grenejo"
 
 #: client/gui-sdl/citydlg.c:3305
 msgid "finished"
-msgstr "baigta"
+msgstr "finita"
 
 #: client/gui-sdl/citydlg.c:3601
 #, c-format
 msgid "City of %s (Population %s citizens)"
-msgstr "Miestas %s (Populiacija – %s žmonių)"
+msgstr "Urbo de %s (loĝantaro: %s civitanoj)"
 
 #: client/gui-sdl/citydlg.c:3618
-#, fuzzy
 msgid " - under Citizen Governor control."
-msgstr "Piliečių valdytojas"
+msgstr "- sub la regado de la urba reganto."
 
 #: client/gui-sdl/citydlg.c:3697
-#, fuzzy
 msgid "Present units"
-msgstr "Esantys daliniai %d"
+msgstr "Ĉeestantaj unuoj"
 
 #: client/gui-sdl/citydlg.c:3708 client/gui-win32/citydlg.c:807
 msgid "Supported units"
-msgstr "Palaikomi daliniai"
+msgstr "Subtenitaj unuoj"
 
 #: client/gui-sdl/citydlg.c:3780
 msgid "Change production"
-msgstr "Keisti gamybÄ…"
+msgstr "Ŝanĝu produktadon"
 
 #: client/gui-sdl/citydlg.c:3794 client/gui-sdl/dialogs.c:1270
 msgid "Hurry production"
-msgstr "Skubinti produkcijÄ…"
+msgstr "Akcelu produktadon"
 
 #: client/gui-sdl/citydlg.c:3825
 msgid "Previous city"
-msgstr "Ankstesnis miestas"
+msgstr "AntaÅ­a urbo"
 
 #: client/gui-sdl/citydlg.c:3840
 msgid "Next city"
-msgstr "Kitas miestas"
+msgstr "Sekva urbo"
 
 #: client/gui-sdl/cityrep.c:160
 msgid "size"
-msgstr "dydis"
+msgstr "grando"
 
 #: client/gui-sdl/cityrep.c:165
 msgid ""
 "time\n"
 "to grow"
 msgstr ""
-"laikas\n"
-" paaugti"
+"tempo\n"
+"de pliiĝo"
 
 #: client/gui-sdl/cityrep.c:185 client/gui-sdl/mapctrl.c:1590
 msgid "Cities Report"
-msgstr "Miestų ataskaita"
+msgstr "Raporto pri urboj"
 
 #: client/gui-sdl/cityrep.c:201
 msgid "Close Dialog"
-msgstr ""
+msgstr "Fermu fenestron"
 
 #: client/gui-sdl/cityrep.c:215
 msgid "Information Report"
-msgstr "InformacinÄ— ataskaita"
+msgstr "Pri:"
 
 #: client/gui-sdl/cityrep.c:226
 msgid "Happiness Report"
-msgstr "LaimÄ—s atasktaita"
+msgstr "Raporto pri kontenteco"
 
 #: client/gui-sdl/cityrep.c:237
 msgid "Garrison Report"
-msgstr "KarinÄ— ataskaita"
+msgstr "Raporto de Garrison"
 
 #: client/gui-sdl/cityrep.c:248
 msgid "Maintenance Report"
-msgstr "IÅ¡laikymo ataskaita"
+msgstr "Raporto pri bontenado"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
-msgstr "darbų sąrašas"
+msgstr "laborlisto"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
 msgstr ""
 "\n"
-"baigta"
+"finita"
 
 #: client/gui-sdl/cma_fe.c:452 client/gui-win32/cma_fe.c:458
 msgid "Presets"
-msgstr ""
+msgstr "Antaŭagordaĵoj"
 
 #: client/gui-sdl/cma_fe.c:855
 #, c-format
 msgid "City of %s (Population %s citizens) : %s"
-msgstr ""
+msgstr "Urbo de %s (Populacio %sj civitanoj) : %s"
 
 #: client/gui-sdl/cma_fe.c:972
 msgid "Save settings as..."
-msgstr "IÅ¡saugoti nustatymus tarp ..."
+msgstr "Konservu agordaĵojn kiel..."
 
 #: client/gui-sdl/cma_fe.c:981
 msgid "Load settings"
-msgstr "Įkelti nustatymus"
+msgstr "Ŝargu agordaĵojn"
 
 #: client/gui-sdl/cma_fe.c:990
 msgid "Delete settings"
-msgstr "IÅ¡trinti nustatymus"
+msgstr "Nuligu agordaĵojn"
 
 #: client/gui-sdl/cma_fe.c:999 client/gui-win32/cma_fe.c:490
 msgid "Control city"
-msgstr "Kontroliuoti miestÄ…"
+msgstr "Regu urbon"
 
 #: client/gui-sdl/cma_fe.c:1008 client/gui-win32/cma_fe.c:488
 #: data/Freeciv.in:1470
 msgid "Apply once"
-msgstr "Patvirtinti vienÄ…kart"
+msgstr "Apliku unufoje"
 
 #: client/gui-sdl/cma_fe.c:1017 client/gui-win32/cma_fe.c:492
 msgid "Release city"
-msgstr "Atlaisvinti miestÄ…"
+msgstr "Malpremu urbon"
 
 #: client/gui-sdl/connectdlg.c:238
 msgid "Creating Server List..."
-msgstr "Kuriamas serverių sąrašas..."
+msgstr "Kreante liston pri la serviloj..."
 
 #: client/gui-sdl/connectdlg.c:279 client/gui-sdl/connectdlg.c:343
 msgid "No LAN servers found"
-msgstr "Nerasta LAN serverių"
+msgstr "Neniu loka servilo estis trovita"
 
 #: client/gui-sdl/connectdlg.c:281 client/gui-sdl/connectdlg.c:345
 msgid "No public servers found"
-msgstr "Nerasta viešų serverių"
+msgstr "Nenio publika servilo estis trovita"
 
 #: client/gui-sdl/connectdlg.c:555
 msgid "Player Name :"
-msgstr "Žaidėjo vardas :"
+msgstr "Nomo de ludanto :"
 
 #: client/gui-sdl/connectdlg.c:571
 msgid "Freeciv Server :"
-msgstr "Freeciv serveris :"
+msgstr "Freeciv-Servilo :"
 
 #: client/gui-sdl/connectdlg.c:588
 msgid "Port :"
-msgstr "Prievadas:"
+msgstr "Pordo :"
 
 #: client/gui-sdl/connectdlg.c:608 client/gui-win32/connectdlg.c:1096
 #: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
 msgid "Connect"
-msgstr "Sujungti"
+msgstr "Konektu"
 
 #: client/gui-sdl/connectdlg.c:794 client/gui-sdl/connectdlg.c:977
 #: client/gui-xaw/connectdlg.c:145
 msgid "Next"
-msgstr "Kitas"
+msgstr "Sekva"
 
 #: client/gui-sdl/dialogs.c:463 client/gui-sdl/menu.c:437
 #: client/gui-win32/repodlgs.c:724 data/Freeciv.in:1951
 msgid "Upgrade"
-msgstr "Patobulinti"
+msgstr "Äœisdatigu"
 
 #: client/gui-sdl/dialogs.c:660
 #, c-format
 msgid "Contact %s (%d / %d) %s(%d,%d,%d) %s"
-msgstr ""
+msgstr "Kontaktu %sn (%d / %d) %sn (%d,%d,%d) %sn"
 
 #: client/gui-sdl/dialogs.c:661 client/gui-sdl/dialogs.c:673
 #: client/gui-sdl/dialogs.c:1396 client/gui-sdl/dialogs.c:1415
 #: client/gui-sdl/dialogs.c:1512 client/gui-sdl/dialogs.c:1540
 msgid "Veteran"
-msgstr "Veteranas"
+msgstr "Veterana"
 
 #: client/gui-sdl/dialogs.c:671
 #, c-format
 msgid "%s %s %s(A:%d D:%d M:%d FP:%d) HP:%d%%"
-msgstr ""
+msgstr "%sj %sj %s(A:%d D:%d M:%d FP:%d) ĈP:%d%%"
 
 #: client/gui-sdl/dialogs.c:683 client/gui-sdl/dialogs.c:1425
 #: client/gui-sdl/dialogs.c:1550
 #, c-format
 msgid " CtW: Att:%d%% Def:%d%%"
-msgstr ""
+msgstr "Åœancoj pri venko: A:%d%% D:%d%%"
 
 #: client/gui-sdl/dialogs.c:837 client/gui-sdl/dialogs.c:1216
 msgid "Terrain Info"
-msgstr "Reljfefo informacija"
+msgstr "Pri areo"
 
 #: client/gui-sdl/dialogs.c:1190
 msgid "Advanced Menu"
-msgstr "Specialus meniu"
+msgstr "Menuo pri avanaĵoj"
 
 #: client/gui-sdl/dialogs.c:1244
 #, c-format
 msgid "Zoom to : %s"
-msgstr "Išdidinti į : %s"
+msgstr "Zomu je : %s"
 
 #: client/gui-sdl/dialogs.c:1258 client/gui-win32/citydlg.c:1058
 #: data/Freeciv.in:2073
 msgid "Change Production"
-msgstr "Keisti gamybÄ…"
+msgstr "Ŝanĝu produktadon"
 
 #: client/gui-sdl/dialogs.c:1282
-#, fuzzy
 msgid "Change City Governor settings"
-msgstr "Pakeisti C.M.A nustatymus"
+msgstr "Ŝanĝu agordojn pri urba regado"
 
 #: client/gui-sdl/dialogs.c:1303
 msgid "Goto here"
-msgstr "Eiti čia"
+msgstr "Iru ĉi tien"
 
 #: client/gui-sdl/dialogs.c:1314
 msgid "Patrol here"
-msgstr "Patruliuoti čia"
+msgstr "Patrolu ĉi tie"
 
 #: client/gui-sdl/dialogs.c:1327
 msgid "Connect here"
-msgstr "Prisijungti čia"
+msgstr "Kunligu ĉi tie"
 
 #: client/gui-sdl/dialogs.c:1348
 msgid "Paradrop here"
-msgstr "Nuskraidinti čia"
+msgstr "Paraŝutu ĉi tie"
 
 #: client/gui-sdl/dialogs.c:1395 client/gui-sdl/dialogs.c:1511
 #, c-format
 msgid "Activate %s (%d / %d) %s (%d,%d,%d) %s"
-msgstr ""
+msgstr "Aktivigo de %s (%d / %d) %s (%d,%d,%d) %s"
 
 #: client/gui-sdl/dialogs.c:1413 client/gui-sdl/dialogs.c:1538
 #, c-format
 msgid "%s %s %s (A:%d D:%d M:%d FP:%d) HP:%d%%"
-msgstr ""
+msgstr "%sj %sj %s (A:%d D:%d M:%d FP:%d) ĈP:%d%%"
 
 #: client/gui-sdl/dialogs.c:1474 client/gui-win32/dialogs.c:761
 #: data/Freeciv.in:561
 msgid "Ready all"
-msgstr "Aktyvuoti visus"
+msgstr "Ĉiuj pretaj"
 
 #: client/gui-sdl/dialogs.c:1483
 msgid "Sentry idle"
-msgstr "Dalinį pastatyti sargybai"
+msgstr "PaÅ­zigu gardosoldaton"
 
 #: client/gui-sdl/dialogs.c:1569
 #, c-format
 msgid "View Civiliopedia entry for %s"
-msgstr "Pasižiūrėti Civiliopedijos įrašą apie %s"
+msgstr "Legu Civiliopedia-n sub kapvorto %s"
 
 #: client/gui-sdl/dialogs.c:1969
 msgid "Choose Your New Government"
-msgstr "Pasirinkite naujÄ… valdymo formÄ…"
+msgstr "Elektu vian novan regsistemo"
 
 #: client/gui-sdl/dialogs.c:2073
 msgid "REVOLUTION!"
-msgstr "REVOLIUCIJA!"
+msgstr "REVOLUCIO!"
 
 #: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
 #: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
 msgid "Female"
-msgstr "Moteris"
+msgstr "Ina"
 
 #: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
 #: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
 msgid "Male"
-msgstr "Vyras"
+msgstr "Malina"
 
 #: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
 #: client/gui-sdl/mapctrl.c:2575 client/gui-win32/dialogs.c:593
 #: client/gui-win32/inputdlg.c:145 client/gui-win32/repodlgs.c:988
 msgid "OK"
-msgstr "Gerai"
+msgstr "BONE"
 
 #: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
 msgid "What nation will you be?"
-msgstr "Kokia tauta jūs būsite?"
+msgstr "Kiu nacio vi deziras esti?"
 
 #: client/gui-sdl/diplodlg.c:453 client/gui-win32/diplodlg.c:620
 #: data/Freeciv.in:492
 msgid "Pacts"
-msgstr "Susitarimai"
+msgstr "Paktoj"
 
 #: client/gui-sdl/diplodlg.c:511 client/gui-win32/diplodlg.c:618
 #: client/gui-win32/diplodlg.c:670
 msgid "Give shared vision"
-msgstr "Duoti bendrÄ… regÄ—jimo laukÄ…"
+msgstr "Donu komunan vidon"
 
 #: client/gui-sdl/diplodlg.c:525 client/gui-win32/diplodlg.c:609
 #: client/gui-win32/diplodlg.c:661 data/Freeciv.in:374 data/Freeciv.in:383
 msgid "Maps"
-msgstr "Žemėlapiai"
+msgstr "Mapoj"
 
 #: client/gui-sdl/diplodlg.c:533
 msgid "World map"
-msgstr "Pasaulio žemėlapis"
+msgstr "Mapo de la mondo"
 
 #: client/gui-sdl/diplodlg.c:547
 msgid "Sea map"
-msgstr "Jūros žemėlapis"
+msgstr "Mapo de la maro"
 
 #: client/gui-sdl/diplodlg.c:563
+#, fuzzy
 msgid "Give embassy"
-msgstr "Duoti ambasadÄ…"
+msgstr "Ambasado"
 
 #: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
 #: client/gui-win32/diplodlg.c:666 client/gui-xaw/diplodlg.c:478
 #: client/gui-xaw/diplodlg.c:485
 #, c-format
 msgid "Gold(max %d)"
-msgstr ""
+msgstr "Oro(maks. %d)"
 
 #: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
 #: client/gui-win32/diplodlg.c:610 client/gui-win32/diplodlg.c:662
 #: data/Freeciv.in:392 data/Freeciv.in:401
 msgid "Advances"
-msgstr "Pasiekimai"
+msgstr "Avanaĵoj"
 
 #: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
 #: data/Freeciv.in:269
 msgid "Diplomacy meeting"
-msgstr "Diplomatinis susitikimas"
+msgstr "Diplomatia renkontiĝo"
 
 #: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
 #: data/Freeciv.in:510
 msgid "Cancel meeting"
-msgstr "Nutraukti susitikimÄ…"
+msgstr "Nuligu renkontiĝon"
 
 #: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
 #: data/Freeciv.in:501
 msgid "Accept treaty"
-msgstr "Priimti sutartį"
+msgstr "Subskribu kontrakton"
 
 #. TRANS: "Polish incident !" FIXME!!!
 #: client/gui-sdl/diplodlg.c:1304
 #, c-format
 msgid "%s incident !"
-msgstr "%s incidentas !"
+msgstr "%s akcidento !"
 
 #: client/gui-sdl/diplodlg.c:1322
 msgid "Shall we declare WAR on them?"
-msgstr "Ar mes turime paskelbti jiems KARÄ„?"
+msgstr "Ĉu ni deklaros militon kontraŭ ili?"
 
 #: client/gui-sdl/diplodlg.c:1433
 msgid "Foreign Minister"
-msgstr "Užsienio reikalų ministras"
+msgstr "Ministro por eksterlandaj aferoj"
 
 #: client/gui-sdl/diplodlg.c:1449
 #, c-format
@@ -12848,113 +13123,116 @@ msgid ""
 "Sir!, the %s ambassador has arrived\n"
 "What are your wishes?"
 msgstr ""
-"Pone! Atvyko %s ambasadorius\n"
-"Kokie jūsų norai?"
+"Moŝto!, la %s ambasadoro alvenis\n"
+"Kiuj estas viaj deziroj?"
 
 #: client/gui-sdl/diplodlg.c:1465
 msgid "Declare WAR"
-msgstr "Paskelbti karÄ…"
+msgstr "MILITdeklaro"
 
 #: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
 msgid "Cancel Treaty"
-msgstr "Atšaukti sutartį"
+msgstr "Nuligu kontrakton"
 
 #: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
 #: data/Freeciv.in:3254
 msgid "Withdraw vision"
-msgstr "Atsiimti bendro regÄ—jimo laukÄ…"
+msgstr "Repripensu la vidon"
 
 #: client/gui-sdl/diplodlg.c:1507
 msgid "Call Diplomatic Meeting"
-msgstr "Sušaukti diplomatinį susitikimą"
+msgstr "Voku diplomatian renkontiĝon"
 
 #: client/gui-sdl/diplodlg.c:1521
 msgid "Send him back"
-msgstr "Siųsti jį atgal"
+msgstr "Retrosendu lin"
 
 #: client/gui-sdl/diplomat_dialog.c:590 data/Freeciv.in:2278
 #: data/Freeciv.in:2304
 msgid "Establish Embassy"
-msgstr "Įkurti ambasadą"
+msgstr ""
 
 #: client/gui-sdl/diplomat_dialog.c:605 data/Freeciv.in:2280
 msgid "Investigate City"
-msgstr "IÅ¡tirti miestÄ…"
+msgstr "Enketu la urbon"
 
 #: client/gui-sdl/diplomat_dialog.c:620 data/Freeciv.in:2311
 msgid "Poison City"
-msgstr "Užnuodyti miestą"
+msgstr "Venenu la urbon"
 
 #: client/gui-sdl/diplomat_dialog.c:634 data/Freeciv.in:2283
 msgid "Sabotage City"
-msgstr "Sabotuoti miestÄ…"
+msgstr "Sabotu la urbon"
 
 #: client/gui-sdl/diplomat_dialog.c:665 data/Freeciv.in:2288
 #: data/Freeciv.in:2321
 msgid "Incite a Revolt"
-msgstr "Pakurstyti revoliucijÄ…"
+msgstr "Instigu al ribelo"
 
 #: client/gui-sdl/diplomat_dialog.c:716 data/Freeciv.in:2434
 msgid "Sabotage Enemy Unit"
-msgstr "Sabotuoti priešo dalinį"
+msgstr "Saboti malamikan unuon"
 
 #: client/gui-sdl/graphics.c:283
 #, c-format
 msgid "load_surf: Failed to load graphic file %s!"
-msgstr ""
+msgstr "load_surf: Åœargo de grafika dosiero %s malsukcesis!"
 
 #: client/gui-sdl/graphics.c:291
 #, c-format
 msgid "load_surf: Unable to convert file %s into screen's format!"
 msgstr ""
+"load_surf: Estas neeble aranĝi la dosieron %s en la formato de la ekrano!"
 
 #: client/gui-sdl/graphics.c:313
 #, c-format
 msgid "load_surf_with_flags: Unable to load file %s."
-msgstr ""
+msgstr "load_surf_with_flags: Estas neeble ŝargi la dosieron %s."
 
 #: client/gui-sdl/graphics.c:319
 #, c-format
 msgid "Unable to convert image from file %s into format %d."
-msgstr "Negalima paversti paveiksliuko iš failo %s į formatą %d."
+msgstr "Estas neeble aranĝi bildon de la dosiero %s en la formato %d."
 
 #: client/gui-sdl/graphics.c:344
 #, c-format
 msgid "Unable to create Sprite (Surface) of size %d x %d %d Bits in format %d"
 msgstr ""
+"Estas neeble krei filmeron (surfaco) laÅ­ grando je %d x %d %d bitoj en "
+"formato %d"
 
 #: client/gui-sdl/graphics.c:1012
 #, c-format
 msgid "Unable to initialize SDL library: %s"
-msgstr "Negalima paleisti SDL bibliotekos: %s"
+msgstr "Estas neeble prepari la SDL-bibliotekon: %s"
 
 #: client/gui-sdl/graphics.c:1021
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to initialize  SDL_ttf library: %s"
-msgstr "Negalima paleisti SDL_ttf bibliotekos: %s"
+msgstr "Estas neeble prepari la SDL_ttf bibliotekon: %s"
 
 #: client/gui-sdl/graphics.c:1058
 #, c-format
 msgid "No available mode for this resolution : %d x %d %d bpp"
-msgstr ""
+msgstr "Ne estas disponebla moduso por tiu ĉi difino : %d x %d %d bpb"
 
 #: client/gui-sdl/graphics.c:1061
 msgid "Setting default resolution to : 640 x 480 16 bpp SW"
-msgstr ""
+msgstr "Oni agordas normalan difinon laÅ­ : 640 x 480 16 bpb SW"
 
 #: client/gui-sdl/graphics.c:1068
 #, c-format
 msgid "Unable to set this resolution: %d x %d %d bpp %s"
-msgstr ""
+msgstr "Estas neeble uzi tiun ĉi difinon: %d x %d %d bpb %s"
 
 #: client/gui-sdl/graphics.c:1075
 #, c-format
 msgid "Setting resolution to: %d x %d %d bpp"
-msgstr "Raiška nustatoma į: %d x %d %d bpp"
+msgstr "Oni agordas la difinon laÅ­: %d x %d %d bpb"
 
 #: client/gui-sdl/gui_main.c:150
 msgid "Full Screen"
-msgstr "Visas ekranas"
+msgstr "Plenekrane"
 
 #: client/gui-sdl/gui_main.c:151
 msgid ""
@@ -12963,7 +13241,7 @@ msgstr ""
 
 #: client/gui-sdl/gui_main.c:154
 msgid "Screen width"
-msgstr "Ekrano plotis"
+msgstr "Ekranlarĝo"
 
 #: client/gui-sdl/gui_main.c:155
 msgid "This option saves the width of the selected screen resolution"
@@ -12971,7 +13249,7 @@ msgstr ""
 
 #: client/gui-sdl/gui_main.c:158
 msgid "Screen height"
-msgstr "Ekrano aukštis"
+msgstr "Ekranalto"
 
 #: client/gui-sdl/gui_main.c:159
 msgid "This option saves the height of the selected screen resolution"
@@ -12985,7 +13263,7 @@ msgstr ""
 
 #: client/gui-sdl/gui_main.c:204
 msgid "  -f,  --fullscreen\tStart Client in Fullscreen mode\n"
-msgstr "  -f,  --fullscreen\tPaleisti klientą viso ekrano režimu\n"
+msgstr ""
 
 #: client/gui-sdl/gui_main.c:205
 msgid ""
@@ -12997,23 +13275,23 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
-#, c-format
+#: client/gui-sdl/gui_main.c:665
+#, fuzzy, c-format
 msgid "Making screenshot fc_%05d.bmp"
-msgstr ""
+msgstr "Ekfoto de %s"
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
-msgstr "Naudojama vaizdo išvestis: %s"
+msgstr "Uzante video-eligon: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
-msgstr "Paleidžiamas klientas"
+msgstr "Preparado de la kliento"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
-msgstr "Laukiama žaidimo pradžios"
+msgstr "Atendante la komencon de la ludo"
 
 #: client/gui-sdl/gui_string.c:608
 msgid ""
@@ -13024,15 +13302,15 @@ msgstr ""
 #. TRANS: Future Technology
 #: client/gui-sdl/gui_tilespec.c:506
 msgid "FT"
-msgstr "AT"
+msgstr "ET"
 
 #: client/gui-sdl/helpdlg.c:212
 msgid "Help : Improvements"
-msgstr "Pagalba : Patobulinimai"
+msgstr "Helpilo: Urbaj plibonigoj"
 
 #: client/gui-sdl/helpdlg.c:601
 msgid "Help : Units"
-msgstr "Pagalba : Daliniai"
+msgstr "Helpilo: Unuoj"
 
 #: client/gui-sdl/helpdlg.c:736 client/gui-sdl/helpdlg.c:749
 #: client/gui-sdl/wldlg.c:1350 client/gui-sdl/wldlg.c:1356
@@ -13042,34 +13320,30 @@ msgstr "Pagalba : Daliniai"
 #: client/gui-sdl/wldlg.c:1494
 msgid "shield"
 msgid_plural "shields"
-msgstr[0] "skydas"
-msgstr[1] "skydai"
-msgstr[2] "skydų"
+msgstr[0] "produktado"
+msgstr[1] "produktadoj"
 
 #: client/gui-sdl/helpdlg.c:741 client/gui-sdl/helpdlg.c:764
 msgid "citizen"
 msgid_plural "citizens"
-msgstr[0] "pilietis"
-msgstr[1] "piliečiai"
-msgstr[2] "piliečių"
+msgstr[0] "civitano"
+msgstr[1] "civitanoj"
 
 #: client/gui-sdl/helpdlg.c:754
 msgid "food"
 msgid_plural "foods"
-msgstr[0] "maistas"
-msgstr[1] "maisto"
-msgstr[2] "maisto"
+msgstr[0] "nutraĵo"
+msgstr[1] "nutraĵo"
 
 #: client/gui-sdl/helpdlg.c:759
 msgid "gold"
 msgid_plural "golds"
-msgstr[0] "auksas"
-msgstr[1] "aukso"
-msgstr[2] "aukso"
+msgstr[0] "oro"
+msgstr[1] "oro"
 
 #: client/gui-sdl/helpdlg.c:1000
 msgid "( with "
-msgstr "( su "
+msgstr "( kun "
 
 #: client/gui-sdl/helpdlg.c:1003
 msgid " )"
@@ -13077,23 +13351,23 @@ msgstr " )"
 
 #: client/gui-sdl/helpdlg.c:1891
 msgid "Help : Advances Tree"
-msgstr "Pagalba : Pasiekimų medis"
+msgstr "Helpilo: Arbumo pri la avanaĵoj"
 
 #: client/gui-sdl/inteldlg.c:219 client/gui-win32/inteldlg.c:85
 #: data/Freeciv.in:173 data/Freeciv.in:223
 msgid "Foreign Intelligence Report"
-msgstr "Užsienio žvalgybos ataskaita"
+msgstr "Raporto pri fora spionado"
 
 #: client/gui-sdl/inteldlg.c:258
 #, c-format
 msgid "Intelligence Information about the %s Spaceship"
-msgstr "Žvalgybos informacija apie %s erdvėlaivį"
+msgstr "Informoj de la spionoj pri la %s Kosmoŝipo"
 
 #: client/gui-sdl/inteldlg.c:266 client/gui-win32/inteldlg.c:94
 #: client/gui-xaw/inteldlg.c:182
 #, c-format
 msgid "Intelligence Information for the %s Empire"
-msgstr "Žvalgybos informacija %s imperijai"
+msgstr "Informoj de la spionoj por la %s Imperio"
 
 #: client/gui-sdl/inteldlg.c:289
 #, fuzzy, c-format
@@ -13103,102 +13377,102 @@ msgid ""
 "Tax: %d%% Science: %d%% Luxury: %d%%\n"
 "Researching: unknown"
 msgstr ""
-"Valdovas: %s %s  VyriausybÄ—: %s\n"
-"SostinÄ—: %s  Auksas: %d\n"
-"Mokesčiai: %d%% Mokslas: %d%% Prabanga: %d%%\n"
-"Tyrinėjama: Nežinoma"
+"Estro: %s %s  Regsistemo: %s\n"
+"Ĉefurbo: %s  Oro: %d\n"
+"Impostoj: %d%% Scienco: %d%% Lukso: %d%%\n"
+"Studado: nekonata"
 
 #: client/gui-sdl/inteldlg.c:301
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Ruler: %s %s  Government: %s\n"
 "Capital: %s  Gold: %d\n"
 "Tax: %d%% Science: %d%% Luxury: %d%%\n"
 "Researching: %s(%d/%d)"
 msgstr ""
-"Valdovas: %s %s  VyriausybÄ—: %s\n"
-"SostinÄ—: %s  Auksas: %d\n"
-"Mokesčiai: %d%% Mokslas: %d%% Prabanga: %d%%\n"
-"TyrinÄ—jama: %s(%d/%d)"
+"Estro: %s %s  Regsistemo: %s\n"
+"Ĉefurbo: %s  Oro: %d\n"
+"Impostoj: %d%% Scienco: %d%% Lukso: %d%%\n"
+"Studado: %s(%d/%d)"
 
 #: client/gui-sdl/inteldlg.c:367
 msgid "Their techs that we don't have :"
-msgstr "Jų technologijos, kurių mes neturime :"
+msgstr "Iliaj teĥnologioj kiujn ni ne havas:"
 
 #: client/gui-sdl/mapctrl.c:274
 msgid "Show Unit Info Window"
-msgstr "Rodyti dalinio informacinį langą"
+msgstr "Vidigu fenestron pri unuoj"
 
 #: client/gui-sdl/mapctrl.c:330 client/gui-sdl/mapctrl.c:1447
 msgid "Hide Unit Info Window"
-msgstr "SlÄ—pti dalinio informacijos langÄ…"
+msgstr "Kaŝu fenestron pri unuoj"
 
 #: client/gui-sdl/mapctrl.c:384
 msgid "Show MiniMap"
-msgstr "Rodyti mini žemėlapį"
+msgstr "Vidigu mapeton"
 
 #: client/gui-sdl/mapctrl.c:462 client/gui-sdl/mapctrl.c:1658
 msgid "Hide MiniMap"
-msgstr "Slėpti mini žemėlapį"
+msgstr "Kaŝu mapeton"
 
 #: client/gui-sdl/mapctrl.c:514
 msgid "Show Messages (F10)"
-msgstr "Rodyti pranešimus (F10)"
+msgstr "Vidigu mesaĝojn (F10)"
 
 #: client/gui-sdl/mapctrl.c:517
 msgid "Hide Messages (F10)"
-msgstr "Slėpti pranešimus (F10)"
+msgstr "Kaŝu  mesaĝojn (F10)"
 
 #: client/gui-sdl/mapctrl.c:673
 msgid "Scale Minimap"
-msgstr ""
+msgstr "Skalu mapeton"
 
 #: client/gui-sdl/mapctrl.c:684
 msgid "Single Tile Width"
-msgstr "Vieno laukelio plotis"
+msgstr "Larĝo je unu kahelo"
 
 #: client/gui-sdl/mapctrl.c:688
 msgid "Single Tile Height"
-msgstr "Vieno laukelio aukštis"
+msgstr "Alto je unu kahelo"
 
 #: client/gui-sdl/mapctrl.c:733 client/gui-sdl/mapctrl.c:1077
 msgid "Exit"
-msgstr "IÅ¡eiti"
+msgstr "Eliro"
 
 #: client/gui-sdl/mapctrl.c:1031
 msgid "Scale Unit Info"
-msgstr ""
+msgstr "Skalu fenestron pri unuoj"
 
 #: client/gui-sdl/mapctrl.c:1041
 msgid "Width"
-msgstr "Plotis"
+msgstr "Larĝo"
 
 #: client/gui-sdl/mapctrl.c:1045
 msgid "Height"
-msgstr "Aukštis"
+msgstr "Alto"
 
 #: client/gui-sdl/mapctrl.c:1425 client/gui-sdl/mapview.c:312
 #: client/gui-sdl/mapview.c:315 client/gui-xaw/menu.c:131
 msgid "Revolution"
-msgstr "Revoliucija"
+msgstr "Revolucio"
 
 #: client/gui-sdl/mapctrl.c:1591
 msgid "or"
-msgstr "arba"
+msgstr "aÅ­"
 
 #: client/gui-sdl/mapctrl.c:1615
 msgid "Hide Messages"
-msgstr "Slėpti pranešimus"
+msgstr "Kaŝu mesaĝojn"
 
 #: client/gui-sdl/mapctrl.c:1625
 msgid "Toggle Minimap Mode"
-msgstr ""
+msgstr "Mastrumu mapetan moduson"
 
 #: client/gui-sdl/mapctrl.c:1637 client/gui-sdl/optiondlg.c:2110
 #: client/gui-sdl/optiondlg.c:2166 client/gui-sdl/pages.c:241
 #: data/Freeciv.in:1217
 msgid "Options"
-msgstr "Nustatymai"
+msgstr "Opcioj"
 
 #: client/gui-sdl/mapview.c:155
 #, c-format
@@ -13211,17 +13485,17 @@ msgstr ""
 #: client/gui-sdl/mapview.c:412
 #, c-format
 msgid "%s Population: %s  Year: %s  Gold %d "
-msgstr "%s Gyventojai: %s  Metai: %s  Auksas %d "
+msgstr "%s Populacio: %s  Jaro: %s  Oro %d "
 
 #: client/gui-sdl/mapview.c:420
-#, c-format
+#, fuzzy, c-format
 msgid "%s Population: %s  Year: %s  Gold %d Tax: %d Lux: %d Sci: %d "
-msgstr ""
+msgstr "%s Populacio: %s  Jaro: %s  Oro %d Imp.: %d Lukso: %d Sci.: %d "
 
 #: client/gui-sdl/mapview.c:727 data/default/units.ruleset:24
 #: data/civ2/units.ruleset:18 data/civ1/units.ruleset:18
 msgid "veteran"
-msgstr "veteranas"
+msgstr "veterana"
 
 #: client/gui-sdl/mapview.c:757
 msgid ""
@@ -13229,7 +13503,7 @@ msgid ""
 "Our Territory"
 msgstr ""
 "\n"
-"Mūsų teritorija"
+"Nia Teritorio"
 
 #: client/gui-sdl/mapview.c:763
 #, c-format
@@ -13241,13 +13515,10 @@ msgid_plural ""
 "%s territory (%d turn ceasefire)"
 msgstr[0] ""
 "\n"
-"%s teritorija (%d Ä—jimo paliaubos)"
+"%s teritorio (%d vico de pafĉesigo)"
 msgstr[1] ""
 "\n"
-"%s teritorija (%d ėjimų paliaubos)"
-msgstr[2] ""
-"\n"
-"%s teritorija (%d ėjimų paliaubos)"
+"%s teritorio (%d vicoj de pafĉesigo)"
 
 #: client/gui-sdl/mapview.c:767
 #, c-format
@@ -13256,7 +13527,7 @@ msgid ""
 "Territory of the %s %s"
 msgstr ""
 "\n"
-"Teritorija, priklausanti %s %s"
+"Teritorio de la %s %s"
 
 #: client/gui-sdl/mapview.c:773
 msgid ""
@@ -13264,7 +13535,7 @@ msgid ""
 "Unclaimed territory"
 msgstr ""
 "\n"
-"Nepriklausoma teritorija"
+"Ne postulita teritorio"
 
 #: client/gui-sdl/mapview.c:790
 #, c-format
@@ -13273,26 +13544,26 @@ msgid ""
 "City of %s"
 msgstr ""
 "\n"
-"%s miestas"
+"Urbo de %s"
 
 #: client/gui-sdl/mapview.c:806
 msgid "?blistbegin: with "
-msgstr " su "
+msgstr "?blistbegin: kun "
 
 #: client/gui-sdl/mapview.c:808 data/default/buildings.ruleset:113
 #: data/civ2/buildings.ruleset:96 data/civ1/buildings.ruleset:69
 msgid "Barracks"
-msgstr "KareivinÄ—s"
+msgstr "Kazernoj"
 
 #: client/gui-sdl/mapview.c:820 data/default/buildings.ruleset:45
 #: data/civ2/buildings.ruleset:28
 msgid "Airport"
-msgstr "Oro uostas"
+msgstr "Flughaveno"
 
 #: client/gui-sdl/mapview.c:826 data/default/buildings.ruleset:209
 #: data/civ2/buildings.ruleset:189 data/civ1/buildings.ruleset:158
 msgid "City Walls"
-msgstr "Miesto sienos"
+msgstr "Murzono"
 
 #: client/gui-sdl/mapview.c:829
 msgid "?blistend:"
@@ -13315,203 +13586,201 @@ msgid ""
 "Food/Prod/Trade: %s"
 msgstr ""
 "\n"
-"Maistas/Gamyba/Prekyba: %s"
+"Nutraĵo/Prod/Kom: %s"
 
 #: client/gui-sdl/mapview.c:1082
 msgid "End of Turn"
-msgstr "Ä–jimo pabaiga"
+msgstr "Fino de la vico"
 
 #: client/gui-sdl/mapview.c:1082
-#, fuzzy
 msgid "Press"
-msgstr "PrincesÄ—"
+msgstr "Premu"
 
 #. TRANS: keyboard
 #: client/gui-sdl/menu.c:373
 msgid "No orders"
-msgstr "Nėra nurodymų"
+msgstr "Neniu ordono"
 
 #: client/gui-sdl/menu.c:373
-#, fuzzy
 msgid "Space"
-msgstr "Prieskoniai"
+msgstr "Spaco"
 
 #: client/gui-sdl/menu.c:387 client/gui-xaw/menu.c:212
 msgid "Wait"
-msgstr "Laukti"
+msgstr "Atendu"
 
 #: client/gui-sdl/menu.c:412
 msgid "Diplomat|Spy Actions"
-msgstr "Diplomato|Å nipo veiksmai"
+msgstr "Diplomatiaj/Spionaj agoj"
 
 #: client/gui-sdl/menu.c:424
 msgid "Disband"
-msgstr "IÅ¡formuoti"
+msgstr "Dissolvu"
 
 #: client/gui-sdl/menu.c:463
 msgid "Goto City"
-msgstr "Eiti į miestą"
+msgstr "Iru al la urbo"
 
 #: client/gui-sdl/menu.c:476 client/gui-win32/gotodlg.c:167
 #: data/Freeciv.in:1130
 msgid "Airlift"
-msgstr "Perkelti oru"
+msgstr "Flugtransportu"
 
 #: client/gui-sdl/menu.c:489 client/gui-win32/messagewin.c:149
 #: data/Freeciv.in:3314
 msgid "Goto location"
-msgstr "Eiti į vietą"
+msgstr "Iru al la loko"
 
 #: client/gui-sdl/menu.c:501 client/gui-win32/menu.c:384
 #: client/gui-xaw/menu.c:200
 msgid "Patrol"
-msgstr "Patruliuoti"
+msgstr "Patrolado"
 
 #: client/gui-sdl/menu.c:513
 msgid "Connect irrigation"
-msgstr "Prijungti dÄ—kinimÄ…"
+msgstr "Kunligi irigacion"
 
 #: client/gui-sdl/menu.c:526
 msgid "Connect road"
-msgstr "Sujungti keliu"
+msgstr "Kunligu vojon"
 
 #: client/gui-sdl/menu.c:539
 msgid "Connect railroad"
-msgstr "Sujungti geležinkeliu"
+msgstr "Kunligi fervojon"
 
 #: client/gui-sdl/menu.c:552
 msgid "Auto-Explore"
-msgstr "Automatiškai tyrinėti"
+msgstr "AÅ­tomata esplorado"
 
 #: client/gui-sdl/menu.c:565 client/gui-sdl/menu.c:1247
 msgid "Auto-Attack"
-msgstr "Automatiškai atakuoti"
+msgstr "AÅ­tomata atako"
 
 #: client/gui-sdl/menu.c:567 client/gui-sdl/menu.c:1241
 msgid "Auto-Settler"
-msgstr "Automatiškai įsikurti"
+msgstr "AÅ­tomata farmigo"
 
 #: client/gui-sdl/menu.c:586
 msgid "Wake Up Others"
-msgstr "Pažadinti kitus"
+msgstr "Vekigu la aliajn"
 
 #: client/gui-sdl/menu.c:599 client/gui-xaw/menu.c:188
 msgid "Unload Transporter"
-msgstr "Išlaipinti iš transporterio"
+msgstr "Malŝargu kargoŝipon"
 
 #: client/gui-sdl/menu.c:612 client/gui-xaw/menu.c:190
 msgid "Load"
-msgstr "Įkelti"
+msgstr "Åœargu"
 
 #: client/gui-sdl/menu.c:624 client/gui-xaw/menu.c:191
 msgid "Unload"
-msgstr "IÅ¡laipinti"
+msgstr "Malŝargu"
 
 #: client/gui-sdl/menu.c:636
 msgid "Find Homecity"
-msgstr "Rasti naminį miestą"
+msgstr "Trovu hejmurbon"
 
 #: client/gui-sdl/menu.c:673 client/gui-xaw/menu.c:181
 msgid "Clean Nuclear Fallout"
-msgstr "Valyti radioaktyviÄ…sias dulkes"
+msgstr "Malpolui radioaktivan refalon"
 
 #: client/gui-sdl/menu.c:685 client/gui-win32/menu.c:1257
 #: client/gui-xaw/menu.c:180
 msgid "Paradrop"
-msgstr "Nuleisti parašiutais"
+msgstr "Paraŝuti"
 
 #: client/gui-sdl/menu.c:697 client/gui-win32/menu.c:1259
 #: client/gui-xaw/menu.c:179
 msgid "Clean Pollution"
-msgstr "Valyti taršą"
+msgstr "Malpolui"
 
 #: client/gui-sdl/menu.c:709 client/gui-xaw/menu.c:178
 msgid "Build Airbase"
-msgstr "Statyti oro bazÄ™"
+msgstr "Konstruu avian bazon"
 
 #: client/gui-sdl/menu.c:721 client/gui-win32/menu.c:1250
 #: client/gui-xaw/menu.c:183
 msgid "Fortify"
-msgstr "Įtvirtinti"
+msgstr "Ekipu per defendilo"
 
 #: client/gui-sdl/menu.c:733 client/gui-win32/menu.c:1252
 #: client/gui-xaw/menu.c:177
 msgid "Build Fortress"
-msgstr "Statyti tvirtovÄ™"
+msgstr "Konstruu fortreson"
 
 #: client/gui-sdl/menu.c:745
 msgid "Transform Tile"
-msgstr "Keisti vietovÄ™"
+msgstr "Transformu kahelon"
 
 #: client/gui-sdl/menu.c:758 client/gui-sdl/menu.c:1135
 #: client/gui-win32/menu.c:1117 client/gui-xaw/menu.c:173
 msgid "Build Mine"
-msgstr "Statyti kasyklÄ…"
+msgstr "Konstruu minejon"
 
 #: client/gui-sdl/menu.c:772 client/gui-sdl/menu.c:1101
 #: client/gui-win32/menu.c:1116 client/gui-xaw/menu.c:170
 msgid "Build Irrigation"
-msgstr "Statyti drÄ—kinimÄ…"
+msgstr "Preparu irigacion"
 
 #: client/gui-sdl/menu.c:786
 msgid "Form Traderoute"
-msgstr "Įkurti prekybos maršrutą"
+msgstr "Kreu komercan kurson"
 
 #: client/gui-sdl/menu.c:801 client/gui-sdl/menu.c:1040
 #: client/gui-win32/menu.c:1208 client/gui-xaw/menu.c:169
 msgid "Build Railroad"
-msgstr "Tiesti geležinkelį"
+msgstr "Konstruu fervojon"
 
 #: client/gui-sdl/menu.c:805 client/gui-sdl/menu.c:1046
 #: client/gui-win32/menu.c:1211 client/gui-win32/menu.c:1216
 #: client/gui-xaw/menu.c:168
 msgid "Build Road"
-msgstr "Statyti keliÄ…"
+msgstr "Konstruu vojon"
 
 #: client/gui-sdl/menu.c:825 client/gui-win32/menu.c:1190
 #: client/gui-xaw/menu.c:206
 msgid "Help Build Wonder"
-msgstr "PadÄ—ti statyti stebuklÄ…"
+msgstr "Helpu konstrui mirindaĵon"
 
 #: client/gui-sdl/menu.c:837 client/gui-sdl/menu.c:1019
 #: client/gui-win32/menu.c:1194 client/gui-xaw/menu.c:167
 msgid "Add to City"
-msgstr "Pridėti į miestą"
+msgstr "Aldonu al urbo"
 
 #: client/gui-sdl/menu.c:1064
 #, c-format
 msgid "Form Traderoute with %s ( %d R&G + %d trade ) (R)"
-msgstr ""
+msgstr "Kreu komercan kurson kun %s ( %d R&G + %d komercaj poentoj ) (R)"
 
 #: client/gui-sdl/menu.c:1071
 #, c-format
 msgid "Trade with %s ( %d R&G bonus ) (R)"
-msgstr ""
+msgstr "Komercu kun %s ( %d R&G pluso ) (R)"
 
 #: client/gui-sdl/menu.c:1088
 msgid "Cut Down to"
-msgstr "IÅ¡kirsti iki"
+msgstr "Transformado en"
 
 #: client/gui-sdl/menu.c:1094 client/gui-sdl/menu.c:1118
 msgid "Irrigate to"
-msgstr "DrÄ—kinti iki"
+msgstr "Irigaciado"
 
 #: client/gui-sdl/menu.c:1128
 msgid "Plant Forest"
-msgstr "Užsodinti mišku"
+msgstr "Plantu arbaron"
 
 #: client/gui-sdl/menu.c:1149
 msgid "Transform to"
-msgstr "Keisti į"
+msgstr "Transformu en %s"
 
 #: client/gui-sdl/optiondlg.c:215 client/gui-win32/wldlg.c:325
 #: client/gui-xaw/wldlg.c:676
 msgid "empty worklist"
-msgstr "tuščias darbų sąrašas"
+msgstr "malplena laborlisto"
 
 #: client/gui-sdl/optiondlg.c:338
 msgid "Add new worklist"
-msgstr "Pridėti darbų sąrašą"
+msgstr "Aldonu novan laborliston"
 
 #: client/gui-sdl/optiondlg.c:440 client/gui-sdl/optiondlg.c:625
 #, c-format
@@ -13519,6 +13788,8 @@ msgid ""
 "Current Setup\n"
 "Fullscreen %dx%d"
 msgstr ""
+"Nunaj agordoj\n"
+"Plenekrane %dx%d"
 
 #: client/gui-sdl/optiondlg.c:443 client/gui-sdl/optiondlg.c:628
 #, c-format
@@ -13526,163 +13797,164 @@ msgid ""
 "Current Setup\n"
 "%dx%d"
 msgstr ""
+"Nunaj agordoj\n"
+"%dx%d"
 
 #: client/gui-sdl/optiondlg.c:604
 msgid "No modes available!"
-msgstr "Nėra tinkamų režimų!"
+msgstr "Neniu moduso estas disponebla!"
 
 #: client/gui-sdl/optiondlg.c:610
 msgid "All resolutions available."
-msgstr "Įmanomos visos raiškos."
+msgstr "Ĉiuj difinoj estas disponeblaj"
 
 #: client/gui-sdl/optiondlg.c:646
 msgid "Fullscreen Mode"
-msgstr "Pilnaekranis režimas"
+msgstr "Plenekrane"
 
 #: client/gui-sdl/optiondlg.c:987
 msgid "Smooth unit move steps"
-msgstr ""
+msgstr "Mildigu la paŝojn de la unuoj"
 
 #: client/gui-sdl/optiondlg.c:1041
-#, fuzzy
 msgid "Show focus animation"
-msgstr "Sanitarija"
+msgstr "Vidigu animacion de enfazo"
 
 #: client/gui-sdl/optiondlg.c:1068
 msgid "Show cursors animation"
-msgstr "Rodyti žymeklių animaciją"
+msgstr "Vidigu animacion de kursoroj"
 
 #: client/gui-sdl/optiondlg.c:1095
 msgid "Use color cursors"
-msgstr "Naudoti spalvotus žymeklius"
+msgstr "Uzu kolorajn kursorojn"
 
 #: client/gui-sdl/optiondlg.c:1557 client/gui-xaw/menu.c:143
 msgid "City Names"
-msgstr "Miestų vardai"
+msgstr "Nomoj de urboj"
 
 #: client/gui-sdl/optiondlg.c:1609 client/gui-xaw/menu.c:141
 msgid "National Borders"
-msgstr "NacionalinÄ—s sienos"
+msgstr "Landlimoj"
 
 #: client/gui-sdl/optiondlg.c:1661 client/gui-xaw/menu.c:140
 msgid "Map Grid"
-msgstr "Žemėlapio tinklelis"
+msgstr "Mapkrado"
 
 #: client/gui-sdl/optiondlg.c:1689
 msgid "Draw city map grid"
-msgstr "Piešti miesto žemėlapio tinklą"
+msgstr "Desegnu mapkradon de la urbo"
 
 #: client/gui-sdl/optiondlg.c:1746
 msgid "Special Resources"
-msgstr "Specialūs resursai"
+msgstr "Specialaj risurcoj"
 
 #: client/gui-sdl/optiondlg.c:1880 client/gui-xaw/menu.c:150
 msgid "Roads and Rails"
-msgstr "Keliai ir geležinkeliai"
+msgstr "Vojoj kaj fervojoj"
 
 #: client/gui-sdl/optiondlg.c:1959 client/gui-xaw/menu.c:153
 msgid "Fortress and Airbase"
-msgstr "Fortai ir oro bazÄ—s"
+msgstr "Fortresoj kaj aviaj bazoj"
 
 #: client/gui-sdl/optiondlg.c:1987
 msgid "Civ3 city text style"
-msgstr "Civę miestų teksto stilius"
+msgstr "Civ3-tekstostilo por urbo"
 
 #: client/gui-sdl/optiondlg.c:2216
 msgid "Video options"
-msgstr "Vaizdo nustatymai"
+msgstr "Opcioj de la ekrano"
 
 #: client/gui-sdl/optiondlg.c:2226
 msgid "Sound options"
-msgstr "Garsų nustatymai"
+msgstr "Opcioj de la sono"
 
 #: client/gui-sdl/optiondlg.c:2238
 msgid "Game options"
-msgstr "Žaidimo nustatymai"
+msgstr "Opcioj de la ludo"
 
 #: client/gui-sdl/optiondlg.c:2248
 msgid "Map options"
-msgstr "Žemėlapio nustatymai"
+msgstr "Opcioj de la mapo"
 
 #: client/gui-sdl/optiondlg.c:2259 client/gui-xaw/menu.c:129
 #: data/Freeciv.in:1971
 msgid "Worklists"
-msgstr "Darbų sąrašai"
+msgstr "Laborlisto"
 
 #: client/gui-sdl/optiondlg.c:2287
 msgid "Leave Game"
-msgstr "Palikti žaidimą"
+msgstr "Forlasu la ludon"
 
 #: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
 #: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
 #: data/Freeciv.in:115 data/Freeciv.in:3180
 msgid "Quit"
-msgstr "IÅ¡eiti"
+msgstr "Eliro"
 
 #: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:963
 msgid "Start New Game"
-msgstr "Pradėti naują žaidimą"
+msgstr "Startigu novan ludon"
 
 #: client/gui-sdl/pages.c:199
 msgid "Join Game"
-msgstr "Prisijungti prie žaidimo"
+msgstr "Aliĝu al ludo"
 
 #: client/gui-sdl/pages.c:213
 msgid "Join Pubserver"
-msgstr "Prisijungti prie viešo serverio"
+msgstr "Aliĝu al la servilo"
 
 #: client/gui-sdl/pages.c:227
 msgid "Join LAN Server"
-msgstr "Prisijungti prie LAN serverio"
+msgstr "Aliĝu al la loka reto"
 
 #: client/gui-sdl/pages.c:308
 msgid "SDLClient welcomes you..."
-msgstr ""
+msgstr "SDLClient bonvenigas vin..."
 
 #: client/gui-sdl/pages.c:309
 msgid ""
 "Freeciv is free software and you are welcome to distribute copies of it "
 "under certain conditions;"
 msgstr ""
-"Freeciv yra nemokama programa ir jūs galite platinti ją pagal tam tikras "
-"sÄ…lygas;"
+"Freeciv estas libera programaro kaj vi bonvolu disdoni kopiojn de ĝi\n"
+"laŭ specifaj kondiĉoj;"
 
 #: client/gui-sdl/pages.c:312
 msgid "See the \"Copying\" item on the Help menu."
-msgstr ""
+msgstr "Legu la \"Permesilo\" eron en menuo pri Helpo."
 
 #: client/gui-sdl/pages.c:314
+#, fuzzy
 msgid "Now.. Go give'em hell!"
-msgstr ""
+msgstr "Nun... La diablo ilin prenu!"
 
 #: client/gui-sdl/plrdlg.c:654
 msgid "disconnected"
-msgstr "atsijungęs"
+msgstr "malkonektita"
 
 #: client/gui-sdl/repodlgs.c:339
 msgid "active"
-msgstr "aktyvus"
+msgstr "aktiva"
 
 #: client/gui-sdl/repodlgs.c:344
 msgid ""
 "under\n"
 "construction"
-msgstr "statomas"
+msgstr "formiĝanta"
 
 #: client/gui-sdl/repodlgs.c:348
 msgid ""
 "soonest\n"
 "completion"
-msgstr "greičiausiai pastatytas"
+msgstr "finigota"
 
-# santrumpa???
 #: client/gui-sdl/repodlgs.c:352
 msgid "Total"
-msgstr "Viso"
+msgstr "Sumo"
 
 #: client/gui-sdl/repodlgs.c:363
 msgid "Units Report"
-msgstr "Dalinių ataskaita"
+msgstr "Raporto pri unuoj"
 
 #: client/gui-sdl/repodlgs.c:1518
 #, c-format
@@ -13691,102 +13963,103 @@ msgid ""
 "(total value is : %d)\n"
 "We can sell %d of them for %d gold."
 msgstr ""
+"Ni havas %d da %s\n"
+"(sumo estas : %d)\n"
+"Ni povas vendi %d el ili por %d oraj moneroj."
 
 #: client/gui-sdl/repodlgs.c:1525
 #, c-format
 msgid "We can't sell any %s in this turn."
-msgstr "Mes negalime parduoti %s Å¡iuo Ä—jimu."
+msgstr "Ni povas vendi neniun %sn dum tiu ĉi vico."
 
 #: client/gui-sdl/repodlgs.c:1530
 msgid "Sell It?"
-msgstr "Ar parduoti?"
+msgstr "Ĉu vi vendas ĝin?"
 
 #: client/gui-sdl/repodlgs.c:1761
 msgid "Economy Report"
-msgstr "EkonominÄ— ataskaita"
+msgstr "Ekonomia raporto"
 
 #: client/gui-sdl/repodlgs.c:1776
 msgid "Treasury: "
-msgstr "Iždas:"
+msgstr "Åœtata kaso:"
 
 #: client/gui-sdl/repodlgs.c:1798
 msgid "Tax Rate: "
-msgstr "Mokesčių norma:"
+msgstr "Impostado:"
 
 #: client/gui-sdl/repodlgs.c:1819
 msgid "Total Income: "
-msgstr "Visos įplaukos:"
+msgstr "Enspezo:"
 
 #: client/gui-sdl/repodlgs.c:1839
 msgid "Total Cost: "
-msgstr "Visa kaina:"
+msgstr "Elspezo:"
 
 #: client/gui-sdl/repodlgs.c:1858
 msgid "Net Income: "
-msgstr "Pelnas:"
+msgstr "Neta enspezo:"
 
 #: client/gui-sdl/repodlgs.c:1882
 #, c-format
 msgid "%s max rate : %d%%"
-msgstr ""
+msgstr "Maksimuma procento de %s: %d%%"
 
 #: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1081
 #: client/gui-win32/connectdlg.c:1089 data/Freeciv.in:155
 msgid "Update"
-msgstr "Atnaujinti"
+msgstr "Äœisdatigu"
 
 #: client/gui-sdl/repodlgs.c:2065 client/gui-sdl/wldlg.c:1334
 msgid "Wonder"
-msgstr "Stebuklas"
+msgstr "Mirindaĵo"
 
 #: client/gui-sdl/repodlgs.c:2851
 msgid "What should we focus on now?"
-msgstr "Kuo mes dabar turime užsiimti?"
+msgstr "Kion ni devas enfazi nun?"
 
 #: client/gui-sdl/repodlgs.c:3040
 msgid "Select target :"
-msgstr "Pasirinkite tikslÄ… :"
+msgstr "Elektu celon:"
 
 #: client/gui-sdl/repodlgs.c:3107
 msgid "step"
 msgid_plural "steps"
-msgstr[0] "žingsnis"
-msgstr[1] "žingsniai"
-msgstr[2] "žingsnių"
+msgstr[0] "paŝo"
+msgstr[1] "paŝoj"
 
 #: client/gui-sdl/repodlgs.c:3387 client/gui-win32/repodlgs.c:764
 #: client/gui-xaw/repodlgs.c:1153
 #, c-format
 msgid "%2d: The %s ruler %s scored %d point\n"
 msgid_plural "%2d: The %s ruler %s scored %d points\n"
-msgstr[0] "%2d: %s valdovas %s surinko %d tašką\n"
-msgstr[1] "%2d: %s valdovas %s surinko %d taškus\n"
-msgstr[2] "%2d: %s valdovas %s surinko %d taškų\n"
+msgstr[0] "%2d: La %s de %s atingis sume %d poenton\n"
+msgstr[1] "%2d: La %s de %s atingis sume %d poentojn\n"
 
 #: client/gui-sdl/repodlgs.c:3395 client/gui-win32/repodlgs.c:772
 #: client/gui-xaw/repodlgs.c:1161
 msgid "Final Report:"
-msgstr "GalutinÄ— ataslaita:"
+msgstr "Fina raporto:"
 
 #: client/gui-sdl/repodlgs.c:3396 client/gui-win32/repodlgs.c:773
 #: client/gui-xaw/repodlgs.c:1162
 msgid "The Greatest Civilizations in the world."
-msgstr "Didžiausios pasaulio civilizacijos."
+msgstr "La Plej Grandaj Civilizoj en la mondo."
 
 #: client/gui-sdl/spaceshipdlg.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "The %s Spaceship"
-msgstr "%s ErdvÄ—laivis"
+msgstr "La %s kosmoŝipo"
 
 #: client/gui-sdl/spaceshipdlg.c:172 client/gui-win32/spaceshipdlg.c:241
 #: data/Freeciv.in:1709
 msgid "Launch"
-msgstr "Paleisti"
+msgstr "Ekflugo"
 
 #: client/gui-sdl/sprite.c:60
 #, c-format
 msgid "load_gfxfile: Unable to load graphic file %s!"
-msgstr ""
+msgstr "load_gfxfile: estas neeble ŝargi grafikan dosieron %s!"
 
 #: client/gui-sdl/themespec.c:252
 #, c-format
@@ -13808,23 +14081,23 @@ msgstr ""
 
 #: client/gui-sdl/themespec.c:338
 msgid "No usable default theme found, aborting!"
-msgstr ""
+msgstr "Neniu uzebla temo estis trovita, nuligante!"
 
 #: client/gui-sdl/themespec.c:342
 #, c-format
 msgid "Trying \"%s\" theme."
-msgstr "Bandoma \"%s\" tema."
+msgstr ""
 
 #: client/gui-sdl/themespec.c:486 client/gui-sdl/themespec.c:520
 #: client/gui-sdl/themespec.c:698
 #, c-format
 msgid "Could not open \"%s\"."
-msgstr "Negaliu atidaryti „%s“"
+msgstr "Estas neeble malfermi \"%s\"."
 
 #: client/gui-sdl/themespec.c:500
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't load gfx file for the spec file %s"
-msgstr ""
+msgstr "Estas neeble ŝargi sound-spec-file: %s"
 
 #: client/gui-sdl/themespec.c:667
 #, c-format
@@ -13832,9 +14105,9 @@ msgid "Couldn't find a supported gfx file extension for %s"
 msgstr ""
 
 #: client/gui-sdl/themespec.c:819
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't load gfx file %s for sprite %s"
-msgstr ""
+msgstr "Estas neeble ŝargi sound-spec-file: %s"
 
 #: client/gui-sdl/themespec.c:970
 #, c-format
@@ -13848,7 +14121,7 @@ msgid ""
 "%d gold per turn"
 msgstr ""
 "%s\n"
-"%3d aukso per Ä—jimÄ…"
+"%d oraj moneroj povice"
 
 #: client/gui-sdl/wldlg.c:900 client/gui-sdl/wldlg.c:1075
 #, c-format
@@ -13857,7 +14130,7 @@ msgid ""
 "blocked!"
 msgstr ""
 "%s\n"
-"užblokuota!"
+"estas blokita!"
 
 #: client/gui-sdl/wldlg.c:902 client/gui-sdl/wldlg.c:1077
 #, c-format
@@ -13875,12 +14148,12 @@ msgid ""
 "finished!"
 msgstr ""
 "%s\n"
-"baigta!"
+"estas finita!"
 
 #: client/gui-sdl/wldlg.c:946 client/gui-sdl/wldlg.c:1052
 #, c-format
 msgid "( %d entries )"
-msgstr ""
+msgstr "( %d enigoj )"
 
 #: client/gui-sdl/wldlg.c:1039
 #, c-format
@@ -13888,8 +14161,8 @@ msgid ""
 "Worklist of\n"
 "%s"
 msgstr ""
-"%s\n"
-"darbo sąrašas"
+"Laborlisto de\n"
+"%s"
 
 #: client/gui-sdl/wldlg.c:1347
 #, c-format
@@ -13934,7 +14207,7 @@ msgstr ""
 #: client/gui-sdl/wldlg.c:1377
 #, c-format
 msgid "%d gold per turn"
-msgstr "%3d aukso per Ä—jimÄ…"
+msgstr "%d oraj moneroj por vico"
 
 #: client/gui-sdl/wldlg.c:1384
 #, c-format
@@ -13952,7 +14225,7 @@ msgstr "%d %s"
 
 #: client/gui-sdl/wldlg.c:1395
 msgid "shields into gold"
-msgstr "gamybos vienetai į auksą"
+msgstr "en oro"
 
 #: client/gui-sdl/wldlg.c:1474
 #, c-format
@@ -13963,7 +14236,7 @@ msgid ""
 msgstr ""
 "(%d/%d/%d)\n"
 "%d/%d %s\n"
-"niekada"
+"neniam"
 
 #: client/gui-sdl/wldlg.c:1481
 #, c-format
@@ -13988,40 +14261,40 @@ msgstr ""
 #: client/gui-win32/citydlg.c:285
 #, c-format
 msgid "Upkeep (Total: %d)"
-msgstr "IÅ¡laikymas (viso: %d)"
+msgstr "Bontenado (Sumo: %d)"
 
 #: client/gui-win32/citydlg.c:725
 msgid "City Overview"
-msgstr "Miesto peržvalga"
+msgstr "Trarigardo pri la urbo"
 
 #: client/gui-win32/citydlg.c:725 client/gui-win32/wldlg.c:1088
 #: client/gui-win32/wldlg.c:1138
 msgid "Worklist"
-msgstr "Darbų sąrašas"
+msgstr "Laborlisto"
 
 #: client/gui-win32/citydlg.c:727 data/Freeciv.in:2231
 msgid "Trade Routes"
-msgstr "Prekybos maršrutai"
+msgstr "Komercaj kursoj"
 
 #: client/gui-win32/citydlg.c:728
 msgid "Misc. Settings"
-msgstr "Įv. nustatymai"
+msgstr "Variaj agordaĵoj"
 
 #: client/gui-win32/citydlg.c:792 client/gui-win32/cityrep.c:878
 #: data/Freeciv.in:1629
 msgid "Buy"
-msgstr "Pirkti"
+msgstr "Aĉetu"
 
 #: client/gui-win32/citydlg.c:794 client/gui-win32/citydlg.c:1073
 #: client/gui-win32/cityrep.c:745 client/gui-win32/cityrep.c:879
 #: data/Freeciv.in:1387 data/Freeciv.in:1637 data/Freeciv.in:1793
 #: data/Freeciv.in:2089
 msgid "Change"
-msgstr "Keisti"
+msgstr "Ŝanĝu"
 
 #: client/gui-win32/citydlg.c:813
 msgid "Units present"
-msgstr "Esantys daliniai"
+msgstr "Ĉeestantaj unuoj"
 
 #: client/gui-win32/citydlg.c:819 client/gui-win32/cityrep.c:132
 #: client/gui-win32/cityrep.c:875 client/gui-win32/dialogs.c:190
@@ -14040,34 +14313,34 @@ msgstr "Esantys daliniai"
 #: data/Freeciv.in:2402 data/Freeciv.in:3053 data/Freeciv.in:3223
 #: data/Freeciv.in:3307
 msgid "Close"
-msgstr "Uždaryti"
+msgstr "Fermu"
 
 #: client/gui-win32/citydlg.c:821 client/gui-win32/wldlg.c:430
 #: data/Freeciv.in:2001
 msgid "Rename"
-msgstr "Pervadinti"
+msgstr "Renomu"
 
 #: client/gui-win32/citydlg.c:825 data/Freeciv.in:3062
 msgid "Activate Units"
-msgstr "Aktyvūs daliniai"
+msgstr "Aktivigu unuon"
 
 #: client/gui-win32/citydlg.c:828
 msgid "Unit List"
-msgstr "Dalinių sąrašas"
+msgstr "Listo pri unuoj"
 
 #: client/gui-win32/citydlg.c:846
 msgid "Improvement"
-msgstr "Patobulinimai"
+msgstr "Urbaj plibonigoj"
 
 #: client/gui-win32/citydlg.c:849 manual/civmanual.c:302
 msgid "Upkeep"
-msgstr "IÅ¡laikymas"
+msgstr "Bontenado"
 
 #: client/gui-win32/citydlg.c:907 client/gui-win32/citydlg.c:962
 #: client/gui-win32/citydlg.c:1448 client/gui-win32/dialogs.c:977
 #: client/gui-win32/dialogs.c:1372 client/gui-win32/dialogs.c:1558
 msgid "_Yes"
-msgstr "_Taip"
+msgstr "_Jes"
 
 #: client/gui-win32/citydlg.c:908 client/gui-win32/citydlg.c:963
 #: client/gui-win32/citydlg.c:1450 client/gui-win32/dialogs.c:978
@@ -14080,245 +14353,245 @@ msgstr "_Ne"
 #: client/gui-win32/dialogs.c:1566 data/Freeciv.in:2252 data/Freeciv.in:2456
 #: data/Freeciv.in:2486
 msgid "Darn"
-msgstr ""
+msgstr "Rezignu"
 
 #: client/gui-win32/citydlg.c:1259
 #, c-format
 msgid "Trade with %s gives %d trade.\n"
-msgstr ""
+msgstr "Komerco kun la %s estigas %d poentojn.\n"
 
 #: client/gui-win32/citydlg.c:1264
 msgid "No trade routes exist."
-msgstr ""
+msgstr "Neniu komerca kurso ekzistas."
 
 #: client/gui-win32/citydlg.c:1266
 #, c-format
 msgid "Total trade from trade routes: %d"
-msgstr ""
+msgstr "Komerco el la komercaj kursoj: %d"
 
 #: client/gui-win32/citydlg.c:1477 client/gui-win32/citydlg.c:1508
 #: data/Freeciv.in:1160 data/Freeciv.in:1196
 msgid "Unit Commands"
-msgstr "Dalinio komandos"
+msgstr "Regiloj de unuoj"
 
 #: client/gui-win32/citydlg.c:1485 client/gui-win32/citydlg.c:1524
 #: client/gui-win32/dialogs.c:1613 client/gui-win32/dialogs.c:1635
 #: client/gui-win32/dialogs.c:1665
 msgid "_Cancel"
-msgstr "_Atšaukti"
+msgstr "_Nuligu"
 
 #: client/gui-win32/citydlg.c:1522
 msgid "_Upgrade unit"
-msgstr "_Patobulinti dalinį"
+msgstr "Äœisdatig_u unuon"
 
 #: client/gui-win32/citydlg.c:1987
 msgid "Elvises"
-msgstr ""
+msgstr "Vervigantoj"
 
 #: client/gui-win32/cityrep.c:99
 msgid "Configure City Report"
-msgstr "Konfiguruoti misto ataskaitÄ…"
+msgstr "Agordu la raporton pri la urbo"
 
 #: client/gui-win32/cityrep.c:127 data/Freeciv.in:1725
 msgid "Set columns shown"
-msgstr ""
+msgstr "Agordu kolumnojn"
 
 #: client/gui-win32/cityrep.c:245
 msgid "No Buildings Available"
-msgstr "Nėra pastatų"
+msgstr "Neniu disponebla konstruaĵon"
 
 #: client/gui-win32/cityrep.c:255
 msgid "No Units Available"
-msgstr "Nėra dalinių"
+msgstr "Neniu disponebla unuo"
 
 #: client/gui-win32/cityrep.c:268
 msgid "No Wonders Available"
-msgstr "Nėra stebuklų"
+msgstr "Neniu disponebla mirindaĵo"
 
 #: client/gui-win32/cityrep.c:462
 msgid "Available To Build"
-msgstr "Galima statyti"
+msgstr "Disponebla por prepari"
 
 #: client/gui-win32/cityrep.c:683
 msgid "Select a unit or improvement to change production from."
-msgstr ""
+msgstr "Elektu unuon aŭ plibonigon por ŝanĝi la produktado."
 
 #: client/gui-win32/cityrep.c:692
 msgid "Select a unit or improvement to change production to."
-msgstr ""
+msgstr "Elektu unuon aŭ plibonigon por ŝanĝi la produktado laŭ ĝi."
 
 #: client/gui-win32/cityrep.c:698
 msgid "That's the same thing!"
-msgstr "Tai tas pats dalykas!"
+msgstr "Estas la sama afero!"
 
 #: client/gui-win32/cityrep.c:733 data/Freeciv.in:1739
 msgid "Change Production Everywhere"
-msgstr "Visur pakeisti gamybÄ…"
+msgstr "Ŝanĝu produktadon ĉie"
 
 #: client/gui-win32/cityrep.c:741 data/Freeciv.in:1745
 msgid "From:"
-msgstr "IÅ¡:"
+msgstr "De:"
 
 #: client/gui-win32/cityrep.c:749 data/Freeciv.in:1755
 msgid "To:"
-msgstr "Ä®:"
+msgstr "Äœis:"
 
 #: client/gui-win32/cityrep.c:876 client/gui-win32/finddlg.c:126
 #: data/Freeciv.in:1085 data/Freeciv.in:1613
 msgid "Center"
-msgstr "Centruoti"
+msgstr "Centrigu"
 
 #: client/gui-win32/cityrep.c:877 data/Freeciv.in:1621
 msgid "Popup"
-msgstr ""
+msgstr "Åœprucfenestro"
 
 #: client/gui-win32/cityrep.c:880
 msgid "Change All"
-msgstr "ViskÄ… pakeisti"
+msgstr "Ŝanĝu ĉion"
 
 #: client/gui-win32/cityrep.c:881 client/gui-win32/repodlgs.c:726
 #: data/Freeciv.in:1653 data/Freeciv.in:1800 data/Freeciv.in:1959
 msgid "Refresh"
-msgstr "Atnaujinti"
+msgstr "Äœisdatigu"
 
 #: client/gui-win32/cityrep.c:882
 msgid "Select"
-msgstr "Pasirinkti"
+msgstr "Elektu"
 
 #: client/gui-win32/cityrep.c:883
 msgid "Configure"
-msgstr "Konfigūruoti"
+msgstr "Agordu"
 
 #: client/gui-win32/cityrep.c:885 client/gui-win32/cityrep.c:1151
 msgid "City Advisor"
-msgstr "Miesto patarÄ—jas"
+msgstr "Urba konsilisto"
 
 #: client/gui-win32/cityrep.c:1077
 msgid "City Report"
-msgstr "Miesto ataskaita"
+msgstr "Raporto pri urbo"
 
 #: client/gui-win32/cma_fe.c:308
 msgid "For information on:"
-msgstr ""
+msgstr "Pri:"
 
 #: client/gui-win32/cma_fe.c:309
 msgid "CMA and presets"
-msgstr ""
+msgstr "CMA kaj antaÅ­agordoj"
 
 #: client/gui-win32/cma_fe.c:310
 msgid "including sample presets,"
-msgstr ""
+msgstr "inkluzive ekzemplaj antaÅ­agordoj,"
 
 #: client/gui-win32/cma_fe.c:311
 msgid "see README.cma."
-msgstr "žiūrėkite README.cma"
+msgstr ""
 
 #: client/gui-win32/cma_fe.c:467
 msgid "New"
-msgstr "Naujas"
+msgstr "Nova"
 
 #: client/gui-win32/cma_fe.c:470 client/gui-win32/wldlg.c:432
 #: data/Freeciv.in:2016 data/Freeciv.in:2158
 msgid "Delete"
-msgstr "Trinti"
+msgstr "Forigu"
 
 #: client/gui-win32/connectdlg.c:147
 msgid "Password:"
-msgstr "Slaptažodis:"
+msgstr "Pasvorto:"
 
 #: client/gui-win32/connectdlg.c:169
 msgid "Couldn't load the savegame"
-msgstr "Negaliu įkelti išsaugoto žaidimo"
+msgstr "Estas neeble ŝargi konservitan ludon"
 
 #: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
 msgid "Verify Password"
-msgstr "Patikrinti slaptažodį"
+msgstr "Kontrolo de la pasvorto"
 
 #: client/gui-win32/connectdlg.c:912 data/Freeciv.in:73
 msgid "Freeciv Server Selection"
-msgstr "Freeciv serverio pasirinkimas"
+msgstr "Elekto de Freeciv-servilo"
 
 #: client/gui-win32/connectdlg.c:913
 msgid "Local Area Network"
-msgstr "Vietinis tinklas"
+msgstr "Loka reto"
 
 #: client/gui-win32/connectdlg.c:947
 msgid "Welcome to Freeciv"
-msgstr "Sveiki atvykę į Freeciv"
+msgstr "Bonvenon al Freeciv"
 
 #: client/gui-win32/connectdlg.c:965
 msgid "Load Saved Game"
-msgstr "Įkelti išsaugotą žaidimą"
+msgstr "Åœargu konservitan ludon"
 
 #: client/gui-win32/connectdlg.c:967
 msgid "Connect To Network Game"
-msgstr "Prisijungti prie tinklo žaidimo"
+msgstr "Konekto al reta ludo"
 
 #: client/gui-win32/connectdlg.c:977
 msgid "Choose a nation to play"
-msgstr "Pasirinkite tautą, su kuria žaisite"
+msgstr "Elektu nacion por ludi"
 
 #: client/gui-win32/connectdlg.c:1012
 msgid "Number of players (Including AI):"
-msgstr "Žaidėjų skaičius (įskaitant DI)"
+msgstr "Nombro da ludantoj (inkluzive la AI):"
 
 #: client/gui-win32/connectdlg.c:1020
 msgid "AI skill level:"
-msgstr "DI meistriškumo lygis:"
+msgstr "Lerteco de _AI:"
 
 #: client/gui-win32/connectdlg.c:1034 client/gui-win32/repodlgs.c:931
 msgid "Game Options"
-msgstr "Žaidimo nustatymai"
+msgstr "Opcioj de la ludo"
 
 #: client/gui-win32/connectdlg.c:1038
 msgid "Start Game"
-msgstr "Pradėti žaidimą"
+msgstr "Startigu ludon"
 
 #: client/gui-win32/connectdlg.c:1057
 msgid "Login:"
-msgstr "Prisijungimo vardas:"
+msgstr "Nomo:"
 
 #: client/gui-win32/connectdlg.c:1059
 msgid "Host:"
-msgstr ""
+msgstr "Gast.Komp.:"
 
 #: client/gui-win32/connectdlg.c:1060
 msgid "Port:"
-msgstr "Prievadas:"
+msgstr "Pordo:"
 
 #: client/gui-win32/dialogs.c:191 data/Freeciv.in:549
 msgid "Goto and Close"
-msgstr "Eiti į ir uždaryti"
+msgstr "Iru kaj fermu"
 
 #: client/gui-win32/dialogs.c:555
 msgid "Leader:"
-msgstr "Vadas:"
+msgstr "Estro:"
 
 #: client/gui-win32/dialogs.c:575
 msgid "City Style:"
-msgstr "Miesto stilius:"
+msgstr "Urba stilo:"
 
 #: client/gui-win32/dialogs.c:779
 msgid "Unit Selection"
-msgstr "Dalinio pasirinkimas"
+msgstr "Elekto pri la unuo"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
-msgstr "NÄ–RA"
+msgstr "NENIU"
 
 #: client/gui-win32/dialogs.c:1292 data/Freeciv.in:2366
 msgid "Steal"
-msgstr "Pavogti"
+msgstr "Åœtelu"
 
 #: client/gui-win32/dialogs.c:1492 data/Freeciv.in:2408
 msgid "Sabotage"
-msgstr "Sabotažas"
+msgstr "Sabotado"
 
 #: client/gui-win32/diplodlg.c:606 client/gui-win32/diplodlg.c:658
 #: client/gui-xaw/diplodlg.c:356 client/gui-xaw/diplodlg.c:364
 #, c-format
 msgid "The %s offerings"
-msgstr "%s siūlymai"
+msgstr "La %sj proponoj"
 
 #: client/gui-win32/diplodlg.c:626 client/gui-xaw/diplodlg.c:538
 #, c-format
@@ -14329,24 +14602,29 @@ msgid ""
 "and\n"
 "The %s %s %s"
 msgstr ""
+"Tiu Eterna Kontrakto\n"
+"montras la rezultojn de la diplomatia laboro inter\n"
+"la %s %s %s\n"
+"kaj\n"
+"la %s %s %s"
 
 #: client/gui-win32/diplodlg.c:639 client/gui-win32/diplodlg.c:645
 #: client/gui-xaw/diplodlg.c:578 client/gui-xaw/diplodlg.c:590
 #, c-format
 msgid "%s view:"
-msgstr ""
+msgstr "%s vido:"
 
 #: client/gui-win32/diplodlg.c:672
 msgid "Erase Clause"
-msgstr "IÅ¡trinti sÄ…lygÄ…"
+msgstr "Forigu klaÅ­zon"
 
 #: client/gui-win32/finddlg.c:122 data/Freeciv.in:1067
 msgid "Select a city:"
-msgstr "Pasirinkite miestÄ…:"
+msgstr "Elektu urbon"
 
 #: client/gui-win32/gui_main.c:116
 msgid "Enable alpha blending"
-msgstr "Įjungti permatomumą (alpha blending)"
+msgstr ""
 
 #: client/gui-win32/gui_main.c:117
 msgid ""
@@ -14359,15 +14637,15 @@ msgstr ""
 #: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
 #: client/gui-win32/helpdlg.c:822
 msgid "Allows "
-msgstr "Leidžia"
+msgstr "Ebligas "
 
 #: client/gui-win32/helpdlg.c:780
 msgid "Obsoletes "
-msgstr "Pasensta"
+msgstr "Igas arkaika "
 
 #: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
 msgid " (with "
-msgstr " (su "
+msgstr " (kun "
 
 #: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
 msgid "?techhelp:)."
@@ -14377,271 +14655,275 @@ msgstr "?techhelp:)."
 #: client/gui-xaw/inteldlg.c:433
 #, c-format
 msgid "Ruler: %s %s"
-msgstr "Valdovas: %s %s"
+msgstr "Estro: %s %s"
 
 #: client/gui-win32/inteldlg.c:114 client/gui-xaw/inteldlg.c:216
 #: client/gui-xaw/ratesdlg.c:311
 #, c-format
 msgid "Tax: %d%%"
-msgstr "Mokesčiai: %d%%"
+msgstr "Impostoj: %d%%"
 
 #: client/gui-win32/inteldlg.c:117 client/gui-xaw/inteldlg.c:224
 #: client/gui-xaw/ratesdlg.c:327
 #, c-format
 msgid "Science: %d%%"
-msgstr "Mokslas: %d%%"
+msgstr "Scienco: %d%%"
 
 #: client/gui-win32/inteldlg.c:120 client/gui-xaw/inteldlg.c:232
 #: client/gui-xaw/ratesdlg.c:319
-#, c-format
+#, fuzzy, c-format
 msgid "Luxury: %d%%"
-msgstr "Prabanga: %d%%"
+msgstr "Lukso: %d%%"
 
 #: client/gui-win32/inteldlg.c:129 client/gui-xaw/inteldlg.c:242
 msgid "Researching: (Unknown)"
-msgstr "Tyrinėjama: (Nežinoma)"
+msgstr "Studado: (nekonata)"
 
 #: client/gui-win32/inteldlg.c:132 client/gui-xaw/inteldlg.c:245
 #, c-format
 msgid "Researching: Unknown(%d/-)"
-msgstr "Tyrinėjama: nežinoma(%d/-)"
+msgstr "Studado: Nekonata(%d/-)"
 
 #: client/gui-win32/inteldlg.c:136 client/gui-xaw/inteldlg.c:249
 #, c-format
 msgid "Researching: %s(%d/%d)"
-msgstr "TyrinÄ—jama: %s(%d/%d)"
+msgstr "Studado: %s (%d/%d)"
 
 #: client/gui-win32/inteldlg.c:145 client/gui-xaw/inteldlg.c:263
 #, c-format
 msgid "Capital: %s"
-msgstr "SostinÄ—: %s"
+msgstr "Ĉefurbo: %s"
 
 #: client/gui-win32/mapview.c:170
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Population: %s\n"
 "Year: %s\n"
 "Gold: %d\n"
 "Tax: %d Lux: %d Sci: %d"
 msgstr ""
+"Loĝantaro: %s\n"
+"Jaro: %s\n"
+"Oro %d\n"
+"Imp: %d Luks: %d Sci: %d"
 
 #: client/gui-win32/menu.c:306
 msgid "Sa_ve Settings"
-msgstr "_IÅ¡saugoti nustatymus"
+msgstr "Konser_vu agordaĵojn"
 
 #: client/gui-win32/menu.c:316
 msgid "_Disconnect"
-msgstr "_Atsijungti"
+msgstr "_Malkonektu"
 
 #: client/gui-win32/menu.c:328
 msgid "_Revolution"
-msgstr "_Revoliucija"
+msgstr "_Revolucio"
 
 #: client/gui-win32/menu.c:355 client/gui-xaw/menu.c:161
 msgid "Center View"
-msgstr "Centruoti vaizdÄ…"
+msgstr "Centrigu la vidon"
 
 #: client/gui-win32/menu.c:363
 msgid "Transf_orm to Hills"
-msgstr "_Transformuoti į kalvas"
+msgstr "Transf_ormu en montetoj"
 
 #: client/gui-win32/menu.c:377 client/gui-win32/menu.c:1267
 #: client/gui-xaw/menu.c:194
 msgid "Auto Settler"
-msgstr "Automatiškai dirbti"
+msgstr "AÅ­tomata farmigo"
 
 #: client/gui-win32/menu.c:386 client/gui-xaw/menu.c:202
 msgid "Go/Airlift to City"
-msgstr "Eiti/perkelti oru į miestą"
+msgstr "Iru/flugtransportu en urbon"
 
 #: client/gui-win32/menu.c:390 client/gui-xaw/menu.c:208
 msgid "Diplomat/Spy Actions"
-msgstr "Diplomato/Å¡nipo veiksmai"
+msgstr "Diplomatiaj/Spionaj agoj"
 
 #: client/gui-win32/menu.c:1109 client/gui-win32/menu.c:1110
 #: client/gui-xaw/menu.c:172 client/gui-xaw/menu.c:174
 #, c-format
 msgid "Change to %s"
-msgstr "Keisti į %s"
+msgstr "Ŝanĝu en %s"
 
 #: client/gui-win32/menu.c:1111 client/gui-xaw/menu.c:176
 #, c-format
 msgid "Transform to %s"
-msgstr "Transformuoti į %s"
+msgstr "Transformu en %s"
 
 #: client/gui-win32/menu.c:1118 client/gui-xaw/menu.c:175
 msgid "Transform Terrain"
-msgstr "Keisti reljefÄ…"
+msgstr "Transformu grundon"
 
 #: client/gui-win32/menu.c:1197 client/gui-win32/menu.c:1201
 #: client/gui-xaw/menu.c:166
 msgid "Build City"
-msgstr "Statyti miestÄ…"
+msgstr "Fondu urbon"
 
 #: client/gui-win32/menu.c:1205 client/gui-xaw/menu.c:207
 msgid "Make Trade Route"
-msgstr "Įkurti prekybos kelią"
+msgstr "Kreu komercan kurson"
 
 #: client/gui-win32/menu.c:1229 client/gui-xaw/menu.c:171
 msgid "Build Farmland"
-msgstr "Statyti fermÄ…"
+msgstr "Konstruu farmaron"
 
 #: client/gui-win32/menu.c:1264 client/gui-xaw/menu.c:195
 msgid "Auto Attack"
-msgstr "Automatiškai atakuoti"
+msgstr "AÅ­tomata atako"
 
 #: client/gui-win32/messagedlg.c:138 client/gui-win32/messagedlg.c:142
 msgid "Out:"
-msgstr ""
+msgstr "Norm:"
 
 #: client/gui-win32/messagedlg.c:139 client/gui-win32/messagedlg.c:143
 msgid "Mes:"
-msgstr ""
+msgstr "Mes:"
 
 #: client/gui-win32/messagedlg.c:140 client/gui-win32/messagedlg.c:144
 msgid "Pop:"
-msgstr ""
+msgstr "Åœpruc:"
 
 #: client/gui-win32/messagedlg.c:184
 msgid ""
 "Where to Display Messages\n"
 "Out = Output window, Mes = Messages window, Pop = Popup individual window"
 msgstr ""
+"Kie oni vidigas mesaĝojn\n"
+"Norm = normala fenestro, Mes = fenestro pri mesaĝoj, Ŝpruc = ŝprucfenestro"
 
 #: client/gui-win32/messagedlg.c:215 client/gui-win32/ratesdlg.c:327
 #: client/gui-win32/wldlg.c:854 client/gui-xaw/inputdlg.c:103
 #: data/Freeciv.in:1245 data/Freeciv.in:1278 data/Freeciv.in:1355
 #: data/Freeciv.in:1550 data/Freeciv.in:3419
 msgid "Ok"
-msgstr "Gerai"
+msgstr "BONE"
 
 #: client/gui-win32/messagewin.c:151 data/Freeciv.in:3322
 msgid "Popup City"
-msgstr ""
+msgstr "Fenestro pri urbo"
 
 #: client/gui-win32/plrdlg.c:72 client/gui-xaw/plrdlg.c:361
 msgid "You need an embassy to establish a diplomatic meeting."
-msgstr ""
+msgstr "Vi bezonas ambasadejon por starigi diplomatian renkontiĝon."
 
 #: client/gui-win32/plrdlg.c:169 client/gui-xaw/plrdlg.c:227
 #, c-format
 msgid "(idle %d turn)"
 msgid_plural "(idle %d turns)"
-msgstr[0] "(neveiklus %d Ä—jimÄ…)"
-msgstr[1] "(neveiklus %d Ä—jimus)"
-msgstr[2] "(neveiklus %d ėjimų)"
+msgstr[0] "(paÅ­zo: %d vico)"
+msgstr[1] "(paÅ­zo: %d vicoj)"
 
 #: client/gui-win32/plrdlg.c:337 data/Freeciv.in:88
 msgid "Host"
-msgstr ""
+msgstr "Gast. komputilo"
 
 #: client/gui-win32/plrdlg.c:355 data/Freeciv.in:3230
 msgid "Intelligence"
-msgstr "Žvalgyba"
+msgstr "Spionado"
 
 #: client/gui-win32/plrdlg.c:356 data/Freeciv.in:3238
 msgid "Meet"
-msgstr "Susitikti"
+msgstr "Renkontiĝo"
 
 #: client/gui-win32/plrdlg.c:360 client/gui-xaw/menu.c:230
 #: data/Freeciv.in:3262
 msgid "Spaceship"
-msgstr "ErdvÄ—laivis"
+msgstr "Kosmoŝipo"
 
 #: client/gui-win32/repodlgs.c:184 client/gui-win32/repodlgs.c:236
 #, c-format
 msgid "(%d step)"
 msgid_plural "(%d steps)"
-msgstr[0] "(%d žingsnis)"
-msgstr[1] "(%d žingsniai)"
-msgstr[2] "(%d žingsnių)"
+msgstr[0] "(%d paŝo)"
+msgstr[1] "(%d paŝoj)"
 
 #: client/gui-win32/repodlgs.c:356 client/gui-xaw/repodlgs.c:799
 #, c-format
 msgid "Income:%6d    Total Costs: %6d"
-msgstr ""
+msgstr "Enspezo:%6d    Elspezo:%6d"
 
 #: client/gui-win32/repodlgs.c:380 client/gui-xaw/repodlgs.c:755
 msgid "Sell-Off:"
-msgstr "Parduoti:"
+msgstr "Vendoj:"
 
 #: client/gui-win32/repodlgs.c:438
 msgid "Trade Report"
-msgstr "Prekybos atasktaita"
+msgstr "Raporto pri komerco"
 
 #: client/gui-win32/repodlgs.c:454 data/Freeciv.in:1876
 msgid "Sell Obsolete"
-msgstr "Parduoti pasenusius"
+msgstr "Vendu arkaikaĵon"
 
 #: client/gui-win32/repodlgs.c:456 data/Freeciv.in:1884
 msgid "Sell All"
-msgstr "Parduoti viskÄ…"
+msgstr "Vendu ĉion"
 
 #: client/gui-win32/repodlgs.c:459
 msgid "Building Name"
-msgstr "Pastato pavadinimas"
+msgstr "Nomo de la konstruaĵo"
 
 #: client/gui-win32/repodlgs.c:667
 msgid "Totals"
-msgstr "Viso"
+msgstr "Sumo"
 
 #: client/gui-win32/wldlg.c:362
 msgid "Rename Worklist"
-msgstr "Pervadinti darbų sąrašą"
+msgstr "Renomu laborliston"
 
 #: client/gui-win32/wldlg.c:363 client/gui-xaw/wldlg.c:623
 msgid "What should the new name be?"
-msgstr "Koks turi būti naujas vardas?"
+msgstr "Kio devas esti la nova nomo?"
 
 #: client/gui-win32/wldlg.c:425 data/Freeciv.in:1973
 msgid "Available worklists"
-msgstr "Prieinami darbų sąrašai"
+msgstr "Disponeblaj laborlistoj"
 
 #: client/gui-win32/wldlg.c:429 data/Freeciv.in:1995
 msgid "Edit"
-msgstr "Keisti"
+msgstr "Redaktu"
 
 #: client/gui-win32/wldlg.c:431 data/Freeciv.in:2010 data/Freeciv.in:2152
 msgid "Insert"
-msgstr "Įterpti"
+msgstr "Enigu"
 
 #: client/gui-win32/wldlg.c:826 data/Freeciv.in:2113
 msgid "Current worklist"
-msgstr "Dabartinis darbų sąrašas"
+msgstr "Nuna laborlisto"
 
 #: client/gui-win32/wldlg.c:832 data/Freeciv.in:2164
 msgid "Up"
-msgstr "Aukštyn"
+msgstr "Supren"
 
 #: client/gui-win32/wldlg.c:833 data/Freeciv.in:2170
 msgid "Down"
-msgstr "Žemyn"
+msgstr "Suben"
 
 #: client/gui-win32/wldlg.c:834
 msgid "Remove"
-msgstr "Pašalinti"
+msgstr "Formovi"
 
 #: client/gui-win32/wldlg.c:838
 msgid "Available items"
-msgstr "Prieinami elementai"
+msgstr "Disponeblaj erojn"
 
 #: client/gui-win32/wldlg.c:844
 msgid "Show future targets"
-msgstr "Rodyti būsimus objektus"
+msgstr "Vidigu estontajn celojn"
 
 #: client/gui-win32/wldlg.c:852
 msgid "Undo"
-msgstr "Atšaukti"
+msgstr "Malfaru"
 
 #: client/gui-xaw/citydlg.c:204
 #, c-format
 msgid "Pollution:    %3d"
-msgstr "Tarša:    %3d"
+msgstr "Poluado: %3d"
 
 #: client/gui-xaw/citydlg.c:224
 #, c-format
 msgid "Granary:  %3d/%-3d"
-msgstr "Svirnas:  %3d/%-3d"
+msgstr "Grenejo:  %3d/%-3d"
 
 #: client/gui-xaw/citydlg.c:253
 #, c-format
@@ -14650,42 +14932,42 @@ msgid ""
 "Prod:  %3d (%+-4d)\n"
 "Trade: %3d (%+-4d)"
 msgstr ""
-"Maistas:  %3d (%+-4d)\n"
-"Gamyba:  %3d (%+-4d)\n"
-"Prekyba: %3d (%+-4d)"
+"Nutr.: %3d (%+-4d)\n"
+"Prod.: %3d (%+-4d)\n"
+"Kom.:  %3d (%+-4d)"
 
 #: client/gui-xaw/citydlg.c:282
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Gold:  %3d (%+-4d)\n"
 "Lux:   %3d\n"
 "Sci:   %3d"
 msgstr ""
-"Auksas:  %3d (%+-4d)\n"
-"Prabanga:   %3d\n"
-"Mokslas:   %3d"
+"Oro:   %3d (%+-4d)\n"
+"Lukso: %3d\n"
+"Sci.:  %3d"
 
 #: client/gui-xaw/citydlg.c:308
 msgid "(is empty)"
-msgstr "(yra tuščia)"
+msgstr "(malplena)"
 
 #: client/gui-xaw/citydlg.c:310
 msgid "(in prog.)"
-msgstr "(yra gaminama)"
+msgstr "(plenumanta)"
 
 #: client/gui-xaw/citydlg.c:1409
 #, c-format
 msgid "These trade routes have been established with %s:\n"
-msgstr "Su %s buvo sukurti šie prekybos maršrutai:\n"
+msgstr "Tiuj komercaj kursoj estas starigitaj kun %s:\n"
 
 #: client/gui-xaw/citydlg.c:1419 client/gui-xaw/citydlg.c:1423
 #, c-format
 msgid "%32s: %2d Trade/Year\n"
-msgstr "%32s: %2d Prekyba/metus\n"
+msgstr "%32s: %2d Komerco/Jaro\n"
 
 #: client/gui-xaw/citydlg.c:1429
 msgid "No trade routes exist.\n"
-msgstr "Prekybos maršrutai neegzistuoja.\n"
+msgstr "Neniu komerca kurso ekzistas.\n"
 
 #: client/gui-xaw/citydlg.c:1431
 #, c-format
@@ -14693,68 +14975,74 @@ msgid ""
 "\n"
 "Total trade %d Trade/Year\n"
 msgstr ""
+"\n"
+"Rejŝo pri komerco: %d Komerco/Jaro\n"
 
 #: client/gui-xaw/citydlg.c:1767
 #, c-format
 msgid "%s - %s citizens  Governor: %s"
-msgstr "%s – %s piliečių  Valdytojas: %s"
+msgstr "%s - %s civitanoj Estro: %s"
 
 #: client/gui-xaw/cma_fe.c:431
 msgid "What should we name the new preset?"
-msgstr ""
+msgstr "Kio estas la nomo de la novan aprioran elektaĵon?"
 
 #: client/gui-xaw/cma_fe.c:448
 #, c-format
 msgid "Do you really want to remove %s?"
-msgstr "Ar tikrai norite pašalinti %s?"
+msgstr "Ĉu vi deziras formovi %sn?"
 
 #: client/gui-xaw/connectdlg.c:178
 msgid "Pass"
-msgstr ""
+msgstr "Transen"
 
 #: client/gui-xaw/dialogs.c:1475
 msgid "You must select a nation."
-msgstr "JÅ«s privalote pasirinkti tautÄ…."
+msgstr "Vi devas elekti nacion."
 
 #: client/gui-xaw/graphics.c:343
-#, c-format
+#, fuzzy, c-format
 msgid "Failed reading PNG file: %s"
-msgstr "Nepavyko nuskaityti PNG failo: %s"
+msgstr "La agordaĵoj estas konservitaj en la dosiero %s"
 
 #: client/gui-xaw/graphics.c:349 client/gui-xaw/graphics.c:355
 msgid "Failed creating PNG struct"
-msgstr "Nepavyko sukurti PNG struktūros"
+msgstr ""
 
 #: client/gui-xaw/graphics.c:360
 #, c-format
 msgid "Failed while reading PNG file: %s"
-msgstr "Klaida, skaitant PNG failÄ…: %s"
+msgstr ""
 
 #: client/gui-xaw/graphics.c:397
 #, c-format
 msgid "PNG file has no palette: %s"
-msgstr "PNG filas neturi paletÄ—s: %s"
+msgstr ""
 
 #: client/gui-xaw/gui_main.c:323
 msgid "No version number in resources."
-msgstr "Nerastas resursų versijos numeris"
+msgstr "Neniu numero de versio en la risurcoj."
 
 #: client/gui-xaw/gui_main.c:324
 msgid "You probably have an old (circa V1.0) Freeciv resource file somewhere."
 msgstr ""
+"Vi verŝajne havas iun malnovan risurcodosieron (laŭ versio 1.0) de Freeciv "
+"ie."
 
 #: client/gui-xaw/gui_main.c:332
 msgid "Game version does not match Resource version."
-msgstr ""
+msgstr "La ludoversio ne kongruas kun la risurcoversio."
 
 #: client/gui-xaw/gui_main.c:333
 #, c-format
 msgid "Game version: %s - Resource version: %s"
-msgstr ""
+msgstr "Ludoversio: %s - Risurcoversio: %s"
 
 #: client/gui-xaw/gui_main.c:335
 msgid "You might have an old Freeciv resourcefile in /usr/lib/X11/app-defaults"
 msgstr ""
+"Vi verŝajne havas iun malnovan risurcodosieron de Freeciv en /usr/lib/X11/"
+"app-defaults"
 
 #: client/gui-xaw/gui_main.c:341
 msgid "Using fallback resources - which is OK"
@@ -14762,192 +15050,192 @@ msgstr ""
 
 #: client/gui-xaw/gui_main.c:352
 msgid "Only color displays are supported for now..."
-msgstr "Dabar palaikomi tik spalvoto vaizdo vaizduokliai"
+msgstr ""
 
 #: client/gui-xaw/gui_main.c:375 client/gui-xaw/gui_main.c:396
 #, c-format
 msgid "Unable to open fontset: %s"
-msgstr ""
+msgstr "Estas neeble ŝargi tiparon: %s"
 
 #: client/gui-xaw/gui_main.c:378 client/gui-xaw/gui_main.c:399
 msgid "Doing 'xset fp rehash' may temporarily solve a problem."
-msgstr "Atlikus „xset fp rehash“ gali laikinai išspręsti problemą."
+msgstr "Tajpu 'xset fp rehash' ; tio eble solvis la problemon pormomente."
 
 #: client/gui-xaw/gui_main.c:382 client/gui-xaw/gui_main.c:403
 #, c-format
 msgid "Font for charset %s is lacking"
-msgstr ""
+msgstr "Mankas tiparo por %s"
 
 #: client/gui-xaw/helpdlg.c:913 client/gui-xaw/helpdlg.c:924
 #: client/gui-xaw/helpdlg.c:931
 #, c-format
 msgid "Allows %s.\n"
-msgstr "Leidžia %s.\n"
+msgstr "Ebligas %s.\n"
 
 #: client/gui-xaw/helpdlg.c:918
 #, c-format
 msgid "Obsoletes %s.\n"
-msgstr "Pasendina %s.\n"
+msgstr "Igas arkaika %s.\n"
 
 #: client/gui-xaw/helpdlg.c:934 client/gui-xaw/helpdlg.c:939
 #, c-format
 msgid "Allows %s (with %s).\n"
-msgstr "Leidžia %s (kartu su %s).\n"
+msgstr "Ebligas %s (kun %s).\n"
 
 #: client/gui-xaw/inteldlg.c:423
 #, c-format
 msgid "Intelligence Diplomacy Information for the %s Empire"
-msgstr ""
+msgstr "Diplomatia informoj por la %s Imperio"
 
 #: client/gui-xaw/menu.c:111
 msgid "Local Options"
-msgstr "Vietiniai nustatymai"
+msgstr "Lokaj opcioj"
 
 #: client/gui-xaw/menu.c:113
 msgid "Save Settings"
-msgstr "IÅ¡saugoti nustatymus"
+msgstr "Konservu agordaĵojn"
 
 #: client/gui-xaw/menu.c:115
 msgid "Server Options"
-msgstr "Serverio nustatymai"
+msgstr "Foraj opcioj"
 
 #: client/gui-xaw/menu.c:117
 msgid "Export Log"
-msgstr "Išsaugoti žurnalą"
+msgstr "Eksportu protokolon"
 
 #: client/gui-xaw/menu.c:118
 msgid "Clear Log"
-msgstr "Išvalyti žurnalą"
+msgstr "vakigu protokolon"
 
 #: client/gui-xaw/menu.c:120 data/Freeciv.in:3178
 msgid "Disconnect"
-msgstr "Atsijungti"
+msgstr "Malkonektiĝu"
 
 #: client/gui-xaw/menu.c:126
 msgid "Tax Rates"
-msgstr ""
+msgstr "Impostado"
 
 #: client/gui-xaw/menu.c:144
 msgid "City Growth"
-msgstr "Miesto augimas"
+msgstr "Urba pliiĝo"
 
 #: client/gui-xaw/menu.c:146
 msgid "City Productions"
-msgstr "Miesto gamyba"
+msgstr "Produktadoj de urboj"
 
 #: client/gui-xaw/menu.c:187
 msgid "Make Homecity"
-msgstr "Padaryti namų miestu"
+msgstr "Igu ĝin hejmurbo"
 
 #: client/gui-xaw/menu.c:192
 msgid "Wake up others"
-msgstr "Pažadinti kitus"
+msgstr "Veki la aliajn"
 
 #: client/gui-xaw/menu.c:196
 msgid "Auto Explore"
-msgstr "Automatiškai tyrinėti"
+msgstr "AÅ­t. esplorado"
 
 #: client/gui-xaw/menu.c:197
 msgid "Connect/Road"
-msgstr "Sujungti/Kelias"
+msgstr "Kunligo/Vojo"
 
 #: client/gui-xaw/menu.c:198
 msgid "Connect/Rail"
-msgstr "Sujungti/Geležinkelis"
+msgstr "Kunligo/Fervojo"
 
 #: client/gui-xaw/menu.c:199
 msgid "Connect/Irrigation"
-msgstr "Sujungti/DrÄ—kinimas"
+msgstr "Kunligo/Irigacio"
 
 #: client/gui-xaw/menu.c:201
 msgid "Go to"
-msgstr "Eiti į"
+msgstr "Iru al"
 
 #: client/gui-xaw/menu.c:211
 msgid "Select Same Type"
-msgstr "Pasirinkti to paties tipo"
+msgstr "Elektu laÅ­ sama speco"
 
 #: client/gui-xaw/menu.c:227
 msgid "Top Five Cities"
-msgstr "Penki geriausi miestai"
+msgstr "La kvin urboj pli gravaj"
 
 #: client/gui-xaw/menu.c:229
 msgid "Demographics"
-msgstr "Demografija"
+msgstr "Demografio"
 
 #: client/gui-xaw/menu.c:235 data/helpdata.txt:378
 msgid "Languages"
-msgstr "Kalbos"
+msgstr "Lingvoj"
 
 #: client/gui-xaw/menu.c:236 data/helpdata.txt:401
 msgid "Connecting"
-msgstr "Prisijungimas"
+msgstr "Konektado"
 
 #: client/gui-xaw/menu.c:237 data/helpdata.txt:429
 msgid "Controls"
-msgstr "KontrolÄ—"
+msgstr "Regiloj"
 
 #: client/gui-xaw/menu.c:238 data/helpdata.txt:546
 msgid "Chatline"
-msgstr "Pokalbių linija"
+msgstr "Babillineo"
 
 #: client/gui-xaw/menu.c:239
 msgid "Playing"
-msgstr "Žaidimas"
+msgstr "Ludado"
 
 #: client/gui-xaw/menu.c:243 data/helpdata.txt:986
 msgid "Combat"
-msgstr "MÅ«Å¡is"
+msgstr "Batalado"
 
 #: client/gui-xaw/menu.c:244
 msgid "ZOC"
-msgstr "KZ"
+msgstr "Influareo"
 
 #: client/gui-xaw/menu.c:245 data/helpdata.txt:887
 msgid "Technology"
-msgstr "Technologija"
+msgstr "Teĥnologio"
 
 #: client/gui-xaw/menu.c:250 data/helpdata.txt:1464
 msgid "Space Race"
-msgstr "KosminÄ— rasÄ—"
+msgstr "Konkuro por la kosmo"
 
 #: client/gui-xaw/menu.c:252 data/helpdata.txt:76
 msgid "Copying"
-msgstr "Kopijavimas"
+msgstr "Kopirajto"
 
 #: client/gui-xaw/repodlgs.c:228 client/gui-xaw/repodlgs.c:491
 #, c-format
 msgid "Researching %s: %d/%s"
-msgstr "TyrinÄ—jama %s: %d/%s"
+msgstr "Studado pri %s: %d/%s"
 
 #: client/gui-xaw/repodlgs.c:231 client/gui-xaw/repodlgs.c:494
 msgid "unknown"
-msgstr "nežinomas"
+msgstr "nekonata"
 
 #: client/gui-xaw/repodlgs.c:234 client/gui-xaw/repodlgs.c:497
 #, c-format
 msgid "Researching %s: %d/%d"
-msgstr "TyrinÄ—jama %s: %d/%d"
+msgstr "Studado pri %s: %d/%d"
 
 #: client/gui-xaw/repodlgs.c:242 client/gui-xaw/repodlgs.c:247
 #: client/gui-xaw/repodlgs.c:507 client/gui-xaw/repodlgs.c:512
 #, c-format
 msgid "Goal: %s (%d steps)"
-msgstr "Tikslas: %s (žingsnių: %d)"
+msgstr "Celo: %s (%d paŝoj)"
 
 #: client/gui-xaw/repodlgs.c:904
 msgid "Totals: ..."
-msgstr "Viso: ..."
+msgstr "Sumoj: ..."
 
 #: client/gui-xaw/repodlgs.c:1124
 #, c-format
 msgid "Totals:                     %9d%9d%9d%9d"
-msgstr "Viso:                     %9d%9d%9d%9d"
+msgstr "Sumoj:                     %9d%9d%9d%9d"
 
 #: manual/civmanual.c:120
 #, c-format
 msgid "Could not write manual file %s."
-msgstr ""
+msgstr "Estas neeble skribi en la dosiero de manlibro %s."
 
 #: manual/civmanual.c:128
 #, c-format
@@ -14955,33 +15243,33 @@ msgid ""
 "<h1>Freeciv %s server options</h1>\n"
 "\n"
 msgstr ""
-"<h1>Freeciv %s serverio parametrai</h1>\n"
+"<h1>Opcioj de Freeciv %s servilo</h1>\n"
 "\n"
 
 #: manual/civmanual.c:144
 #, c-format
 msgid "Level: %s.<br>"
-msgstr "Lygis: %s.<br>"
+msgstr "Nivelo: %s.<br>"
 
 #: manual/civmanual.c:145
 #, c-format
 msgid "Category: %s.<br>"
-msgstr "Kategorija: %s.<br>"
+msgstr "Kategorio: %s.<br>"
 
 #: manual/civmanual.c:148
 #, c-format
 msgid "Can only be used in server console. "
-msgstr "Gali būti naudojama tik serverio komandinėje eilutėje."
+msgstr ""
 
 #: manual/civmanual.c:151
 #, c-format
 msgid "Can be changed during a game. "
-msgstr "Gali būti pakeista žaidimo metu."
+msgstr ""
 
 #: manual/civmanual.c:153
 #, c-format
 msgid "Can <b>not</b> be changed during a game. "
-msgstr "<b>Negali</b> būti pakeista žaidimo metu. "
+msgstr ""
 
 #: manual/civmanual.c:158
 #, c-format
@@ -14989,7 +15277,7 @@ msgid ""
 "<p class=\"bounds\">Minimum: 0, Default: %d, Maximum: 1</p>\n"
 "\n"
 msgstr ""
-"<p class=\"bounds\">Minimali: 0, numatyta: %d, maksimali: 1</p>\n"
+"<p class=\"bounds\">Minimumo: 0, DefaÅ­lto: %d, Maksimumo: 1</p>\n"
 "\n"
 
 #: manual/civmanual.c:162 manual/civmanual.c:172
@@ -14998,7 +15286,7 @@ msgid ""
 "<p class=\"changed\">Value set to %d</p>\n"
 "\n"
 msgstr ""
-"<p class=\"changed\">Vertė nustatyta į %d</p>\n"
+"<p class=\"changed\">La valoro estas %d</p>\n"
 "\n"
 
 #: manual/civmanual.c:167
@@ -15007,7 +15295,7 @@ msgid ""
 "<p class=\"bounds\">Minimum: %d, Default: %d, Maximum: %d</p>\n"
 "\n"
 msgstr ""
-"<p class=\"bounds\">Minimali: %d, numatyta: %d, maksimali: %d</p>\n"
+"<p class=\"bounds\">Minimumo: %d, DefaÅ­lto: %d, Maksimumo: %d</p>\n"
 "\n"
 
 #: manual/civmanual.c:177
@@ -15016,7 +15304,7 @@ msgid ""
 "<p class=\"bounds\">Default: \"%s\"</p>\n"
 "\n"
 msgstr ""
-"<p class=\"bounds\">Numatyta: \"%s\"</p>\n"
+"<p class=\"bounds\">DefaÅ­lto: \"%s\"</p>\n"
 "\n"
 
 #: manual/civmanual.c:180
@@ -15025,7 +15313,7 @@ msgid ""
 "<p class=\"changed\">Value set to %s</p>\n"
 "\n"
 msgstr ""
-"<p class=\"changed\">Vertė nustatyta į %s</p>\n"
+"<p class=\"changed\">La valoro estas %s</p>\n"
 "\n"
 
 #: manual/civmanual.c:189
@@ -15034,7 +15322,7 @@ msgid ""
 "<h1>Freeciv %s server commands</h1>\n"
 "\n"
 msgstr ""
-"<h1>Freeciv %s serverio komandos</h1>\n"
+"<h1>Komandoj por Freeciv %s servilo</h1>\n"
 "\n"
 
 #: manual/civmanual.c:198
@@ -15047,7 +15335,7 @@ msgid ""
 msgstr ""
 "<table>\n"
 "<tr>\n"
-"<td valign=\"top\"><pre>ReziumÄ—:</pre></td>\n"
+"<td valign=\"top\"><pre>Skemo:</pre></td>\n"
 "<td>"
 
 #: manual/civmanual.c:202
@@ -15056,7 +15344,7 @@ msgid ""
 "<p class=\"level\">Level: %s</p>\n"
 "\n"
 msgstr ""
-"<p class=\"level\">Lygis: %s</p>\n"
+"<p class=\"level\">Nivelo: %s</p>\n"
 "\n"
 
 #: manual/civmanual.c:211
@@ -15065,7 +15353,7 @@ msgid ""
 "<p>Description:</p>\n"
 "\n"
 msgstr ""
-"<p>Aprašymas:</p>\n"
+"<p>Priskribo:</p>\n"
 "\n"
 
 #: manual/civmanual.c:218
@@ -15074,45 +15362,43 @@ msgid ""
 "<h1>Freeciv %s terrain help</h1>\n"
 "\n"
 msgstr ""
-"<h1>Freeciv %s reljefo pagalba</h1>\n"
-"\n"
 
 #: manual/civmanual.c:221 data/default/terrain.ruleset:636
 #: data/civ2/terrain.ruleset:567 data/civ1/terrain.ruleset:574
 msgid "Resources"
-msgstr "Resursai"
+msgstr "Produktado"
 
 #: manual/civmanual.c:222
 msgid "Move cost"
-msgstr "Ä–jimo kaina"
+msgstr "Kosto de movo"
 
 #: manual/civmanual.c:222
 msgid "Defense bonus"
-msgstr "Gynybos priedas"
+msgstr "Defenda pluso"
 
 #: manual/civmanual.c:224
 msgid "Mining"
-msgstr "Kasyba"
+msgstr "Eltirado"
 
 #: manual/civmanual.c:224
 msgid "turns"
-msgstr "Ä—jimai"
+msgstr "vicoj"
 
 #: manual/civmanual.c:226
 msgid "Rail"
-msgstr "Geležinkelis"
+msgstr "Fervojo"
 
 #: manual/civmanual.c:227
 msgid "Clean pollution"
-msgstr "Valyti taršą"
+msgstr "Malpolui"
 
 #: manual/civmanual.c:227
 msgid "Clean fallout"
-msgstr "Valyti radioaktyviÄ…sias dulkes"
+msgstr "Malpolui radioaktivan refalon"
 
 #: manual/civmanual.c:262 manual/civmanual.c:272
 msgid "impossible"
-msgstr "neįmanoma"
+msgstr "neebla"
 
 #: manual/civmanual.c:295
 #, c-format
@@ -15120,8 +15406,6 @@ msgid ""
 "<h1>Freeciv %s buildings help</h1>\n"
 "\n"
 msgstr ""
-"<h1>Freeciv %s pastatų pagalba</h1>\n"
-"\n"
 
 #: manual/civmanual.c:297
 #, c-format
@@ -15132,326 +15416,332 @@ msgstr ""
 
 #: manual/civmanual.c:303
 msgid "Requirement"
-msgstr "Reikalavimai:"
+msgstr "Necesaĵo:"
 
 #: manual/civmanual.c:303
 msgid "Obsolete by"
-msgstr "Pasensta prie"
+msgstr "Arkaika kun:"
 
 #: manual/civmanual.c:303
 msgid "More info"
-msgstr "Daugiau informacijos"
+msgstr "Pluaj informoj"
 
 #: data/Freeciv.in:68
 msgid "Connect to Freeciv Server"
-msgstr "Prisijungti prie Freeciv serverio"
+msgstr "Konektigu kun Freeciv-servilo"
 
 #: data/Freeciv.in:111
 msgid "LAN Servers"
-msgstr "LAN serveriai"
+msgstr "Lokaj serviloj"
 
 #: data/Freeciv.in:129
 msgid "Freeciv Server List"
-msgstr "Freeciv serverių sąrašas"
+msgstr "Listo pri Freeciv-serviloj"
 
 #: data/Freeciv.in:132
 msgid ""
 "Server Name                         Port  Version     Status  Players  "
 "Comment"
 msgstr ""
+"Servilnomo                          Pordo  Versio     Stato   Ludantoj "
+"Komentoj"
 
 #: data/Freeciv.in:215
 msgid "Diplomacy"
-msgstr "Diplomatija"
+msgstr "Diplomatio"
 
 #: data/Freeciv.in:310
 msgid "The following clauses have been agreed upon:"
-msgstr "Susitarta buvo dėl šių dalykų:"
+msgstr "La sekvantaj klaÅ­zoj estas akceptitaj:"
 
 #: data/Freeciv.in:366
 msgid "Erase clause"
-msgstr "IÅ¡trinti sÄ…lygÄ…"
+msgstr "Forigu klaÅ­zon"
 
 #: data/Freeciv.in:474 data/Freeciv.in:483
 msgid "Shared vision"
-msgstr "Bendras regÄ—jimo laukas"
+msgstr "Komuna vido"
 
 #: data/Freeciv.in:558
 msgid "Select Unit(s)"
-msgstr "Pasirinkti dalinį(-ius)"
+msgstr "Elektu unuo(j)n"
 
 #: data/Freeciv.in:672 data/Freeciv.in:751
 msgid "Variant:"
-msgstr "Variantas:"
+msgstr "Varianto:"
 
 #: data/Freeciv.in:859
 msgid "Firepower:"
-msgstr "Å aunamoji galia:"
+msgstr "Pafpovo:"
 
 #: data/Freeciv.in:932
 msgid "Movement/Defense:"
-msgstr "JudÄ—jimas/Gynyba:"
+msgstr "Movoj/Defendo:"
 
 #: data/Freeciv.in:951
 msgid "Food/Resources/Trade:"
-msgstr "Maistas/Resursai/Prekyba:"
+msgstr "Nutraĵo/Produktado/Komerco:"
 
 #: data/Freeciv.in:980
 msgid "Road Result/Time:"
-msgstr ""
+msgstr "Vojo  Rez/Tempo:"
 
 #: data/Freeciv.in:1000
 msgid "Irrig. Result/Time:"
-msgstr ""
+msgstr "Irigacio Rez/Tempo:"
 
 #: data/Freeciv.in:1021
 msgid "Mine Result/Time:"
-msgstr ""
+msgstr "Minejo Rez/Tempo:"
 
 #: data/Freeciv.in:1041
 msgid "Trans. Result/Time:"
-msgstr ""
+msgstr "Trans. Rez/Tempo:"
 
 #: data/Freeciv.in:1105
 msgid "Select destination:"
-msgstr "Pasirinkti tikslÄ…:"
+msgstr "Elektu celpunkton:"
 
 #: data/Freeciv.in:1264
 msgid "Where to Display Messages"
-msgstr "Kur rodyti žinutes"
+msgstr "Kie oni videbligas mesaĝojn"
 
 #: data/Freeciv.in:1265
 msgid ""
 "Out = Output window, Mes = Messages window,\n"
 "Pop = Popup individual window"
 msgstr ""
+"Norm = normala fenestro, Mes = fenestro pri mesaĝoj,\n"
+"Ŝpruc = ŝprucfenestro"
 
 #: data/Freeciv.in:1276
 msgid " Out Mes Pop"
-msgstr ""
+msgstr " Norm Mes Åœpruc"
 
 #: data/Freeciv.in:1287
 msgid "Rates"
-msgstr "Normos"
+msgstr "Kvantoj"
 
 #: data/Freeciv.in:1289
+#, fuzzy
 msgid "Select tax, luxury and science rates:"
-msgstr "Pasirinkite mokesčių, prabangos ir mokslo normas:"
+msgstr "Elektu impostan, lukson kaj sciencan kvanton:"
 
 #: data/Freeciv.in:1397
 msgid "Help:"
-msgstr "Pagalba:"
+msgstr "Helpo:"
 
 #: data/Freeciv.in:1465
 msgid "Citizen governor..."
-msgstr "Piliečių valdytojas..."
+msgstr "Urba estro.."
 
 #: data/Freeciv.in:1468
 msgid "Add Preset"
-msgstr ""
+msgstr "Aldonu apriorajn elektaĵojn"
 
 #: data/Freeciv.in:1469
 msgid "Remove Preset"
-msgstr ""
+msgstr "Formovu apriorajn elektaĵojn"
 
 #: data/Freeciv.in:1471
 msgid "Control City"
-msgstr "Kontroliuoti miestÄ…"
+msgstr "Regu urbon"
 
 #: data/Freeciv.in:1472
 msgid "Release City"
-msgstr "Atlaisvinti miestÄ…"
+msgstr "Malpremu urbon"
 
 #: data/Freeciv.in:1474
-#, fuzzy
 msgid "Minimal Surplus:"
-msgstr "Perteklius:"
+msgstr "Minimuma troo:"
 
 #: data/Freeciv.in:1476
 msgid "Factor:"
-msgstr "Faktorius:"
+msgstr "Faktoro:"
 
 #: data/Freeciv.in:1491
 msgid "Remove preset?"
-msgstr ""
+msgstr "Ĉu vi deziras formovi apriorajn elektaĵojn?"
 
 #: data/Freeciv.in:1502
 msgid "City Options"
-msgstr "Miesto nustatymai"
+msgstr "Opcioj pri urbo"
 
 #: data/Freeciv.in:1512
 msgid "Make new citizens into:     "
-msgstr "Padaryto naujus piliečius:     "
+msgstr "Krei novajn civitanojn en:  "
 
 #: data/Freeciv.in:1520
 msgid "Disband if build settler at size 1:"
-msgstr "Išformuoti, jei pastatyti naujakuriai esant dydžiui 1:"
+msgstr "Dissolvu farmkomunumon je 1 grandeco:"
 
 #: data/Freeciv.in:1526
 msgid "Auto-attack vs land units:         "
-msgstr "Automatiškai pulti sausumos dalinius: "
+msgstr "AÅ­t. atako kontraÅ­ ter-unuoj: "
 
 #: data/Freeciv.in:1532
 msgid "Auto-attack vs sea units:          "
-msgstr "Automatiškai pulti jūros dalinius: "
+msgstr "AÅ­t. atako kontraÅ­ mar-unuoj:   "
 
 #: data/Freeciv.in:1538
 msgid "Auto-attack vs air units:          "
-msgstr "Automatiškai pulti aviaciją: "
+msgstr "AÅ­t. atako kontraÅ­ aer-unuoj:   "
 
 #: data/Freeciv.in:1544
 msgid "Auto-attack vs helicopters:        "
-msgstr "Automatiškai pulti sraigtasparnius:"
+msgstr "AÅ­t. atako kontraÅ­ helikopteroj: "
 
 #: data/Freeciv.in:1645
 msgid "Change All..."
-msgstr "Keisti viskÄ…..."
+msgstr "Ŝanĝu ĉion..."
 
 #: data/Freeciv.in:1661
 msgid "Configure..."
-msgstr "Konfigūruoti..."
+msgstr "Agordu..."
 
 #: data/Freeciv.in:1720
 msgid "Configure Cities Report"
-msgstr "Konfigūruoti miestų ataskaitą"
+msgstr "Agordu raporton pri la urboj"
 
 #: data/Freeciv.in:1846
 msgid "Building Name       Count Cost Total"
-msgstr ""
+msgstr "Nomo de konstruo    Nombro  Kosto "
 
 #: data/Freeciv.in:1922
 msgid "Unit Type            Upgrade  In-Prog   Active   Shield     Food"
-msgstr ""
+msgstr "Speco de unuo      Ĝisdatigu  In-prog  Aktiva Produk   Nutraĵo"
 
 #: data/Freeciv.in:2006
 msgid "Rename worklist"
-msgstr "Pervadinti darbų sąrašą"
+msgstr "Renomu laborliston"
 
 #: data/Freeciv.in:2075
 msgid "Select new production"
-msgstr "Pasirinkite naujÄ… produkcijÄ…"
+msgstr "Elektu novan produktadon"
 
 #: data/Freeciv.in:2111
 msgid "Production Worklist"
-msgstr "Gamybos sąrašas"
+msgstr "Produktada laborlisto"
 
 #: data/Freeciv.in:2120
 msgid "Available targets"
-msgstr "Prieinami objektai"
+msgstr "Disponeblaj celoj"
 
 #: data/Freeciv.in:2146
 msgid "Prepend"
-msgstr ""
+msgstr "AntaÅ­aldonu"
 
 #: data/Freeciv.in:2182
 msgid "  Ok  "
-msgstr "Gerai"
+msgstr "  BONE  "
 
 #: data/Freeciv.in:2200
 msgid "Show future targets:"
-msgstr "Rodyti būsimus objektus:"
+msgstr "Montru estontajn celojn:"
 
 #: data/Freeciv.in:2261
 msgid "Establish traderoute"
-msgstr "Įkurti prekybos maršrutą"
+msgstr "Establu komercan kurson"
 
 #: data/Freeciv.in:2307
 msgid "Investigate City (free)"
-msgstr "IÅ¡tirti miestÄ… (nemokamai)"
+msgstr "Enketu pri urbo (senpaga)"
 
 #: data/Freeciv.in:2314
 msgid "Industrial Sabotage"
-msgstr "Pramoninis sabotažas"
+msgstr "Industria sabotado"
 
 #: data/Freeciv.in:2492
 msgid "Your New Government"
-msgstr "Jūsų nauja vyriausybė"
+msgstr "Via nova regsistemo"
 
 #: data/Freeciv.in:2494
 msgid "Select government type:"
-msgstr "Pasirink vyriausybÄ—s tipÄ…:"
+msgstr "Elektu regsistemon:"
 
 #: data/Freeciv.in:2512
 msgid "Choose unit activity:"
-msgstr "Pasirinkite dalinio veiksmÄ…:"
+msgstr "Elektu agon de la unuo:"
 
 #: data/Freeciv.in:3051
 msgid " Sell "
-msgstr " Parduoti"
+msgstr " Vendu "
 
 #: data/Freeciv.in:3058
 msgid "Rename..."
-msgstr "Pervadinti..."
+msgstr "Renomu..."
 
 #: data/Freeciv.in:3064
 msgid "Unit List..."
-msgstr "Dalinių sąrašas..."
+msgstr "Listo pri unuoj.."
 
 #: data/Freeciv.in:3066
 msgid "City Options..."
-msgstr "Miesto nustatymai..."
+msgstr "Opcio pri urbo..."
 
 #: data/Freeciv.in:3068
 msgid " Buy "
-msgstr " Pirkti"
+msgstr " Aĉetu "
 
 #: data/Freeciv.in:3070
 msgid "Change..."
-msgstr "Keisti..."
+msgstr "Ŝanĝu..."
 
 #: data/Freeciv.in:3072
 msgid "Worklist..."
-msgstr "Darbų sąrašas..."
+msgstr "Laborlisto..."
 
 #: data/Freeciv.in:3074
 msgid "Supported units:"
-msgstr "Palaikomi daliniai:"
+msgstr "Subtenitaj unuoj:"
 
 #: data/Freeciv.in:3097
 msgid "Units present:"
-msgstr "Esantys daliniai:"
+msgstr "Ĉeestantaj unuoj:"
 
 #: data/Freeciv.in:3135
 msgid "Select nation and name:"
-msgstr "Pasirink tautÄ… ir vardÄ…:"
+msgstr "Elektu nacion kaj nomon:"
 
 #: data/Freeciv.in:3150
 msgid "Pick Name"
-msgstr "Pasirink vardÄ…"
+msgstr "Elektu nomon"
 
 #: data/Freeciv.in:3154
 msgid "Select your sex:"
-msgstr "Išsirink lytį:"
+msgstr "Elektu vian sekson:"
 
 #: data/Freeciv.in:3158
 msgid "Male  "
-msgstr "Vyras"
+msgstr "Malina"
 
 #: data/Freeciv.in:3165
 msgid "Select city style:"
-msgstr "Pasirink miesto stilių:"
+msgstr "Elektu stilon por via urbo"
 
 #: data/Freeciv.in:3176
 msgid " Ok "
-msgstr " Gerai"
+msgstr " BONE "
 
 #: data/Freeciv.in:3209
 msgid ""
 "Name             Nation       Embassy  Dipl.State      Vision   "
 "Reputation    State    Host"
 msgstr ""
+"Nomo             Nacio        Ambasadejo  Dipl.Stato       Vido   "
+"Reputacio     Stato    Gast.komputilo"
 
 #: data/Freeciv.in:3246
 msgid "Cancel pact"
-msgstr "Panaikinti susitarimÄ…"
+msgstr "Nuligu kontrakton"
 
 #: data/Freeciv.in:3333 data/Freeciv.in:3334
 msgid "Pregame"
-msgstr ""
+msgstr "AntaÅ­ludo"
 
 #: data/Freeciv.in:3350
 msgid "Name              Ready Leader          Nation          "
-msgstr ""
+msgstr "Nomo                Estro               Nacio           "
 
 #: data/helpdata.txt:38
 msgid ""
@@ -15459,21 +15749,18 @@ msgid ""
 "leader of a civilization, fighting to obtain the ultimate goal: the "
 "extinction of all other civilizations."
 msgstr ""
-"Freeciv yra ėjimais paremtas žaidimas, kuriame kiekvienas žaidėjas tampa "
-"civilizacijos lyderiu ir stengiasi pasiekti svarbiausią tikslą: kitų "
-"civilizacijų užkariavimą ar sunaikinimą."
 
 #: data/helpdata.txt:42
 msgid ""
 "  Original authors:\n"
 "    (they are no longer involved, please don't mail them!)"
 msgstr ""
-"  Pradiniai autoriai:\n"
-"    (jie daugiau nebesusiję, prašom nesiųsti jiems laiškų!)"
+"  Originalaj aÅ­toroj:\n"
+"    (ili ne estas plu en la projekto, bonvolu ne sendi retpoŝton al ili!)"
 
 #: data/helpdata.txt:49
 msgid "  Present administrators: "
-msgstr " Dabartinai administratoriai:"
+msgstr "  Nunaj administrantoj: "
 
 #: data/helpdata.txt:55
 msgid ""
@@ -15492,7 +15779,8 @@ msgstr ""
 
 #: data/helpdata.txt:77
 msgid "Freeciv is covered by the GPL, which is included here: "
-msgstr "Freeciv yra apsaugotas GPL, kuri įdėta čia:"
+msgstr ""
+"Freeciv estas sub GPL permesilo, kiu estas ĉi tie aldonita anglalingve: "
 
 #: data/helpdata.txt:379
 msgid ""
@@ -15671,41 +15959,22 @@ msgid ""
 "\n"
 "Shift-Return: Turn done"
 msgstr ""
-"Dialogai ir ataskaitos:\n"
-"====================\n"
-"     F1: atidaryti miesto ataskaitÄ…\n"
-"     F2: atidaryti dalinio ataskaitÄ…\n"
-"     F3: atidaryti žaidėjų ataskaitą\n"
-"     F5: atidaryti ekonomikos ataskaitÄ…\n"
-"     F6: atidaryti mokslo ataskaitÄ…\n"
-"     F7: atidaryti Pasaulio stebuklus\n"
-"     F8: atidaryti penkis geriausius miestus\n"
-"     F9: atidaryti pranešimų dialogą\n"
-"    F11: atidaryti demografijÄ…\n"
-"    F12: atidaryti erdvėlaivį\n"
-"\n"
-"      T: atidaryti Mok/Pra/Moks Rates dialogÄ…\n"
-"      F: atidaryti miesto paieškos dialogą\n"
-" Ctrl-L: atidaryti darbų sąrašų dialogą\n"
-"      R: atidaryti revoliucijų dialogą\n"
-"\n"
-"Shift-Atgal: Ä–jimas baigtas"
 
 #: data/helpdata.txt:547
 msgid ""
 "The client has a primitive chat interface.  The lines you type are sent to "
 "all players, except:"
 msgstr ""
-"Klientas turi primityvią pokalbių sąsają. Surinktos eilutės nusiunčiamos "
-"visiems žaidėjams, išskyrus:"
+"La kliento havas rudimentan interfacon por la babillineo. Oni sendis al la "
+"aliaj  ludantoj tion kion vi skribas, escepte de:"
 
 #: data/helpdata.txt:550
 msgid ""
 "  - Messages starting with '/' are interpreted as server commands and "
 "executed, if you have the required access level."
 msgstr ""
-"  - Pranešimai, prasidedantys „/“, yra interpretuojami kaip serverio "
-"komandos ir vykdomi, jei turite reikalingą prieigos lygį."
+"  - La mesaĝoj kiuj komencas kun '/' estas komandoj por la servilo kaj ili "
+"estas plenumitaj se vi havas la necesajn rajtojn."
 
 #: data/helpdata.txt:553
 msgid ""
@@ -15713,20 +15982,28 @@ msgid ""
 "be abbreviated. The server looks for players named 'John' and if that fails "
 "tries to match a username beginning with 'John' (like 'Johnathan')."
 msgstr ""
+"  - La mesaĝoj kiuj komencas kun 'John:' estas privataj mesaĝoj por 'John'. "
+"Oni povas mallongigi la nomojn. La servilo serĉas ludantojn nomitajn 'John' "
+"kaj se ili neĉeestas, ĝi ekkontaktas uzantonomojn kiu komencas kun "
+"'John' (ekz. 'Johnathan')."
 
 #: data/helpdata.txt:558
 msgid ""
 "  - Messages starting with 'John::' are private messages as above, but will "
 "match only users (not players) named 'John'.  'Johnathan' will still match."
 msgstr ""
+"  - La mesaĝoj kiuj komencas kun 'John::' estas privataj mesaĝoj kiel la "
+"supraj , sed vi povas kontakti nur uzantojn (do ne ludantojn) kiuj nomiĝas "
+"'John'. 'Johnathan' povas ĉiukaze ekkontakti vin."
 
 #: data/helpdata.txt:562
 msgid "  - Messages starting with '.' will be sent only to all your allies."
-msgstr " - Pranešimai, prasidedantys „.“, bus nusiųsti tik jūsų draugams."
+msgstr ""
+"  - La mesaĝoj kiuj komencas kun '.' estos senditaj nur al viaj aliancanoj."
 
 #: data/helpdata.txt:567
 msgid "Worklist Editor"
-msgstr "Darbų sąrašo redaktorius"
+msgstr "Redaktilo por laborlisto"
 
 #: data/helpdata.txt:568
 msgid ""
@@ -15765,23 +16042,19 @@ msgstr ""
 
 #: data/helpdata.txt:591
 msgid "Strategy and tactics"
-msgstr "Strategija ir taktika"
+msgstr "Strategioj kaj taktikoj"
 
 #: data/helpdata.txt:592
 msgid ""
 "While every game is different, there's a basic strategy which most players "
 "follow, especially at the start of the game."
 msgstr ""
-"Nors kiekvienas žaidimas yra skirtingas, yra pagrindinė strategija, kurios "
-"laikosi dauguma žaidėjų, ypač žaidimo pradžioje."
 
 #: data/helpdata.txt:595
 msgid ""
 "These steps may vary depending upon the server options, but in general, the "
 "steps are: "
 msgstr ""
-"Šie žingsniai gali skirtis priklausomai nuo serverio nustatymų, bet "
-"apskritai žingsniai yra:"
 
 #: data/helpdata.txt:598
 msgid ""
@@ -15981,6 +16254,21 @@ msgid ""
 "\n"
 "   - and Give Gold."
 msgstr ""
+"    En tiu ĉi menuo vi povas elekti:\n"
+"\n"
+"   - Komerci mapojn (marajn aÅ­ globajn mapojn),\n"
+"\n"
+"   - Komerci avanaĵojn,\n"
+"\n"
+"   - Komerci urbojn,\n"
+"\n"
+"   - Komerci komunajn vidojn,\n"
+"\n"
+"   - Ŝanĝi ambasadojn,\n"
+"\n"
+"   - Krei kontraktojn,\n"
+"\n"
+"   - kaj doni oron."
 
 #: data/helpdata.txt:760
 msgid ""
@@ -16114,7 +16402,7 @@ msgstr ""
 
 #: data/helpdata.txt:870
 msgid "City Improvements"
-msgstr "Miesto patobulinimai"
+msgstr "Urbaj plibonigoj"
 
 #: data/helpdata.txt:871
 msgid ""
@@ -16135,8 +16423,6 @@ msgid ""
 "Each wonder has specific benefits for your civilization. Each wonder is "
 "unique and is placed in the city which constructed it."
 msgstr ""
-"Kiekvienas stebuklas turi naudos jūsų civilizacijai. Kiekvienas stebuklas "
-"yra unikalus ir patalpinamas mieste, kuris jį sukonstravo."
 
 #: data/helpdata.txt:910
 msgid ""
@@ -16232,8 +16518,8 @@ msgid ""
 "Default Combat Rules\n"
 "---------------------"
 msgstr ""
-"Numatytos mūšio taisyklės\n"
-"---------------------"
+"Normalaj batalreguloj\n"
+"----------------------------------"
 
 #: data/helpdata.txt:988
 msgid ""
@@ -16244,20 +16530,22 @@ msgstr ""
 
 #: data/helpdata.txt:993
 msgid "First, the attacker's strength is modified."
-msgstr "Pirmiausia, puolančiojo jėgos yra keičiamos."
+msgstr ""
 
 #: data/helpdata.txt:995
 msgid " - If the attacker is a veteran, its strength is multiplied by 1.5."
-msgstr " - Jei puolantysis yra veteranas, jo jėgos dauginamos iš 1,5."
+msgstr ""
+" - Se la atakanto estas veterano, lia forto estas multiplikita per 1,5."
 
 #: data/helpdata.txt:997
 msgid "Next, the defender's strength is modified."
-msgstr "Po to, besiginančiojo jėgos yra keičiamos."
+msgstr ""
 
 #: data/helpdata.txt:999
 msgid ""
 " - If the defender is a veteran, then its strength is multiplied by 1.5."
-msgstr " - Jei besiginantis yra veteranas, jo jėgos dauginamos iš 1,5."
+msgstr ""
+" - Se la defendanto estas veterano, lia forto estas multiplikita per 1,5."
 
 #: data/helpdata.txt:1002
 msgid ""
@@ -16289,8 +16577,6 @@ msgid ""
 " - An SDI Defense doubles the defender's strength yet again against missile "
 "attacks."
 msgstr ""
-" - SDI gynyba dar kartą padvigubina besiginančiojo gynybą prieš raketų "
-"atakas."
 
 #: data/helpdata.txt:1019
 msgid ""
@@ -16379,15 +16665,15 @@ msgstr ""
 
 #: data/helpdata.txt:1078
 msgid " Modifying Combat Rules"
-msgstr " Mūšio taisyklių keitimas"
+msgstr " Redaktu batalregulojn"
 
 #: data/helpdata.txt:1079
 msgid ""
 "Modifying Combat Rules\n"
 "----------------------"
 msgstr ""
-"Mūšio taisyklių keitimas\n"
-"----------------------"
+"Redaktu batalregulojn\n"
+"-------------------------------------"
 
 #: data/helpdata.txt:1080
 msgid ""
@@ -16403,7 +16689,7 @@ msgstr ""
 
 #: data/helpdata.txt:1089
 msgid " Combat example 1"
-msgstr " MÅ«Å¡io pavyzdys 1"
+msgstr " Ekzemplo pri interbatalo 1"
 
 #: data/helpdata.txt:1090
 msgid ""
@@ -16429,7 +16715,7 @@ msgstr ""
 
 #: data/helpdata.txt:1103
 msgid "Both units keep their firepower of 1 unchanged."
-msgstr ""
+msgstr "AmbaÅ­ unuoj tenas sian pafpovon je 1."
 
 #: data/helpdata.txt:1106
 #, no-c-format
@@ -16451,7 +16737,7 @@ msgstr ""
 
 #: data/helpdata.txt:1127
 msgid " Combat example 2"
-msgstr " MÅ«Å¡io pavyzdys 2"
+msgstr " Ekzemplo pri interbatalo 2"
 
 #: data/helpdata.txt:1128
 msgid ""
@@ -16463,6 +16749,8 @@ msgstr ""
 #: data/helpdata.txt:1133
 msgid "The attacker's strength is 12, raised to 18 because of veteran status."
 msgstr ""
+"La forto de la atakanto estas 12, sed ĝi pliiĝas ĝis 18 por la stato je "
+"veterano."
 
 #: data/helpdata.txt:1136
 msgid ""
@@ -16481,7 +16769,7 @@ msgstr ""
 
 #: data/helpdata.txt:1145
 msgid "The firepower of the Battleship is set from 2 to 1."
-msgstr ""
+msgstr "La pafpovo de la militŝipo estas malpliigita de 2 ĝis 1."
 
 #: data/helpdata.txt:1148
 #, no-c-format
@@ -16503,7 +16791,7 @@ msgstr ""
 
 #: data/helpdata.txt:1168
 msgid "Zones of Control"
-msgstr "Valdymo zonos"
+msgstr "Influzonoj"
 
 #: data/helpdata.txt:1169
 msgid ""
@@ -16583,7 +16871,7 @@ msgstr ""
 
 #: data/helpdata.txt:1235
 msgid " Terrain Alterations"
-msgstr ""
+msgstr " Aliiĝoj de la areo"
 
 #: data/helpdata.txt:1236
 msgid ""
@@ -16672,7 +16960,7 @@ msgstr ""
 
 #: data/helpdata.txt:1294
 msgid "  Pillaging"
-msgstr "  PlÄ—Å¡ikavimas"
+msgstr "  Disrabado"
 
 #: data/helpdata.txt:1295
 msgid ""
@@ -16692,13 +16980,13 @@ msgid ""
 " - a railroad\n"
 " - a road"
 msgstr ""
-" - dirbamoji žemė\n"
-" - drÄ—kinimas\n"
-" - kasykla\n"
-" - fortas\n"
-" - oro bazÄ—\n"
-" - geležinkelis\n"
-" - kelias"
+" - farmo\n"
+" - irigacio\n"
+" - minejo\n"
+" - fortreso\n"
+" - avia bazo\n"
+" - fervojo\n"
+" - vojo"
 
 #: data/helpdata.txt:1309
 msgid ""
@@ -16715,6 +17003,8 @@ msgid ""
 "Your government type influences your cities' productivity and commerce, your "
 "citizens' happiness, and many other game factors."
 msgstr ""
+"La regsistemo influas sur la produktado kaj la komerco de viaj urboj, sur la "
+"kontenteco de la civitanoj kaj sur multaj aliaj faktoroj de la ludo."
 
 #: data/helpdata.txt:1324
 msgid ""
@@ -16761,7 +17051,7 @@ msgstr ""
 
 #: data/helpdata.txt:1360
 msgid " Civil War"
-msgstr " Pilietinis karas"
+msgstr " Intercivitana milito"
 
 #: data/helpdata.txt:1361
 msgid ""
@@ -16923,8 +17213,6 @@ msgid ""
 "If the capital of a civilization is captured, a spaceship that has been "
 "launched will be lost, so defend your capital well!"
 msgstr ""
-"Jei civilizacijos sostinė bus užgrobta, tai erdvėlaivis, kuris buvo "
-"paleistas, bus prarastas. Taigi ginki savo sostinÄ™ gerai!"
 
 #: data/helpdata.txt:1491
 msgid ""
@@ -16947,20 +17235,18 @@ msgstr ""
 #: data/default/buildings.ruleset:71 data/civ2/buildings.ruleset:54
 #: data/civ1/buildings.ruleset:28
 msgid "Aqueduct"
-msgstr "Akvedukas"
+msgstr "Akvokondukilo"
 
 #: data/default/buildings.ruleset:85 data/civ2/buildings.ruleset:68
 msgid ""
 "Allows a city to grow larger than size 8.  A Sewer System is also required "
 "for a city to grow larger than size 12."
 msgstr ""
-"Leidžia miestui užaugti didesniam kaip 8. Kanalizacija reiklainga miestui "
-"užaugti didesniam kaip 12."
 
 #: data/default/buildings.ruleset:91 data/civ2/buildings.ruleset:74
 #: data/civ1/buildings.ruleset:47
 msgid "Bank"
-msgstr "Bankas"
+msgstr "Banko"
 
 #: data/default/buildings.ruleset:107 data/civ2/buildings.ruleset:90
 #: data/civ1/buildings.ruleset:63
@@ -16969,7 +17255,6 @@ msgid ""
 "Together with the Marketplace improvement, a Bank increases the luxury and "
 "tax production within a city by 100%."
 msgstr ""
-"Kartu su turgumi, bankas padidina prabangą ir mokesčių surinkimą mieste 100%."
 
 #: data/default/buildings.ruleset:128 data/default/buildings.ruleset:152
 #: data/default/buildings.ruleset:175 data/civ2/buildings.ruleset:110
@@ -16984,17 +17269,17 @@ msgstr ""
 #: data/default/buildings.ruleset:137 data/civ2/buildings.ruleset:119
 #: data/civ1/buildings.ruleset:92
 msgid "Barracks II"
-msgstr "KareivinÄ—s II"
+msgstr "Kazernoj II"
 
 #: data/default/buildings.ruleset:161 data/civ2/buildings.ruleset:142
 #: data/civ1/buildings.ruleset:115
 msgid "Barracks III"
-msgstr "KareivinÄ—s III"
+msgstr "Kazernoj III"
 
 #: data/default/buildings.ruleset:184 data/civ2/buildings.ruleset:165
 #: data/civ1/buildings.ruleset:138
 msgid "Cathedral"
-msgstr "Katedra"
+msgstr "Katedralo"
 
 #: data/default/buildings.ruleset:199 data/civ2/buildings.ruleset:179
 msgid ""
@@ -17016,33 +17301,29 @@ msgstr ""
 
 #: data/default/buildings.ruleset:233 data/civ2/buildings.ruleset:213
 msgid "Coastal Defense"
-msgstr "Pakrančių apsauga"
+msgstr "Marborda defendo"
 
 #: data/default/buildings.ruleset:248 data/civ2/buildings.ruleset:228
 msgid ""
 "Increases the defence strength of units within a city by a factor of 2 when "
 "defending against bombardments from enemy ships."
 msgstr ""
-"Mieste esančių dalinių gynybos jėga padidinama 2 kartus ginantis nuo priešo "
-"laivų bombardavimo."
 
 #: data/default/buildings.ruleset:254 data/civ2/buildings.ruleset:234
 #: data/civ1/buildings.ruleset:182
 msgid "Colosseum"
-msgstr "Koliziejus"
+msgstr "Amfiteatro"
 
 #: data/default/buildings.ruleset:268
 msgid ""
 "Entertains the citizens of a city, making 3 unhappy citizens content.  (Four "
 "after the discovery of Electricity.)"
 msgstr ""
-"Linksmina miestiečius padarydama 3 nelaimingus žmones patenkintais (4 po "
-"elektros atradimo)."
 
 #: data/default/buildings.ruleset:276 data/civ2/buildings.ruleset:254
 #: data/civ1/buildings.ruleset:201
 msgid "Courthouse"
-msgstr "Teismo rūmai"
+msgstr "Tribunalo"
 
 #: data/default/buildings.ruleset:290
 msgid ""
@@ -17050,14 +17331,11 @@ msgid ""
 "Courthouse makes 1 unhappy citizen content.  Also makes the revolt cost of "
 "the city 4 times bigger."
 msgstr ""
-"Sumažina korupciją ir atliekas mieste 50%. Esant demokratijai, teismo rūmai "
-"padaro vienÄ… nelaimingÄ… gyventojÄ… patenkintu. Taip pat revoliucijos sukÄ—limo "
-"kaina mieste tampa 4 kartus didesnÄ—."
 
 #: data/default/buildings.ruleset:297 data/civ2/buildings.ruleset:276
 #: data/civ1/buildings.ruleset:223
 msgid "Factory"
-msgstr "Fabrikas"
+msgstr "Fabriko"
 
 #: data/default/buildings.ruleset:311 data/civ2/buildings.ruleset:290
 #: data/civ1/buildings.ruleset:237
@@ -17076,7 +17354,7 @@ msgstr ""
 
 #: data/default/buildings.ruleset:341 data/civ2/buildings.ruleset:320
 msgid "Harbour"
-msgstr "Uostas"
+msgstr "Golfo"
 
 #: data/default/buildings.ruleset:356 data/civ2/buildings.ruleset:335
 msgid ""
@@ -17087,7 +17365,7 @@ msgstr ""
 #: data/default/buildings.ruleset:362 data/civ2/buildings.ruleset:341
 #: data/civ1/buildings.ruleset:267
 msgid "Hydro Plant"
-msgstr "HidroelektrinÄ—"
+msgstr "Hidroelektra centralo"
 
 #: data/default/buildings.ruleset:378
 msgid ""
@@ -17105,28 +17383,28 @@ msgstr ""
 #: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
 #: data/civ1/buildings.ruleset:297
 msgid "Library"
-msgstr "Biblioteka"
+msgstr "Biblioteko"
 
 #: data/default/buildings.ruleset:412
 #, no-c-format
 msgid "Increases the science output in a city by 100%."
-msgstr "100% padidina mokslo produkcijÄ… mieste."
+msgstr ""
 
 #: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
 #: data/civ1/buildings.ruleset:317
 msgid "Marketplace"
-msgstr "Turgus"
+msgstr "Bazaro"
 
 #: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
 #: data/civ1/buildings.ruleset:332
 #, no-c-format
 msgid "Increases the luxury and tax output in a city by 50%."
-msgstr "Padidina prabangą ir mokesčių surinkimą mieste 50%."
+msgstr ""
 
 #: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
 #: data/civ1/buildings.ruleset:337
 msgid "Mass Transit"
-msgstr "Masinis tranzitas"
+msgstr "Publikaj trafikiloj"
 
 #: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
 #: data/civ1/buildings.ruleset:351
@@ -17138,7 +17416,7 @@ msgstr ""
 #: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
 #: data/civ1/buildings.ruleset:358
 msgid "Mfg. Plant"
-msgstr "Gamyb. kompleksas"
+msgstr "Manufakturo"
 
 #: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
 #: data/civ1/buildings.ruleset:374
@@ -17151,7 +17429,7 @@ msgstr ""
 #: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
 #: data/civ1/buildings.ruleset:380
 msgid "Nuclear Plant"
-msgstr "BranduolinÄ— elektrinÄ—"
+msgstr "Atomcentralo"
 
 #: data/default/buildings.ruleset:495
 msgid ""
@@ -17166,7 +17444,7 @@ msgstr ""
 
 #: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
 msgid "Offshore Platform"
-msgstr "PakrantÄ—s platforma"
+msgstr "Petrolplatformo"
 
 #: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
 msgid ""
@@ -17177,7 +17455,7 @@ msgstr ""
 #: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
 #: data/civ1/buildings.ruleset:411
 msgid "Palace"
-msgstr "RÅ«mai"
+msgstr "Regpalaco"
 
 #: data/default/buildings.ruleset:552
 #, no-c-format
@@ -17198,7 +17476,7 @@ msgstr ""
 
 #: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
 msgid "Police Station"
-msgstr "Policijos būstinė"
+msgstr "Policejo"
 
 #: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
 msgid ""
@@ -17209,7 +17487,7 @@ msgstr ""
 
 #: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
 msgid "Port Facility"
-msgstr "Dokai"
+msgstr "Haveno"
 
 #: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
 msgid ""
@@ -17220,7 +17498,7 @@ msgstr ""
 #: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
 #: data/civ1/buildings.ruleset:440
 msgid "Power Plant"
-msgstr "JÄ—gainÄ—"
+msgstr "Elektrocentralo"
 
 #: data/default/buildings.ruleset:631
 #, no-c-format
@@ -17236,7 +17514,7 @@ msgstr ""
 #: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
 #: data/civ1/buildings.ruleset:468
 msgid "Recycling Center"
-msgstr "Perdirbimo centras"
+msgstr "Recikladejo"
 
 #: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
 #: data/civ1/buildings.ruleset:483
@@ -17244,11 +17522,11 @@ msgstr "Perdirbimo centras"
 msgid ""
 "Building a Recycling Center reduces the amount of pollution generated by "
 "production in a city by 66%."
-msgstr "Pastačius perdirbimo centrą išmetama tarša mieste sumažėja 66%."
+msgstr ""
 
 #: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
 msgid "Research Lab"
-msgstr "Tyrimų laboratorija"
+msgstr "Esplorada laboratorio"
 
 #: data/default/buildings.ruleset:682
 msgid ""
@@ -17256,26 +17534,21 @@ msgid ""
 "a city by 200%. Together with a Library and a University, a Research Lab "
 "increases the science production of a city by 450%."
 msgstr ""
-"Kartu su biblioteka tyrimų laboratorija padidina mokslo produkciją mieste "
-"200% procentų. Kartu  su biblioteka ir universitetu tyrimų laboratorija "
-"mokslo produkciją mieste padidina 450% procentų."
 
 #: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
 msgid "SAM Battery"
-msgstr "Priešlėktuvinė gynyba"
+msgstr "SAM-baterio"
 
 #: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
 msgid ""
 "Doubles the defense of all units inside the city when attacked by non-"
 "nuclear air units."
 msgstr ""
-"Padvigubina mieste esančių dalinių gynybą, kai yra puolama su nebranduoline "
-"aviacija."
 
 #: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
 #: data/civ1/buildings.ruleset:489
 msgid "SDI Defense"
-msgstr "SDI gynyba"
+msgstr "SDI-defendo"
 
 #: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
 #: data/civ1/buildings.ruleset:503
@@ -17284,25 +17557,21 @@ msgid ""
 "have no effect on the city.  Also, doubles defence against non-nuclear "
 "missiles."
 msgstr ""
-"Apsaugo miestÄ… nuo atakos atominiais ginklais. Tokia ataka miestui nepadaro "
-"jokios žalos. Taip pat padvigubina gynybą nuo kitų raketų."
 
 #: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
 msgid "Sewer System"
-msgstr "Kanalizacija"
+msgstr "Kloakreto"
 
 #: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
 msgid ""
 "Allows a city to grow larger than size 12.  An Aqueduct is first required "
 "for a city to grow larger than size 8."
 msgstr ""
-"Leidžia miestui užaugti didesniam nei 12. Miestui užaugti virš 8 pirmiausia "
-"reikalingas akvedukas."
 
 #: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
 #: data/civ1/buildings.ruleset:512
 msgid "Space Component"
-msgstr "Kosminis komponentas"
+msgstr "Komponanto de kosmoŝipo"
 
 #: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
 #: data/civ1/buildings.ruleset:526
@@ -17318,7 +17587,7 @@ msgstr ""
 #: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
 #: data/civ1/buildings.ruleset:536
 msgid "Space Module"
-msgstr "Kosminis modulis"
+msgstr "Kosma Modulo"
 
 #: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
 #: data/civ1/buildings.ruleset:550
@@ -17339,25 +17608,11 @@ msgid ""
 "Before you can build any spaceship parts, the Apollo Program wonder must "
 "have been built by any player."
 msgstr ""
-"Kosminiai moduliai yra brangiausios erdvėlaivio dalys. Yra trijų skirtingų "
-"rūšių kosminiai moduliai:\n"
-"\n"
-"- Gyvenamasis modulis: aprūpina 10 000 žmonių gyvenamąja vieta.\n"
-"\n"
-"- Gyvybės palaikymo modulis: aprūpina maistu ir vandeniu vieno gyvenamojo "
-"modulio populiacijÄ….\n"
-"\n"
-"- Saulės elementai: aprūpina energija kitus du modulius.\n"
-"\n"
-"Tu gali pastatyti iki 4 kiekvienos rūšies modulių.\n"
-"\n"
-"Prieš tai, kai tu galėsi statyti erdvėlaivio dalis, kuris nors žaidėjas turi "
-"pastatyti Apollo programÄ…."
 
 #: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
 #: data/civ1/buildings.ruleset:569
 msgid "Space Structural"
-msgstr "Kosminė struktūra"
+msgstr "Strukturoj por kosmoŝipo"
 
 #: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
 #: data/civ1/buildings.ruleset:583
@@ -17369,16 +17624,10 @@ msgid ""
 "Before you can build any spaceship parts, the Apollo Program wonder must "
 "have been built by any player."
 msgstr ""
-"Kosminės struktūros yra Jūsų erdvėlaivio pagrindas. Visos kitos erdvėlaivio "
-"dalys turi būti prijungiamos prie struktūrų tam, kad funkcionuotų. Jūs "
-"galite pastatyti iki 32 kosminių struktūrų.\n"
-"\n"
-"Prieš tai, kai jūs galėsite statyti erdvėlaivio dalis, kuris nors žaidėjas "
-"turi pastatyti Apollo programÄ…."
 
 #: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
 msgid "Stock Exchange"
-msgstr "Akcijų birža"
+msgstr "Biloborso"
 
 #: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
 #, no-c-format
@@ -17389,7 +17638,7 @@ msgstr ""
 
 #: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
 msgid "Super Highways"
-msgstr "AutomagistralÄ—s"
+msgstr "Aŭtoŝoseo"
 
 #: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
 #, no-c-format
@@ -17399,7 +17648,7 @@ msgstr ""
 
 #: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
 msgid "Supermarket"
-msgstr "Prekybos centras"
+msgstr "Superbazaro"
 
 #: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
 #, no-c-format
@@ -17412,7 +17661,7 @@ msgstr ""
 #: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
 #: data/civ1/buildings.ruleset:593
 msgid "Temple"
-msgstr "Å ventykla"
+msgstr "Templo"
 
 #: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
 #: data/civ1/buildings.ruleset:607
@@ -17426,19 +17675,19 @@ msgstr ""
 #: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
 #: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
 msgid "University"
-msgstr "Universitetas"
+msgstr "Universitato"
 
 #: data/default/buildings.ruleset:942
 #, no-c-format
 msgid ""
 "Together with a Library, a University increases the science production of a "
 "city by 250%."
-msgstr "Kartu su biblioteka universitetas padidina mokslÄ… mieste 250%."
+msgstr ""
 
 #: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
 #: data/civ1/buildings.ruleset:636
 msgid "Apollo Program"
-msgstr "„Apollo“ programa"
+msgstr "Kosma programo Apolono"
 
 #: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
 msgid ""
@@ -17446,13 +17695,10 @@ msgid ""
 "players to start building spaceship parts (assuming they have researched the "
 "necessary technologies)."
 msgstr ""
-"Žaidėjui, turinčiam šią technologiją, tampa matomas visas žemėlapis. Taip "
-"pat visi žaidėjai gali pradėti statyti erdvėlaivio dalis (jei jie turi "
-"išvystę reikiamas technologijas)."
 
 #: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
 msgid "A.Smith's Trading Co."
-msgstr "A. Smito prekybos korporacija"
+msgstr "Komerca societo de Adam Smith"
 
 #: data/default/buildings.ruleset:983
 msgid ""
@@ -17463,7 +17709,7 @@ msgstr ""
 #: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
 #: data/civ1/buildings.ruleset:655
 msgid "Colossus"
-msgstr "Kolosas"
+msgstr "Koloso"
 
 #: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
 #: data/civ1/buildings.ruleset:669
@@ -17475,32 +17721,29 @@ msgstr ""
 #: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
 #: data/civ1/buildings.ruleset:675
 msgid "Copernicus' Observatory"
-msgstr "Koperniko observatorija"
+msgstr "Observatorio de Koperniko"
 
 #: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
 #: data/civ1/buildings.ruleset:837
 #, no-c-format
 msgid "Boosts science production by 100% in the city where it is built."
 msgstr ""
-"Pakelia mokslo produkcijÄ… kiekviename mieste, kuriame yra pastatyta, 100%."
 
 #: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
 #: data/civ1/buildings.ruleset:695
 msgid "Cure For Cancer"
-msgstr "Vaistai nuo vėžio"
+msgstr "Kuracado de kancero"
 
 #: data/default/buildings.ruleset:1043
 msgid ""
 "This stunning technological achievement makes one unhappy citizen content in "
 "all your cities."
 msgstr ""
-"Stulbinantis technologinis pasiekimas vienÄ… nelaimingÄ… gyventojÄ… kiekviename "
-"mieste padaro patenkintu."
 
 #: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
 #: data/civ1/buildings.ruleset:715
 msgid "Darwin's Voyage"
-msgstr "Darvino kelionÄ—"
+msgstr "Vojaĝo de Darwin"
 
 #: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
 #: data/civ1/buildings.ruleset:729
@@ -17509,25 +17752,21 @@ msgid ""
 "species, which inspired greater confidence in science. Gives two immediate "
 "technology advances."
 msgstr ""
-"Čarlzo Darvino kelionė leido atrasti rūšių evoliucijos teoriją, kuri įkvėpė "
-"didesnį pasitikėjimą mokslu. Duoda du artimiausius technologinius laimėjimus."
 
 #: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
 msgid "Eiffel Tower"
-msgstr "Eifelio bokštas"
+msgstr "Eiffel-turo"
 
 #: data/default/buildings.ruleset:1087
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Your reputation and goodwill among other nations is recovered twice as fast."
 msgstr ""
-"Jūsų reputacija ir gera valia yra padidinama tarp kitų tautų, kol Jums "
-"priklauso šis stebuklas. Reputacija atgaunama dvigubai greičiau."
 
 #: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
 #: data/civ1/buildings.ruleset:736
 msgid "Great Library"
-msgstr "Didžioji biblioteka"
+msgstr "Granda Biblioteko"
 
 #: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
 #: data/civ1/buildings.ruleset:750
@@ -17535,22 +17774,20 @@ msgid ""
 "The civilization which builds the Great Library gets every advance that at "
 "least two other civilizations have achieved."
 msgstr ""
-"Civilizacija, kuri pastato Didžiąją biblioteką, gauna kiekvieną pasiekimą, "
-"kurį bent jau dvi kitos civilizacijos yra pasiekusios."
 
 #: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
 #: data/civ1/buildings.ruleset:756
 msgid "Great Wall"
-msgstr "Didžioji siena "
+msgstr "Murego"
 
 #: data/default/buildings.ruleset:1127
 msgid "Works as a City Wall in all your cities."
-msgstr "Veikia kaip miesto sienos kiekviename mieste."
+msgstr ""
 
 #: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
 #: data/civ1/buildings.ruleset:777
 msgid "Hanging Gardens"
-msgstr "Kabantys sodai"
+msgstr "Pendĝardenoj"
 
 #: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
 #: data/civ1/buildings.ruleset:791
@@ -17565,7 +17802,7 @@ msgstr ""
 #: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
 #: data/civ1/buildings.ruleset:800
 msgid "Hoover Dam"
-msgstr "Huverio užtvanka"
+msgstr "Hoover-digo"
 
 #: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
 msgid ""
@@ -17576,27 +17813,27 @@ msgstr ""
 #: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
 #: data/civ1/buildings.ruleset:822
 msgid "Isaac Newton's College"
-msgstr "Izaoko Niutono koledžas"
+msgstr "Universitato de Isaac Newton"
 
 #: data/default/buildings.ruleset:1194
 #, no-c-format
 msgid ""
 "Boosts science production by 100% in every city you control that has a "
 "University."
-msgstr "Pakelia mokslo produkcijÄ… kiekviename mieste su universitetu 100%."
+msgstr ""
 
 #: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
 #: data/civ1/buildings.ruleset:842
 msgid "J.S. Bach's Cathedral"
-msgstr "J.S. Bacho katedra"
+msgstr "Katedralo de J.S. Bach"
 
 #: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
 msgid "Makes two unhappy citizens content in every city."
-msgstr "Kiekviename mieste du nelaimingi gyventojai paverčiami patenkintais."
+msgstr ""
 
 #: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
 msgid "King Richard's Crusade"
-msgstr "Karaliaus Ričardo kryžiaus žygis"
+msgstr "Krucmilito de Rikardo la Leonkora"
 
 #: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
 msgid ""
@@ -17606,16 +17843,16 @@ msgstr ""
 
 #: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
 msgid "Leonardo's Workshop"
-msgstr "Leonardo dirbtuvÄ—"
+msgstr "Laboratorio de Leonardo"
 
 #: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
 msgid "Upgrades one obsolete unit per game turn."
-msgstr "Patobulina vieną seną dalinį per ėjimą."
+msgstr ""
 
 #: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
 #: data/civ1/buildings.ruleset:862
 msgid "Lighthouse"
-msgstr "Å vyturys"
+msgstr "Lumturo"
 
 #: data/default/buildings.ruleset:1273
 msgid ""
@@ -17627,7 +17864,7 @@ msgstr ""
 #: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
 #: data/civ1/buildings.ruleset:885
 msgid "Magellan's Expedition"
-msgstr "Magelano ekspedicija"
+msgstr "Ekspedicio de Magelano"
 
 #: data/default/buildings.ruleset:1295
 msgid "Gives all your sea units 2 additional movement points."
@@ -17636,20 +17873,20 @@ msgstr ""
 #: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
 #: data/civ1/buildings.ruleset:904
 msgid "Manhattan Project"
-msgstr "Manheteno projektas"
+msgstr "Projekto Manhattan"
 
 #: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
 msgid "Marco Polo's Embassy"
-msgstr "Marko Polo ambasada"
+msgstr "Ambasado de Marko Polo"
 
 #: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
 msgid "The player who owns it gets an embassy with all players."
-msgstr "Žaidėjas, kuris  turi ją, gauna ambasadą su visais žaidėjais."
+msgstr ""
 
 #: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
 #: data/civ1/buildings.ruleset:922
 msgid "Michelangelo's Chapel"
-msgstr "Siksto koplyčia"
+msgstr "Kapelo de Mikelanĝelo"
 
 #: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
 msgid ""
@@ -17663,18 +17900,16 @@ msgstr ""
 #: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
 #: data/civ1/buildings.ruleset:941
 msgid "Oracle"
-msgstr "Orakulas"
+msgstr "Orakolo"
 
 #: data/default/buildings.ruleset:1375
 msgid "Makes two of your unhappy citizens content in every city with a temple."
 msgstr ""
-"Kiekviename mieste su šventykla du nelaimingi gyventojai paverčiami "
-"patenkintais."
 
 #: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
 #: data/civ1/buildings.ruleset:960
 msgid "Pyramids"
-msgstr "PiramidÄ—s"
+msgstr "Piramidoj"
 
 #: data/default/buildings.ruleset:1394
 msgid ""
@@ -17686,27 +17921,25 @@ msgstr ""
 #: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
 #: data/civ1/buildings.ruleset:981
 msgid "SETI Program"
-msgstr "SETI programa"
+msgstr "SETI"
 
 #: data/default/buildings.ruleset:1415
 msgid "Boosts science production in each city with a Research Lab by 100%. "
 msgstr ""
-"Pakelia mokslo produkciją kiekviename mieste su tyrimų laboratorija 100%."
 
 #: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
 #: data/civ1/buildings.ruleset:1001
 msgid "Shakespeare's Theatre"
-msgstr "Å ekspyro teatras"
+msgstr "Teatraĵoj de Shakespeare"
 
 #: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
 #: data/civ1/buildings.ruleset:1015
 msgid "Makes all unhappy citizens content, in the city where it is located."
 msgstr ""
-"Visi nelaimingi gyventojai paverčiami patenkintais mieste, kuriame jis tovi."
 
 #: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
 msgid "Statue of Liberty"
-msgstr "LaisvÄ—s statula"
+msgstr "Statuo de la Libereco"
 
 #: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
 #: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
@@ -17715,12 +17948,10 @@ msgid ""
 "researched by your civilization, and without the transition period of "
 "Anarchy."
 msgstr ""
-"Be anarchijos periodo leidžia pasirinkti bet kurią vyriausybę, įskaitant ir "
-"tas, kurios dar nebuvo išrastos Jūsų civilizacijos."
 
 #: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
 msgid "Sun Tzu's War Academy"
-msgstr "Sun Tzu karo akademija"
+msgstr "Milit-Akademio de Sun Tzu"
 
 #: data/default/buildings.ruleset:1474
 msgid ""
@@ -17731,16 +17962,16 @@ msgstr ""
 #: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
 #: data/civ1/buildings.ruleset:1020
 msgid "United Nations"
-msgstr "JungtinÄ—s tautos"
+msgstr "Uniĝintaj Nacioj"
 
 #: data/default/buildings.ruleset:1495
 msgid "All your units regain two extra hitpoints per turn."
-msgstr "Visi Jūsų daliniai atgauna 2 papildomus gyvybės taškus per ėjimą."
+msgstr ""
 
 #: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
 #: data/civ1/buildings.ruleset:1046
 msgid "Women's Suffrage"
-msgstr "Moterų balsavimo teisė"
+msgstr "Voĉdonrajto por virinoj"
 
 #: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
 msgid ""
@@ -17751,7 +17982,7 @@ msgstr ""
 
 #: data/default/buildings.ruleset:1533
 msgid "Coinage"
-msgstr "Monetų kalimas"
+msgstr "Stampado de monero"
 
 #: data/default/buildings.ruleset:1554
 msgid ""
@@ -17762,47 +17993,47 @@ msgstr ""
 
 #: data/default/nations.ruleset:20
 msgid "?nationgroup:Ancient"
-msgstr "?nationgroup:SenovinÄ—s"
+msgstr "?nationgroup:Antikva"
 
 #: data/default/nations.ruleset:23
 msgid "?nationgroup:Medieval"
-msgstr "?nationgroup:Viduramžių"
+msgstr "?nationgroup:Mezepoka"
 
 #: data/default/nations.ruleset:26
 msgid "?nationgroup:Modern"
-msgstr "?nationgroup:Å iuolaikinÄ—s"
+msgstr "?nationgroup:Moderna"
 
 #: data/default/nations.ruleset:29
 msgid "?nationgroup:African"
-msgstr "?nationgroup:Afrikiečiai"
+msgstr "?nationgroup:Afrika"
 
 #: data/default/nations.ruleset:32
 msgid "?nationgroup:American"
-msgstr "?nationgroup:Amerikiečiai"
+msgstr "?nationgroup:Amerika"
 
 #: data/default/nations.ruleset:35
 msgid "?nationgroup:Asian"
-msgstr "?nationgroup:Azijiečiai"
+msgstr "?nationgroup:Azia"
 
 #: data/default/nations.ruleset:38
 msgid "?nationgroup:European"
-msgstr "?nationgroup:Europiečiai"
+msgstr "?nationgroup:EÅ­ropa"
 
 #: data/default/nations.ruleset:41
 msgid "?nationgroup:Oceanian"
-msgstr "?nationgroup:Okeanijos"
+msgstr "?nationgroup:Oceania"
 
 #: data/default/nations.ruleset:44
 msgid "?nationgroup:Fictional"
-msgstr "?nationgroup:FantastinÄ—s"
+msgstr "?nationgroup:Fantazia"
 
 #: data/civ2/buildings.ruleset:248
 msgid ""
 "Entertains the citizens of a city, making 3 unhappy citizens content.  (Four "
 "after the discovery of Electronics.)"
 msgstr ""
-"Linksmina miestiečius padarydama 3 nelaimingus žmones patenkintais (4 po "
-"elektronikos atradimo)."
+"Äœi amuzas la civitanoj de unu urbo kaj igas kontentaj tri malkontentaj "
+"civitanoj (kaj kvar post la Elektroniko)."
 
 #: data/civ2/buildings.ruleset:268
 msgid ""
@@ -17810,9 +18041,6 @@ msgid ""
 "Courthouse makes 1 unhappy citizen content.  Also halves the effective "
 "distance to the capital, for the purpose of calculating revolt cost."
 msgstr ""
-"Sumažina korupciją ir atliekas mieste 50%. Esant demokratijai, teismo rūmai "
-"padaro vieną nelaimingą gyventoją patenkintu. Taip pat 2 kartus sumažina "
-"tikrąjį atsumą iki sostinės skaičiuojant revoliucijos sukėlimo kainą."
 
 #: data/civ2/buildings.ruleset:357 data/civ1/buildings.ruleset:283
 msgid ""
@@ -17830,7 +18058,7 @@ msgstr ""
 #: data/civ2/buildings.ruleset:388 data/civ1/buildings.ruleset:312
 #, no-c-format
 msgid "Increases the science output in a city by 50%."
-msgstr "Pakelia mokslo produkcijÄ… mieste 50%."
+msgstr ""
 
 #: data/civ2/buildings.ruleset:471 data/civ1/buildings.ruleset:395
 msgid ""
@@ -17873,13 +18101,10 @@ msgid ""
 "a city by 100%. Together with a Library and a University, a Research Lab "
 "increases the science production of a city by 150%."
 msgstr ""
-"Kartu su biblioteka, tyrimų laboratorija mieste mokslo gamybą padidina 100%. "
-"Kartu su biblioteka ir universitetu, tyrimų laboratorija mieste mokslo "
-"gamybÄ… padidina 150%."
 
 #: data/civ2/buildings.ruleset:718
 msgid "Solar Plant"
-msgstr "SaulÄ—s elektrinÄ—"
+msgstr "Suncentralo"
 
 #: data/civ2/buildings.ruleset:734
 #, no-c-format
@@ -17898,7 +18123,7 @@ msgstr ""
 msgid ""
 "Together with a Library, a University increases the science production of a "
 "city by 100%."
-msgstr "Kartu su biblioteka, universitetas padidina miesto mokslo gamybÄ… 100%."
+msgstr ""
 
 #: data/civ2/buildings.ruleset:973
 msgid ""
@@ -17910,28 +18135,23 @@ msgstr ""
 #, no-c-format
 msgid "Boosts science production by 50% in the city where it is built."
 msgstr ""
-"Pakelia mokslo produkcijÄ… kiekviename mieste, kuriame yra pastatyta, 50%."
 
 #: data/civ2/buildings.ruleset:1033 data/civ1/buildings.ruleset:709
 msgid ""
 "This stunning technological achievement makes one unhappy citizen content in "
 "all cities."
 msgstr ""
-"Šis pritrenkiantis technologinis išradimas padaro vieną nelaimingą pilietį "
-"laimingu visuose miestuose."
 
 #: data/civ2/buildings.ruleset:1075
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Your reputation and goodwill among other nations is recovered four times as "
 "fast."
 msgstr ""
-"Jūsų reputacija ir gera valia yra padidinama tarp kitų tautų, kol Jums "
-"priklauso šis stebuklas. Reputacija atgaunama dvigubai greičiau."
 
 #: data/civ2/buildings.ruleset:1115 data/civ1/buildings.ruleset:770
 msgid "Works as a City Wall in all cities."
-msgstr "Veikia kaip miesto sienų turėjimas kiekviename mieste."
+msgstr ""
 
 #: data/civ2/buildings.ruleset:1257 data/civ1/buildings.ruleset:876
 msgid ""
@@ -17946,11 +18166,11 @@ msgstr ""
 
 #: data/civ2/buildings.ruleset:1358 data/civ1/buildings.ruleset:955
 msgid "Doubles the effect of Temples, in all cities."
-msgstr "Padvigubina šventyklų poveikį visuose miestuose."
+msgstr ""
 
 #: data/civ2/buildings.ruleset:1377
 msgid "Counts as having a Granary in every city."
-msgstr "Kiekvienas miestas gauna svirno teikiamas funkcijas."
+msgstr ""
 
 #: data/civ2/buildings.ruleset:1396
 msgid ""
@@ -17963,14 +18183,16 @@ msgid ""
 "All your new ground units become veterans (for all cities).  The chance of a "
 "unit becoming a veteran after a battle increases from 50% to 100%."
 msgstr ""
+"Ĉiuj novaj teraj unuoj iĝas veteranaj (en ĉiu urbo). La ebleco de la unuo "
+"iĝi veterana pliiĝas de 50% ĝis 100%."
 
 #: data/civ2/buildings.ruleset:1477
 msgid "Units regain two extra hitpoints per turn."
-msgstr "Daliniai atgauna 2 papildomus gyvybės taškus per ėjimą."
+msgstr "Unuoj ree gajnas du pluajn viv-punktoj por vico."
 
 #: data/civ2/buildings.ruleset:1512
 msgid "Capitalization"
-msgstr "Kapitalizacija"
+msgstr "Kapitaligo"
 
 #: data/civ2/buildings.ruleset:1525
 msgid ""
@@ -17981,7 +18203,7 @@ msgstr ""
 
 #: data/civ1/buildings.ruleset:42
 msgid "Allows a city to grow larger than size 10."
-msgstr "Leidžia miestui išaugti didesniam kaip 10."
+msgstr "Ĝi ebligas urbon plu-grandiĝis pli ol la grando je 10."
 
 #: data/civ1/buildings.ruleset:83 data/civ1/buildings.ruleset:106
 #: data/civ1/buildings.ruleset:129
@@ -17997,10 +18219,9 @@ msgid ""
 "A Cathedral makes 4 unhappy citizens content in a city, making it easier to "
 "maintain order in that city."
 msgstr ""
-"Katedra padaro 4 nelaimingus miestiečius patenkintais, taip leisdama "
-"lengviau palaikyti tvarkÄ…."
+"Katedralo igas kontentaj kvar malkontentaj civitanoj en unu urbo kaj igas "
+"pli facila la ordo-tenadon en tiu urbo."
 
-# ne sraigtasparnius  ?
 #: data/civ1/buildings.ruleset:173
 msgid ""
 "City Walls make it easier to defend a city.  They triple the defence "
@@ -18009,15 +18230,12 @@ msgid ""
 "as Artillery.  City Walls also prevent the loss of population which occurs "
 "when a defending unit is destroyed by a land unit."
 msgstr ""
-"Miesto sienos palengvina miesto gynybą. Jos patrigubina mieste esančių "
-"dalinių jėgas prieš sausumos dalinius ir sraigtasparnius. Sienos "
-"neveiksmingos prieš kitus oro desanto dalinius ir artileriją. Miesto sienos "
-"taip pat apsaugo nuo gyventojų netekimo, kuris įvyksta, kai besiginantis "
-"dalinys yra sunaikinamas sausumos dalinio."
 
 #: data/civ1/buildings.ruleset:196
 msgid "Entertains the citizens of a city, making 3 unhappy citizens content."
-msgstr "Linksmina gyventojus padarydama 3 nelaimingus žmones patenkintais."
+msgstr ""
+"Äœi amuzas la civitanoj de unu urbo kaj igas kontentaj tri malkontentaj "
+"civitanoj."
 
 #: data/civ1/buildings.ruleset:215
 msgid ""
@@ -18025,6 +18243,9 @@ msgid ""
 "makes 1 unhappy citizen content.  Also halves the effective distance to the "
 "capital, for the purpose of calculating revolt cost."
 msgstr ""
+"Äœi malpliigas la konstruadon de urbo je 50%. Sub Demokratio, tribunalo igis "
+"kontenta unu malkontentan civitanon. Krome ĝi duonigas la realan distancon "
+"de la ĉefurbo por kalkuli la koston por inciti al ribelo."
 
 #: data/civ1/buildings.ruleset:648
 msgid ""
@@ -18032,6 +18253,9 @@ msgid ""
 "all players to start building spaceship parts (assuming they have researched "
 "the necessary technologies)."
 msgstr ""
+"Ĉiu urbo en la mapo igas videbla al la ludanto kiu havas ĝin. Ĝi ankaŭ "
+"ebligas ĉiuj ludantoj konstrui partojn de kosmoŝipo (se ili havas la "
+"necesajn teĥnologiojn)."
 
 #: data/civ1/buildings.ruleset:814
 msgid ""
@@ -18039,25 +18263,30 @@ msgid ""
 "the wonder is built.  (This reduces pollution and increases the effects of "
 "Factories and Mfg. Plants.)"
 msgstr ""
+"Ĝi efikas kiel se vi havas hidroelektran centralon en ĉiu urbo en la sama "
+"kontinento kie estas la mirindaĵo. (Tiu ĉi malpliigas poluadon kaj pliigas "
+"efikojn de fabrikoj kaj manufakturoj.)"
 
 #: data/civ1/buildings.ruleset:856
 msgid ""
 "Makes two unhappy citizens content in every city of yours on the same "
 "continent where the wonder is built."
 msgstr ""
+"Ĝi igis kontentaj du malkontentaj civitanojn en ĉiu urbo en la sama "
+"kontinento kie la Mirindaĵo estis konstruita."
 
 #: data/civ1/buildings.ruleset:899
 msgid "Gives all sea units 1 additional movement point."
-msgstr ""
+msgstr "Ĝi donas al ĉiu mara unuo du pluajn movojn."
 
 #: data/civ1/buildings.ruleset:936
 msgid "Double effects of Cathedrals, in all cities."
-msgstr "Padvigubina katedrų poveikį visuose miestuose."
+msgstr "Ĝi duobligas la efikon de Katedraloj, en ĉiu urbo"
 
 #: data/civ1/buildings.ruleset:996
 #, no-c-format
 msgid "Boosts science production in each city by 50%."
-msgstr "Paspartina tyrimus kiekviename mieste 50%."
+msgstr "Ĝi pliigas la sciencan produktadon je 50% en ĉiu urbo."
 
 #: data/civ1/buildings.ruleset:1060
 msgid ""
@@ -18068,82 +18297,82 @@ msgstr ""
 
 #: data/default/cities.ruleset:29 data/civ2/cities.ruleset:29
 msgid "elvis"
-msgstr "linksmintojas"
+msgstr "verviganto"
 
 #: data/default/cities.ruleset:30 data/civ2/cities.ruleset:30
 msgid "?Elvis:E"
-msgstr ""
+msgstr "?Elvis:V"
 
 #: data/default/cities.ruleset:37 data/civ2/cities.ruleset:37
 msgid "scientist"
-msgstr "mokslininkas"
+msgstr "sciencisto"
 
 #: data/default/cities.ruleset:38 data/civ2/cities.ruleset:38
 msgid "?Scientist:S"
-msgstr ""
+msgstr "?Scientist:S"
 
 #: data/default/cities.ruleset:45 data/civ2/cities.ruleset:45
 msgid "taxman"
-msgstr "mokesčių rinkėjas"
+msgstr "impostisto"
 
 #: data/default/cities.ruleset:46 data/civ2/cities.ruleset:46
 msgid "?Taxman:T"
-msgstr ""
+msgstr "?Taxman:I"
 
 #: data/default/cities.ruleset:74 data/civ2/cities.ruleset:74
 msgid "?citystyle:European"
-msgstr "?citystyle:Europinis"
+msgstr "?citystyle:EÅ­ropa"
 
 #: data/default/cities.ruleset:83 data/civ2/cities.ruleset:83
 msgid "?citystyle:Classical"
-msgstr "?citystyle:Klasikinis"
+msgstr "?citystyle:Klasika"
 
 #: data/default/cities.ruleset:92 data/civ2/cities.ruleset:92
 msgid "?citystyle:Tropical"
-msgstr "?citystyle:Tropinis"
+msgstr "?citystyle:Tropika"
 
 #: data/default/cities.ruleset:101 data/civ2/cities.ruleset:101
 msgid "?citystyle:Asian"
-msgstr "?citystyle:Azijos"
+msgstr "?citystyle:Azia"
 
 #: data/default/cities.ruleset:110 data/civ2/cities.ruleset:110
 msgid "?citystyle:Babylonian"
-msgstr "?citystyle:Babilono"
+msgstr "?citystyle:Babilona"
 
 #: data/default/cities.ruleset:119 data/civ2/cities.ruleset:119
 msgid "?citystyle:Celtic"
-msgstr "?citystyle:Keltiškas"
+msgstr "?citystyle:Kelta"
 
 #: data/default/cities.ruleset:128 data/civ2/cities.ruleset:139
 msgid "?citystyle:Industrial"
-msgstr "?citystyle:Pramoninis"
+msgstr "?citystyle:Industria"
 
 #: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
 msgid "?citystyle:Modern"
-msgstr "?citystyle:Modernus"
+msgstr "?citystyle:Moderna"
 
 #: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
 msgid "?citystyle:PostModern"
-msgstr "?citystyle:Post Modernas"
+msgstr "?citystyle:Postmoderna"
 
 #: data/civ2/cities.ruleset:128
 msgid "?citystyle:Renaissance"
-msgstr "?citystyle:Renesansas"
+msgstr "?citystyle:Renesanca"
 
 #: data/default/governments.ruleset:51 data/civ2/governments.ruleset:48
 #: data/civ1/governments.ruleset:50
 msgid "Anarchy"
-msgstr "Anarchija"
+msgstr "Anarĥio"
 
 #: data/default/governments.ruleset:56 data/civ2/governments.ruleset:53
 #: data/civ1/governments.ruleset:55 data/nation/roman.ruleset:41
 msgid "Usurper"
-msgstr "Uzurpatorius"
+msgstr "Uzurpatoro"
 
 #: data/default/governments.ruleset:57 data/civ2/governments.ruleset:54
 #: data/civ1/governments.ruleset:56
 msgid "?female:Usurper"
-msgstr "?female:UzurpatorÄ—"
+msgstr "?female:Uzurpatorino"
 
 #: data/default/governments.ruleset:59 data/civ1/governments.ruleset:58
 msgid ""
@@ -18158,7 +18387,7 @@ msgstr ""
 #: data/default/governments.ruleset:72 data/civ2/governments.ruleset:69
 #: data/civ1/governments.ruleset:71
 msgid "Despotism"
-msgstr "Despotizmas"
+msgstr "Despotismo"
 
 #: data/default/governments.ruleset:78 data/civ2/governments.ruleset:75
 #: data/civ1/governments.ruleset:77 data/nation/iroquois.ruleset:26
@@ -18166,12 +18395,12 @@ msgstr "Despotizmas"
 #: data/nation/sioux.ruleset:28 data/nation/swazi.ruleset:22
 #: data/nation/zulu.ruleset:38
 msgid "Chief"
-msgstr "Vadas"
+msgstr "Ĉefo"
 
 #: data/default/governments.ruleset:79 data/civ2/governments.ruleset:76
 #: data/civ1/governments.ruleset:78
 msgid "?female:Chief"
-msgstr "?female:VadÄ—"
+msgstr "?female:Ĉefino"
 
 #: data/default/governments.ruleset:81 data/civ1/governments.ruleset:80
 msgid ""
@@ -18185,7 +18414,7 @@ msgstr ""
 #: data/civ1/governments.ruleset:91 data/default/techs.ruleset:481
 #: data/civ2/techs.ruleset:468 data/civ1/techs.ruleset:466
 msgid "Monarchy"
-msgstr "Monarchija"
+msgstr "Monarkio"
 
 #: data/default/governments.ruleset:100 data/civ2/governments.ruleset:97
 #: data/civ1/governments.ruleset:99 data/nation/bosnia.ruleset:27
@@ -18193,7 +18422,7 @@ msgstr "Monarchija"
 #: data/nation/polish.ruleset:28 data/nation/serbian.ruleset:37
 #: data/nation/spanish.ruleset:30
 msgid "King"
-msgstr "Karalius"
+msgstr "Reĝo"
 
 #: data/default/governments.ruleset:101 data/civ2/governments.ruleset:98
 #: data/civ1/governments.ruleset:100 data/nation/bosnia.ruleset:27
@@ -18201,7 +18430,7 @@ msgstr "Karalius"
 #: data/nation/polish.ruleset:28 data/nation/serbian.ruleset:37
 #: data/nation/spanish.ruleset:30
 msgid "Queen"
-msgstr "KaralienÄ—"
+msgstr "Reĝino"
 
 #: data/default/governments.ruleset:103 data/civ1/governments.ruleset:102
 msgid ""
@@ -18215,17 +18444,17 @@ msgstr ""
 #: data/civ1/governments.ruleset:113 data/default/techs.ruleset:175
 #: data/civ2/techs.ruleset:162 data/civ1/techs.ruleset:162
 msgid "Communism"
-msgstr "Komunizmas"
+msgstr "Komunismo"
 
 #: data/default/governments.ruleset:121 data/civ2/governments.ruleset:118
 #: data/civ1/governments.ruleset:120 data/nation/soviet.ruleset:26
 msgid "Comrade"
-msgstr "Draugas"
+msgstr "Kamarado"
 
 #: data/default/governments.ruleset:122 data/civ2/governments.ruleset:119
 #: data/civ1/governments.ruleset:121
 msgid "?female:Comrade"
-msgstr "DraugÄ—"
+msgstr "?female:Kamaradino"
 
 #: data/default/governments.ruleset:124 data/civ1/governments.ruleset:123
 msgid ""
@@ -18236,27 +18465,21 @@ msgid ""
 "Under Communism, corruption does not vary by distance from the capital; all "
 "cities (including the capital) have a modest amount of corruption."
 msgstr ""
-"Komunistinė vyriausybė yra paremta idealu, kad visi žmonės yra lygūs. Visos "
-"prekės yra valstybės nuosavybė, o ne privačių piliečių. Komunizmas sukuria "
-"balansÄ… tarp karinio ir komercinio vyriausybÄ—s tipo. \n"
-"\n"
-"Esant komunizmui, korupcija nesikeičia priklausomai nuo atstumo iki "
-"sostinės; visi miestai (tarp jų ir sostinė) turi vidutinį korupcijos lygį."
 
 #: data/default/governments.ruleset:138 data/civ2/governments.ruleset:163
 #: data/civ1/governments.ruleset:137
 msgid "Republic"
-msgstr "Respublika"
+msgstr "Respubliko"
 
 #: data/default/governments.ruleset:145 data/civ2/governments.ruleset:170
 #: data/civ1/governments.ruleset:144
 msgid "Consul"
-msgstr "Konsulas"
+msgstr "Konsulo"
 
 #: data/default/governments.ruleset:146 data/civ2/governments.ruleset:171
 #: data/civ1/governments.ruleset:145
 msgid "?female:Consul"
-msgstr "?female:KonsulÄ—"
+msgstr "?female:Konsulo"
 
 #: data/default/governments.ruleset:148 data/civ2/governments.ruleset:173
 #: data/civ1/governments.ruleset:147
@@ -18272,7 +18495,7 @@ msgstr ""
 #: data/civ1/governments.ruleset:159 data/default/techs.ruleset:216
 #: data/civ2/techs.ruleset:203 data/civ1/techs.ruleset:202
 msgid "Democracy"
-msgstr "Demokratija"
+msgstr "Demokratio"
 
 #: data/default/governments.ruleset:167 data/civ2/governments.ruleset:192
 #: data/civ1/governments.ruleset:166 data/nation/assyrian.ruleset:22
@@ -18288,12 +18511,12 @@ msgstr "Demokratija"
 #: data/nation/slovenian.ruleset:19 data/nation/slovenian.ruleset:20
 #: data/nation/slovakian.ruleset:27
 msgid "President"
-msgstr "Prezidentas"
+msgstr "Prezidanto"
 
 #: data/default/governments.ruleset:168 data/civ2/governments.ruleset:193
 #: data/civ1/governments.ruleset:167
 msgid "?female:President"
-msgstr "?female:PrezidentÄ—"
+msgstr "?female:Prezidantino"
 
 #: data/default/governments.ruleset:170
 msgid ""
@@ -18330,11 +18553,6 @@ msgid ""
 "Monarchy suffers the same small amount of corruption and waste that the "
 "Republic does."
 msgstr ""
-"Esant monarchijai, karalius arba karalienė valdo kaip tradicinis Jūsų "
-"vyriausybÄ—s valdovas.\n"
-"\n"
-"Monarchija kenčia nuo tokio paties mažo korupcijos lygio ir atliekų kaip ir "
-"respublika."
 
 #: data/civ2/governments.ruleset:121
 msgid ""
@@ -18350,15 +18568,15 @@ msgstr ""
 #: data/civ2/governments.ruleset:135 data/default/techs.ruleset:297
 #: data/civ2/techs.ruleset:284 data/civ1/techs.ruleset:282
 msgid "Fundamentalism"
-msgstr "Fundamentalizmas"
+msgstr "Fundamentismo"
 
 #: data/civ2/governments.ruleset:142
 msgid "High Priest"
-msgstr "Aukštasis žynys"
+msgstr "Ĉefsacerdoto"
 
 #: data/civ2/governments.ruleset:143
 msgid "High Priestess"
-msgstr "Aukštoji žynė"
+msgstr "Ĉefsacerdotino"
 
 #: data/civ2/governments.ruleset:145
 msgid ""
@@ -18403,429 +18621,429 @@ msgstr ""
 #: data/default/techs.ruleset:55 data/civ2/techs.ruleset:42
 #: data/civ1/techs.ruleset:42
 msgid "Advanced Flight"
-msgstr "Pažangi skrydžio technika"
+msgstr "Avana flugo"
 
 #: data/default/techs.ruleset:63 data/civ2/techs.ruleset:50
 #: data/civ1/techs.ruleset:50
 msgid "Alphabet"
-msgstr "AbÄ—cÄ—lÄ—"
+msgstr "Alfabeto"
 
 #: data/default/techs.ruleset:71 data/civ2/techs.ruleset:58
 #: data/civ1/techs.ruleset:58
 msgid "Amphibious Warfare"
-msgstr "Desantinis karas"
+msgstr "Amfibia milito"
 
 #: data/default/techs.ruleset:79 data/civ2/techs.ruleset:66
 #: data/civ1/techs.ruleset:66
 msgid "Astronomy"
-msgstr "Astronomija"
+msgstr "Astronomio"
 
 #: data/default/techs.ruleset:87 data/civ2/techs.ruleset:74
 #: data/civ1/techs.ruleset:74
 msgid "Atomic Theory"
-msgstr "AtominÄ— teorija"
+msgstr "Atomteorio"
 
 #: data/default/techs.ruleset:95 data/civ2/techs.ruleset:82
 #: data/civ1/techs.ruleset:82
 msgid "Automobile"
-msgstr "Automobilis"
+msgstr "AÅ­tomobilo"
 
 #: data/default/techs.ruleset:103 data/civ2/techs.ruleset:90
 #: data/civ1/techs.ruleset:90
 msgid "Banking"
-msgstr "BankininkystÄ—"
+msgstr "Banka sistemo"
 
 #: data/default/techs.ruleset:111 data/civ2/techs.ruleset:98
 #: data/civ1/techs.ruleset:98
 msgid "Bridge Building"
-msgstr "Tiltų statymas"
+msgstr "Pontoj"
 
 #: data/default/techs.ruleset:119 data/civ2/techs.ruleset:106
 #: data/civ1/techs.ruleset:106
 msgid "Bronze Working"
-msgstr "Bronzos gavimas"
+msgstr "Prilaborado de bronzo"
 
 #: data/default/techs.ruleset:127 data/civ2/techs.ruleset:114
 #: data/civ1/techs.ruleset:114
 msgid "Ceremonial Burial"
-msgstr "ApeiginÄ—s laidotuvÄ—s"
+msgstr "Ceremonia sepultado"
 
 #: data/default/techs.ruleset:135 data/civ2/techs.ruleset:122
 #: data/civ1/techs.ruleset:122
 msgid "Chemistry"
-msgstr "Chemija"
+msgstr "Kemio"
 
 #: data/default/techs.ruleset:143 data/civ2/techs.ruleset:130
 #: data/civ1/techs.ruleset:130
 msgid "Chivalry"
-msgstr "Riteriai"
+msgstr "Kavalira kodo"
 
 #: data/default/techs.ruleset:151 data/civ2/techs.ruleset:138
 #: data/civ1/techs.ruleset:138
 msgid "Code of Laws"
-msgstr "Įstatymai"
+msgstr "Leĝa kodo"
 
 #: data/default/techs.ruleset:159 data/civ2/techs.ruleset:146
 #: data/civ1/techs.ruleset:146
 msgid "Combined Arms"
-msgstr "Karinių pajėgų veiksmų suderinimas"
+msgstr "Kombinitaj armiloj"
 
 #: data/default/techs.ruleset:167 data/civ2/techs.ruleset:154
 #: data/civ1/techs.ruleset:154
 msgid "Combustion"
-msgstr "Vidaus degimas"
+msgstr "Brulado"
 
 #: data/default/techs.ruleset:181 data/civ2/techs.ruleset:168
 msgid "Reduces the effect of Cathedrals."
-msgstr "Sumažina katedrų poveikį."
+msgstr "Äœi malpliigas la efikon de la Katedraloj."
 
 #: data/default/techs.ruleset:184 data/civ2/techs.ruleset:171
 #: data/civ1/techs.ruleset:170
 msgid "Computers"
-msgstr "Kompiuteriai"
+msgstr "Komputiloj"
 
 #: data/default/techs.ruleset:192 data/civ2/techs.ruleset:179
 #: data/civ1/techs.ruleset:178
 msgid "Conscription"
-msgstr "KarinÄ— prievolÄ—"
+msgstr "Rekrutado"
 
 #: data/default/techs.ruleset:200 data/civ2/techs.ruleset:187
 #: data/civ1/techs.ruleset:186
 msgid "Construction"
-msgstr "Statyba"
+msgstr "Konstruo"
 
 #: data/default/techs.ruleset:208 data/civ2/techs.ruleset:195
 #: data/civ1/techs.ruleset:194
 msgid "Currency"
-msgstr "Valiuta"
+msgstr "Valuto"
 
 #: data/default/techs.ruleset:232 data/civ2/techs.ruleset:219
 #: data/civ1/techs.ruleset:218
 msgid "Electricity"
-msgstr "Elektra"
+msgstr "Elektro"
 
 #: data/default/techs.ruleset:238 data/civ2/techs.ruleset:225
 msgid "Improves the effect of Colosseums."
-msgstr "Padidina koliziejų poveikį."
+msgstr "Äœi pliigas la efikon de la Amfiteatroj"
 
 #: data/default/techs.ruleset:241 data/civ2/techs.ruleset:228
 #: data/civ1/techs.ruleset:226
 msgid "Electronics"
-msgstr "Elektronika"
+msgstr "Elektroniko"
 
 #: data/default/techs.ruleset:249 data/civ2/techs.ruleset:236
 #: data/civ1/techs.ruleset:234
 msgid "Engineering"
-msgstr "Inžinerija"
+msgstr "Inĝenierio"
 
 #: data/default/techs.ruleset:257 data/civ2/techs.ruleset:244
 #: data/civ1/techs.ruleset:242
 msgid "Environmentalism"
-msgstr "Aplinkosauga"
+msgstr "Mediismo"
 
 #: data/default/techs.ruleset:265 data/civ2/techs.ruleset:252
 #: data/civ1/techs.ruleset:250
 msgid "Espionage"
-msgstr "Å nipinÄ—jimas"
+msgstr "Spionado"
 
 #: data/default/techs.ruleset:273 data/civ2/techs.ruleset:260
 #: data/civ1/techs.ruleset:258
 msgid "Explosives"
-msgstr "Sprogmenys"
+msgstr "Eksplodaĵoj"
 
 #: data/default/techs.ruleset:281 data/civ2/techs.ruleset:268
 #: data/civ1/techs.ruleset:266
 msgid "Feudalism"
-msgstr "Feodalizmas"
+msgstr "FeÅ­dismo"
 
 #: data/default/techs.ruleset:289 data/civ2/techs.ruleset:276
 #: data/civ1/techs.ruleset:274
 msgid "Flight"
-msgstr "Skrydis"
+msgstr "Flugo"
 
 #: data/default/techs.ruleset:305 data/civ2/techs.ruleset:292
 #: data/civ1/techs.ruleset:290
 msgid "Fusion Power"
-msgstr "TermobranduolinÄ— energija"
+msgstr "Nuklea fuzio"
 
 #: data/default/techs.ruleset:313 data/civ2/techs.ruleset:300
 #: data/civ1/techs.ruleset:298
 msgid "Genetic Engineering"
-msgstr "Genetinė inžinierija"
+msgstr "Genetika inĝenierio"
 
 #: data/default/techs.ruleset:321 data/civ2/techs.ruleset:308
 #: data/civ1/techs.ruleset:306
 msgid "Guerilla Warfare"
-msgstr "Partizaninis karas"
+msgstr "Gerilo"
 
 #: data/default/techs.ruleset:329 data/civ2/techs.ruleset:316
 #: data/civ1/techs.ruleset:314
 msgid "Gunpowder"
-msgstr "Parakas"
+msgstr "Pulvo"
 
 #: data/default/techs.ruleset:337 data/civ2/techs.ruleset:324
 #: data/civ1/techs.ruleset:322
 msgid "Horseback Riding"
-msgstr "Jojimas"
+msgstr "Rajdo"
 
 #: data/default/techs.ruleset:345 data/civ2/techs.ruleset:332
 #: data/civ1/techs.ruleset:330
 msgid "Industrialization"
-msgstr "Industrializacija"
+msgstr "Industriiĝo"
 
 #: data/default/techs.ruleset:353 data/civ2/techs.ruleset:340
 #: data/civ1/techs.ruleset:338
 msgid "Invention"
-msgstr "IÅ¡radimai"
+msgstr "Eltrovo"
 
 #: data/default/techs.ruleset:361 data/civ2/techs.ruleset:348
 #: data/civ1/techs.ruleset:346
 msgid "Iron Working"
-msgstr "Geležies gavimas"
+msgstr "Siderurgia"
 
 #: data/default/techs.ruleset:369 data/civ2/techs.ruleset:356
 #: data/civ1/techs.ruleset:354
 msgid "Labor Union"
-msgstr "Visuomeninis darbas"
+msgstr "Sindikato"
 
 #: data/default/techs.ruleset:377 data/civ2/techs.ruleset:364
 #: data/civ1/techs.ruleset:362
 msgid "Laser"
-msgstr "Lazeris"
+msgstr "Lasero"
 
 #: data/default/techs.ruleset:385 data/civ2/techs.ruleset:372
 #: data/civ1/techs.ruleset:370
 msgid "Leadership"
-msgstr "Vadovavimas"
+msgstr "Gvidado"
 
 #: data/default/techs.ruleset:401 data/civ2/techs.ruleset:388
 #: data/civ1/techs.ruleset:386
 msgid "Machine Tools"
-msgstr "StaklÄ—s"
+msgstr "Meĥanizo"
 
 #: data/default/techs.ruleset:409 data/civ2/techs.ruleset:396
 #: data/civ1/techs.ruleset:394
 msgid "Magnetism"
-msgstr "Magnetizmas"
+msgstr "Magnetismo"
 
 #: data/default/techs.ruleset:417 data/civ2/techs.ruleset:404
 #: data/civ1/techs.ruleset:402
 msgid "Map Making"
-msgstr "Žemėlapių gamyba"
+msgstr "Kartografio"
 
 #: data/default/techs.ruleset:425 data/civ2/techs.ruleset:412
 #: data/civ1/techs.ruleset:410
 msgid "Masonry"
-msgstr "MÅ«rininkystÄ—"
+msgstr "Masono"
 
 #: data/default/techs.ruleset:433 data/civ2/techs.ruleset:420
 #: data/civ1/techs.ruleset:418
 msgid "Mass Production"
-msgstr "MasinÄ— gamyba"
+msgstr "Industria produktado"
 
 #: data/default/techs.ruleset:441 data/civ2/techs.ruleset:428
 #: data/civ1/techs.ruleset:426
 msgid "Mathematics"
-msgstr "Matematika"
+msgstr "Matematiko"
 
 #: data/default/techs.ruleset:449 data/civ2/techs.ruleset:436
 #: data/civ1/techs.ruleset:434
 msgid "Medicine"
-msgstr "Medicina"
+msgstr "Medicino"
 
 #: data/default/techs.ruleset:457 data/civ2/techs.ruleset:444
 #: data/civ1/techs.ruleset:442
 msgid "Metallurgy"
-msgstr "Metalurgija"
+msgstr "Metalurgio"
 
 #: data/default/techs.ruleset:465 data/civ2/techs.ruleset:452
 #: data/civ1/techs.ruleset:450
 msgid "Miniaturization"
-msgstr "Mažinimas"
+msgstr "Miniaturigo"
 
 #: data/default/techs.ruleset:473 data/civ2/techs.ruleset:460
 #: data/civ1/techs.ruleset:458
 msgid "Mobile Warfare"
-msgstr "Mobilus karas"
+msgstr "Mov-milito"
 
 #: data/default/techs.ruleset:489 data/civ2/techs.ruleset:476
 #: data/civ1/techs.ruleset:474
 msgid "Monotheism"
-msgstr "Monoteizmas"
+msgstr "Monoteismo"
 
 #: data/default/techs.ruleset:497 data/civ2/techs.ruleset:484
 #: data/civ1/techs.ruleset:482
 msgid "Mysticism"
-msgstr "Misticizmas"
+msgstr "Mistikismo"
 
 #: data/default/techs.ruleset:503 data/civ2/techs.ruleset:490
 #: data/civ1/techs.ruleset:488
 msgid "Improves the effect of Temples."
-msgstr "Padidina šventyklų poveikį."
+msgstr "Äœi pliigas la efikon de la Temploj."
 
 #: data/default/techs.ruleset:506 data/civ2/techs.ruleset:493
 #: data/civ1/techs.ruleset:491
 msgid "Navigation"
-msgstr "Navigacija"
+msgstr "Navigado"
 
 #: data/default/techs.ruleset:514 data/civ2/techs.ruleset:501
 #: data/civ1/techs.ruleset:499
 msgid "Nuclear Fission"
-msgstr "Branduolių skilimas"
+msgstr "Nuklea fisio"
 
 #: data/default/techs.ruleset:522 data/civ2/techs.ruleset:509
 #: data/civ1/techs.ruleset:507
 msgid "Nuclear Power"
-msgstr "BranduolinÄ— energija"
+msgstr "Atomenergio"
 
 #: data/default/techs.ruleset:528 data/civ2/techs.ruleset:515
 msgid "Gives sea units one extra move."
-msgstr "Duoda jūros daliniams papildomą ėjimą."
+msgstr "Äœi donas al maraj unuoj unu pluan movon."
 
 #: data/default/techs.ruleset:531 data/civ2/techs.ruleset:518
 #: data/civ1/techs.ruleset:515
 msgid "Philosophy"
-msgstr "Filosofija"
+msgstr "Filozofio"
 
 #: data/default/techs.ruleset:535
 msgid ""
 "Great philosophers from all the world join your civilization: you get an "
 "immediate advance."
 msgstr ""
-"Didieji filosofai iš viso pasaulio prisijungia prie jūsų. Jūs iš karto "
-"gaunate technologinį pasiekimą."
+"Gravaj filozofoj el la tuta mondo aliĝis al via civilizo: vi gajnis tujan "
+"avanaĵon."
 
 #: data/default/techs.ruleset:541 data/civ2/techs.ruleset:526
 #: data/civ1/techs.ruleset:523
 msgid "Physics"
-msgstr "Fizika"
+msgstr "Fiziko"
 
 #: data/default/techs.ruleset:549 data/civ2/techs.ruleset:534
 #: data/civ1/techs.ruleset:531
 msgid "Plastics"
-msgstr "Plastikų gamyba"
+msgstr "Plasto"
 
 #: data/default/techs.ruleset:557 data/civ2/techs.ruleset:542
 #: data/civ1/techs.ruleset:539
 msgid "Polytheism"
-msgstr "Politeizmas"
+msgstr "Politeismo"
 
 #: data/default/techs.ruleset:565 data/civ2/techs.ruleset:550
 #: data/civ1/techs.ruleset:547
 msgid "Pottery"
-msgstr "PuodininkystÄ—"
+msgstr "Potaro"
 
 #: data/default/techs.ruleset:573 data/civ2/techs.ruleset:558
 #: data/civ1/techs.ruleset:555
 msgid "Radio"
-msgstr "Radijas"
+msgstr "Radio"
 
 #: data/default/techs.ruleset:589 data/civ2/techs.ruleset:574
 #: data/civ1/techs.ruleset:571
 msgid "Recycling"
-msgstr "Perdirbimas"
+msgstr "Reciklado"
 
 #: data/default/techs.ruleset:597 data/civ2/techs.ruleset:582
 #: data/civ1/techs.ruleset:579
 msgid "Refining"
-msgstr "Rafinavimas"
+msgstr "Rafinado"
 
 #: data/default/techs.ruleset:605 data/civ2/techs.ruleset:590
 #: data/civ1/techs.ruleset:587
 msgid "Refrigeration"
-msgstr "Å aldymas"
+msgstr "Fridigo"
 
 #: data/default/techs.ruleset:613 data/civ2/techs.ruleset:598
 #: data/civ1/techs.ruleset:595
 msgid "Robotics"
-msgstr "Robotų technika"
+msgstr "Robotiko"
 
 #: data/default/techs.ruleset:621 data/civ2/techs.ruleset:606
 #: data/civ1/techs.ruleset:603
 msgid "Rocketry"
-msgstr "RaketinÄ— technika"
+msgstr "Misiloscienco"
 
 #: data/default/techs.ruleset:629 data/civ2/techs.ruleset:614
 #: data/civ1/techs.ruleset:611
 msgid "Sanitation"
-msgstr "Sanitarija"
+msgstr "Sano-scienco"
 
 #: data/default/techs.ruleset:637 data/civ2/techs.ruleset:622
 #: data/civ1/techs.ruleset:619
 msgid "Seafaring"
-msgstr "JÅ«rininkystÄ—"
+msgstr "Maristaro"
 
 #: data/default/techs.ruleset:645 data/civ2/techs.ruleset:630
 #: data/civ1/techs.ruleset:627
 msgid "Space Flight"
-msgstr "Skrydžiai į kosmosą"
+msgstr "Kosma flugo"
 
 #: data/default/techs.ruleset:653 data/civ2/techs.ruleset:638
 #: data/civ1/techs.ruleset:635
 msgid "Stealth"
-msgstr "Stealth"
+msgstr "Kaŝteknologio"
 
 #: data/default/techs.ruleset:661 data/civ2/techs.ruleset:646
 #: data/civ1/techs.ruleset:643
 msgid "Steam Engine"
-msgstr "Garo variklis"
+msgstr "Vapormotoro"
 
 #: data/default/techs.ruleset:669 data/civ2/techs.ruleset:654
 #: data/civ1/techs.ruleset:651
 msgid "Steel"
-msgstr "Plienas"
+msgstr "Åœtalo"
 
 #: data/default/techs.ruleset:677 data/civ2/techs.ruleset:662
 #: data/civ1/techs.ruleset:659
 msgid "Superconductors"
-msgstr "Superlaidininkai"
+msgstr "Superkonduktanto"
 
 #: data/default/techs.ruleset:685 data/civ2/techs.ruleset:670
 #: data/civ1/techs.ruleset:667
 msgid "Tactics"
-msgstr "Taktika"
+msgstr "Taktiko"
 
 #: data/default/techs.ruleset:693 data/civ2/techs.ruleset:678
 #: data/civ1/techs.ruleset:675
 msgid "The Corporation"
-msgstr "Korporacijos"
+msgstr "Korporacio"
 
 #: data/default/techs.ruleset:701 data/civ2/techs.ruleset:686
 #: data/civ1/techs.ruleset:683
 msgid "The Republic"
-msgstr "Respublika"
+msgstr "Respubliko"
 
 #: data/default/techs.ruleset:709 data/civ2/techs.ruleset:694
 #: data/civ1/techs.ruleset:691
 msgid "The Wheel"
-msgstr "Ratas"
+msgstr "Rado"
 
 #: data/default/techs.ruleset:717 data/civ2/techs.ruleset:702
 msgid "Theology"
-msgstr "Teologija"
+msgstr "Teologio"
 
 #: data/default/techs.ruleset:723 data/civ2/techs.ruleset:708
 msgid "Improves the effect of Cathedrals."
-msgstr "Padidina katedrų poveikį."
+msgstr "Äœi pliigas la efikon de la Katedraloj."
 
 #: data/default/techs.ruleset:726 data/civ2/techs.ruleset:711
 #: data/civ1/techs.ruleset:707
 msgid "Theory of Gravity"
-msgstr "Gravitacijos teorija"
+msgstr "Teorio pri Gravitforco"
 
 #: data/default/techs.ruleset:750 data/civ2/techs.ruleset:735
 #: data/civ1/techs.ruleset:731
 msgid "Warrior Code"
-msgstr "Kario kodeksas"
+msgstr "Militkodo"
 
 #: data/default/techs.ruleset:758 data/civ2/techs.ruleset:743
 #: data/civ1/techs.ruleset:739
 msgid "Writing"
-msgstr "Rašymas"
+msgstr "Skribo"
 
 #: data/civ1/techs.ruleset:699
 msgid "Religion"
-msgstr "Religija"
+msgstr "Religio"
 
 #: data/default/terrain.ruleset:50 data/civ2/terrain.ruleset:50
 msgid ""
@@ -18840,20 +19058,18 @@ msgstr ""
 
 #: data/default/terrain.ruleset:182 data/civ2/terrain.ruleset:162
 msgid "Glacier"
-msgstr "Ledynas"
+msgstr "Glaciejo"
 
 #: data/default/terrain.ruleset:213 data/civ2/terrain.ruleset:188
 msgid ""
 "Glaciers are found only in the most northerly or southerly reaches of the "
 "world.  They are very cold, and hence difficult to work with."
 msgstr ""
-"Ledynai yra randami tik pačiose šiauriausiose ir piečiausiose pasaulio "
-"vietose. Jie labai Å¡alti ir todÄ—l sunkiai dirbami."
 
 #: data/default/terrain.ruleset:220 data/civ2/terrain.ruleset:195
 #: data/civ1/terrain.ruleset:186
 msgid "Desert"
-msgstr "Dykuma"
+msgstr "Dezerto"
 
 #: data/default/terrain.ruleset:252 data/civ2/terrain.ruleset:222
 #: data/civ1/terrain.ruleset:212
@@ -18861,34 +19077,31 @@ msgid ""
 "Deserts are regions of extreme dryness, making agriculture and trade very "
 "difficult."
 msgstr ""
-"Dykumos yra labai sausos vietos, kurios daro žemės ūkį ir prekybą yra labai "
-"sunkius."
 
 #: data/default/terrain.ruleset:258 data/civ2/terrain.ruleset:228
 #: data/civ1/terrain.ruleset:218
 msgid "Forest"
-msgstr "Miškas"
+msgstr "Arbaro"
 
 #: data/default/terrain.ruleset:290 data/civ2/terrain.ruleset:255
 #: data/civ1/terrain.ruleset:245
 msgid "Forests are densely wooded, making agriculture somewhat problematic."
 msgstr ""
-"Miškai yra tankiai apaugusios vietos, kuriose žemės ūkis yra problematiškas."
 
 #: data/default/terrain.ruleset:296 data/civ2/terrain.ruleset:261
 #: data/civ1/terrain.ruleset:251
 msgid "Grassland"
-msgstr "Pieva"
+msgstr "Herbejo"
 
 #: data/default/terrain.ruleset:328 data/civ2/terrain.ruleset:288
 #: data/civ1/terrain.ruleset:278
 msgid "Grasslands afford exceptional agricultural opportunities."
-msgstr "Pievos leidžia išskirtines agrikultūrines galimybes."
+msgstr ""
 
 #: data/default/terrain.ruleset:333 data/civ2/terrain.ruleset:293
 #: data/civ1/terrain.ruleset:283
 msgid "Hills"
-msgstr "Kalvos"
+msgstr "Montetoj"
 
 #: data/default/terrain.ruleset:365 data/civ2/terrain.ruleset:320
 #: data/civ1/terrain.ruleset:310
@@ -18896,25 +19109,21 @@ msgid ""
 "In addition to being amenable to agriculture, Hills are frequently rich in "
 "resources."
 msgstr ""
-"Be to, kad kalvos yra tinkamos žemės ūkiui, jos dažnai gali būti gausios "
-"resursų."
 
 #: data/default/terrain.ruleset:371 data/civ2/terrain.ruleset:326
 #: data/civ1/terrain.ruleset:316
 msgid "Jungle"
-msgstr "Džiunglės"
+msgstr "Äœangalo"
 
 #: data/default/terrain.ruleset:404 data/civ2/terrain.ruleset:354
 #: data/civ1/terrain.ruleset:342
 msgid "Jungles are densely overgrown, making agriculture somewhat problematic."
 msgstr ""
-"Džiunglės yra tankiai apaugusios vietos, kuriose žemės ūkis yra "
-"problematiškas."
 
 #: data/default/terrain.ruleset:410 data/civ2/terrain.ruleset:360
 #: data/civ1/terrain.ruleset:348
 msgid "Mountains"
-msgstr "Kalnai"
+msgstr "Montoj"
 
 #: data/default/terrain.ruleset:441 data/civ2/terrain.ruleset:386
 #: data/civ1/terrain.ruleset:373
@@ -18922,13 +19131,11 @@ msgid ""
 "Mountains are regions of extreme altitude, making agriculture and trade very "
 "difficult."
 msgstr ""
-"Kalnai yra labai aukštos vietos, kurios daro žemės ukį ir prekybą labai "
-"sunkius."
 
 #: data/default/terrain.ruleset:447 data/civ2/terrain.ruleset:392
 #: data/civ1/terrain.ruleset:379
 msgid "Ocean"
-msgstr "Vandenynas"
+msgstr "Oceano"
 
 #: data/default/terrain.ruleset:478 data/civ2/terrain.ruleset:417
 #: data/civ1/terrain.ruleset:404
@@ -18938,15 +19145,11 @@ msgid ""
 "\n"
 "Ocean squares can never be polluted or subjected to fallout."
 msgstr ""
-"Vandenynai dengia didžiąją pasaulio dalį, ir tik jūros daliniai (Triremos ir "
-"kiti laivai) gali jais keliauti.\n"
-"\n"
-"Vandenyno plokštelės negali būti užterštos arba paveiktos radiacijos."
 
 #: data/default/terrain.ruleset:486 data/civ2/terrain.ruleset:425
 #: data/civ1/terrain.ruleset:412
 msgid "Plains"
-msgstr "Lygumos"
+msgstr "Ebenaĵoj"
 
 #: data/default/terrain.ruleset:518 data/civ2/terrain.ruleset:452
 #: data/civ1/terrain.ruleset:439
@@ -18954,13 +19157,11 @@ msgid ""
 "Plains are very broad, sparse regions, which makes trade slightly "
 "inconvenient."
 msgstr ""
-"Lygumos yra paltūs, resursų reti regionai, kurie prekybą daro šiek tiek "
-"nepatogia."
 
 #: data/default/terrain.ruleset:524 data/civ2/terrain.ruleset:458
 #: data/civ1/terrain.ruleset:445
 msgid "Swamp"
-msgstr "PelkÄ—"
+msgstr "Marĉo"
 
 #: data/default/terrain.ruleset:556 data/civ2/terrain.ruleset:485
 #: data/civ1/terrain.ruleset:471
@@ -18968,141 +19169,136 @@ msgid ""
 "Swamps suffer from an over-abundance of water, making agriculture somewhat "
 "problematic."
 msgstr ""
-"Pelkės kenčia nuo per didelio vandens kiekio, kuris žemės ūkio vystymą daro "
-"problematišką."
 
 #: data/default/terrain.ruleset:562 data/civ2/terrain.ruleset:491
 #: data/civ1/terrain.ruleset:477
 msgid "Tundra"
-msgstr "Tundra"
+msgstr "Tundro"
 
 #: data/default/terrain.ruleset:593 data/civ2/terrain.ruleset:517
 #: data/civ1/terrain.ruleset:503
 msgid ""
 "Tundra are broad, cold regions, fit for some agriculture and little else."
 msgstr ""
-"Tundra yra platūs, šalti regionai, tinkami šiokiam tokiam žemės ūkiui ir "
-"beveik niekam daugiau."
 
 #: data/default/terrain.ruleset:599 data/civ2/terrain.ruleset:523
 msgid "Ivory"
-msgstr "Dramblio kaulas"
+msgstr "Eburo"
 
 #: data/default/terrain.ruleset:608 data/civ2/terrain.ruleset:532
 #: data/civ1/terrain.ruleset:566
 msgid "Oil"
-msgstr "Nafta"
+msgstr "Petrolo"
 
 #: data/default/terrain.ruleset:615 data/civ2/terrain.ruleset:546
 #: data/civ1/terrain.ruleset:558
 msgid "Oasis"
-msgstr "OazÄ—"
+msgstr "Oazo"
 
 #: data/default/terrain.ruleset:622 data/civ2/terrain.ruleset:553
 msgid "Pheasant"
-msgstr "Fazanai"
+msgstr "Fazano"
 
 #: data/default/terrain.ruleset:629 data/civ2/terrain.ruleset:560
 msgid "Silk"
-msgstr "Å ilkas"
+msgstr "Silko"
 
 #: data/default/terrain.ruleset:643 data/civ2/terrain.ruleset:574
 #: data/civ1/terrain.ruleset:518
 msgid "Coal"
-msgstr "Anglys"
+msgstr "Karbo"
 
 #: data/default/terrain.ruleset:650 data/civ2/terrain.ruleset:581
 msgid "Wine"
-msgstr "Vynas"
+msgstr "Vino"
 
 #: data/default/terrain.ruleset:657 data/civ2/terrain.ruleset:588
 #: data/civ1/terrain.ruleset:534
 msgid "Gems"
-msgstr "Brangakmeniai"
+msgstr "Gemoj"
 
 #: data/default/terrain.ruleset:664 data/civ2/terrain.ruleset:595
 msgid "Fruit"
-msgstr "Vaisiai"
+msgstr "Fruktoj"
 
 #: data/default/terrain.ruleset:679 data/civ2/terrain.ruleset:610
 msgid "Iron"
-msgstr "Geležis"
+msgstr "Fero"
 
 #: data/default/terrain.ruleset:686 data/civ2/terrain.ruleset:617
 #: data/civ1/terrain.ruleset:526
 msgid "Fish"
-msgstr "Žuvys"
+msgstr "Fiŝo"
 
 #: data/default/terrain.ruleset:693 data/civ2/terrain.ruleset:624
 msgid "Whales"
-msgstr "Banginiai"
+msgstr "Balenoj"
 
 #: data/default/terrain.ruleset:701 data/civ2/terrain.ruleset:632
 msgid "Buffalo"
-msgstr "Buivolai"
+msgstr "Bubalo"
 
 #: data/default/terrain.ruleset:708 data/civ2/terrain.ruleset:639
 msgid "Wheat"
-msgstr "Kviečiai"
+msgstr "Tritiko"
 
 #: data/default/terrain.ruleset:715 data/civ2/terrain.ruleset:646
 msgid "Peat"
-msgstr "DurpÄ—s"
+msgstr "Torfo"
 
 #: data/default/terrain.ruleset:722 data/civ2/terrain.ruleset:653
 msgid "Spice"
-msgstr "Prieskoniai"
+msgstr "Spicoj"
 
 #: data/default/terrain.ruleset:730 data/civ2/terrain.ruleset:661
 #: data/civ1/terrain.ruleset:510
 msgid "?animals:Game"
-msgstr "?animals:Medžiojamieji gyvūnai"
+msgstr "?animals:Ĉasaĵo"
 
 #: data/default/terrain.ruleset:738 data/civ2/terrain.ruleset:669
 msgid "Furs"
-msgstr "Kailiai"
+msgstr "Peltoj"
 
 #: data/civ2/terrain.ruleset:539
+#, fuzzy
 msgid "Petroleum"
-msgstr "Nafta"
+msgstr "Patrolado"
 
 #: data/civ1/terrain.ruleset:153
 msgid "Arctic"
-msgstr "Arktika"
+msgstr "Arkta"
 
 #: data/civ1/terrain.ruleset:179
 msgid ""
 "Arctic squares are found only in the most northerly or southerly reaches of "
 "the world.  They are very cold, and hence difficult to work with."
 msgstr ""
-"Arktinės plokštelės yra randamos tik pačiose šiauriausiose ir piečiausiose "
-"pasaulio vietose. Jos labai Å¡altos ir todÄ—l sunkiai dirbamos."
 
 #: data/civ1/terrain.ruleset:550
 msgid "Horses"
-msgstr "Arkliai"
+msgstr "Ĉevaloj"
 
 #: data/civ1/terrain.ruleset:582
 msgid "Seals"
-msgstr "Ruoniai"
+msgstr "Fokoj"
 
 #: data/default/units.ruleset:24 data/civ2/units.ruleset:18
 #: data/civ1/units.ruleset:18
 msgid "green"
-msgstr "žalias"
+msgstr "rekruta"
 
 #: data/default/units.ruleset:24
 msgid "hardened"
-msgstr "užgrūdintas"
+msgstr "sperta"
 
 #: data/default/units.ruleset:24
 msgid "elite"
-msgstr "elitinis"
+msgstr "elita"
 
 #: data/default/units.ruleset:194 data/civ2/units.ruleset:89
 #: data/civ1/units.ruleset:97
 msgid "Settlers"
-msgstr "Naujakuriai"
+msgstr "Farmistoj"
 
 #: data/default/units.ruleset:220
 msgid ""
@@ -19138,7 +19334,7 @@ msgstr ""
 
 #: data/default/units.ruleset:279 data/civ2/units.ruleset:133
 msgid "Engineers"
-msgstr "Inžinieriai"
+msgstr "Inĝenieroj"
 
 #: data/default/units.ruleset:305
 msgid ""
@@ -19157,18 +19353,18 @@ msgstr ""
 
 #: data/default/units.ruleset:320 data/civ2/units.ruleset:174
 msgid "Warriors"
-msgstr "Kariai"
+msgstr "Militistoj"
 
 #: data/default/units.ruleset:346 data/civ2/units.ruleset:200
 #: data/civ1/units.ruleset:167
 msgid ""
 "This unit may be built from the start of the game.  It is the weakest unit."
-msgstr "Šis silpniausias dalinys gali būti statomas nuo pat žaidmo pradžios."
+msgstr ""
 
 #: data/default/units.ruleset:352 data/civ2/units.ruleset:206
 #: data/civ1/units.ruleset:173
 msgid "Phalanx"
-msgstr "Falanga"
+msgstr "Falanganoj"
 
 #: data/default/units.ruleset:378 data/civ2/units.ruleset:232
 #: data/civ1/units.ruleset:199
@@ -19177,7 +19373,7 @@ msgstr ""
 
 #: data/default/units.ruleset:383 data/civ2/units.ruleset:237
 msgid "Archers"
-msgstr "Lankininkai"
+msgstr "Pafarkistoj"
 
 #: data/default/units.ruleset:409 data/civ2/units.ruleset:263
 msgid ""
@@ -19188,7 +19384,7 @@ msgstr ""
 #: data/default/units.ruleset:415 data/civ2/units.ruleset:269
 #: data/civ1/units.ruleset:204
 msgid "Legion"
-msgstr "Legionas"
+msgstr "Legianoj"
 
 #: data/default/units.ruleset:441 data/civ2/units.ruleset:295
 #: data/civ1/units.ruleset:230
@@ -19199,7 +19395,7 @@ msgstr ""
 
 #: data/default/units.ruleset:447 data/civ2/units.ruleset:301
 msgid "Pikemen"
-msgstr "Ietininkai"
+msgstr "Halebardistoj"
 
 #: data/default/units.ruleset:473 data/civ2/units.ruleset:327
 msgid ""
@@ -19210,7 +19406,7 @@ msgstr ""
 #: data/default/units.ruleset:479 data/civ2/units.ruleset:333
 #: data/civ1/units.ruleset:236
 msgid "Musketeers"
-msgstr "Muškietininkai"
+msgstr "Musketistoj"
 
 #: data/default/units.ruleset:506 data/civ2/units.ruleset:360
 msgid ""
@@ -19220,7 +19416,7 @@ msgstr ""
 
 #: data/default/units.ruleset:513 data/civ2/units.ruleset:400
 msgid "Partisan"
-msgstr "Partizanai"
+msgstr "Partizanoj"
 
 #: data/default/units.ruleset:539 data/civ2/units.ruleset:426
 msgid ""
@@ -19238,7 +19434,7 @@ msgstr ""
 
 #: data/default/units.ruleset:553 data/civ2/units.ruleset:440
 msgid "Alpine Troops"
-msgstr "Alpių kariai"
+msgstr "Alposoldatoj"
 
 #: data/default/units.ruleset:579 data/civ2/units.ruleset:466
 msgid "Alpine Troops are highly mobile units as well as excellent defenders."
@@ -19247,7 +19443,7 @@ msgstr ""
 #: data/default/units.ruleset:585 data/civ2/units.ruleset:472
 #: data/civ1/units.ruleset:270
 msgid "Riflemen"
-msgstr "Å auliai"
+msgstr "Fusilistoj"
 
 #: data/default/units.ruleset:611 data/civ2/units.ruleset:498
 #: data/civ1/units.ruleset:296
@@ -19257,7 +19453,7 @@ msgstr ""
 
 #: data/default/units.ruleset:617 data/civ2/units.ruleset:504
 msgid "Marines"
-msgstr "Jūrų pėstininkai"
+msgstr "Marsoldatoj"
 
 #: data/default/units.ruleset:643 data/civ2/units.ruleset:530
 msgid "Marines are infantry who are experts at marine warfare."
@@ -19265,7 +19461,7 @@ msgstr ""
 
 #: data/default/units.ruleset:648 data/civ2/units.ruleset:535
 msgid "Paratroopers"
-msgstr "Desantininkai"
+msgstr "Paraŝutistoj"
 
 #: data/default/units.ruleset:674 data/civ2/units.ruleset:561
 msgid "Paratroopers are experts at airborne attacks."
@@ -19274,7 +19470,7 @@ msgstr ""
 #: data/default/units.ruleset:683 data/civ2/units.ruleset:570
 #: data/civ1/units.ruleset:302
 msgid "Mech. Inf."
-msgstr "Mechanizuoti pÄ—stininkai"
+msgstr "Mekan. Inf."
 
 #: data/default/units.ruleset:709 data/civ2/units.ruleset:596
 #: data/civ1/units.ruleset:328
@@ -19282,13 +19478,10 @@ msgid ""
 "Mechanized Infantry; this unit has the strongest defence strength of any "
 "land unit, but is only available near the end of the technology tree."
 msgstr ""
-"Mechanizuoti pėstininkai turi didžiausią gynybos jėgą tarp visų sausumos "
-"dalinių, tačiau jie įmanomi tik  beveik pačioje technologijų medžio "
-"pabaigoje."
 
 #: data/default/units.ruleset:716 data/civ2/units.ruleset:603
 msgid "Horsemen"
-msgstr "Raiteliai"
+msgstr "Kavalerianoj"
 
 #: data/default/units.ruleset:742 data/civ2/units.ruleset:629
 msgid ""
@@ -19299,7 +19492,7 @@ msgstr ""
 #: data/default/units.ruleset:749 data/civ2/units.ruleset:636
 #: data/civ1/units.ruleset:368
 msgid "Chariot"
-msgstr "Kovos vežimas"
+msgstr "Militĉaroj"
 
 #: data/default/units.ruleset:775 data/civ2/units.ruleset:662
 #: data/civ1/units.ruleset:394
@@ -19311,7 +19504,7 @@ msgstr ""
 #: data/default/units.ruleset:781 data/civ2/units.ruleset:732
 #: data/civ1/units.ruleset:400
 msgid "Knights"
-msgstr "Riteriai"
+msgstr "Kavaliroj"
 
 #: data/default/units.ruleset:808 data/civ2/units.ruleset:759
 #: data/civ1/units.ruleset:427
@@ -19320,7 +19513,7 @@ msgstr ""
 
 #: data/default/units.ruleset:813 data/civ2/units.ruleset:764
 msgid "Dragoons"
-msgstr "Dragūnai"
+msgstr "Dragonoj"
 
 #: data/default/units.ruleset:840 data/civ2/units.ruleset:791
 msgid "Dragoons are mounted warriors carrying early firearms."
@@ -19329,7 +19522,7 @@ msgstr ""
 #: data/default/units.ruleset:845 data/civ2/units.ruleset:796
 #: data/civ1/units.ruleset:335
 msgid "Cavalry"
-msgstr "Kavalerija"
+msgstr "Kavalerianoj"
 
 #: data/default/units.ruleset:871 data/civ2/units.ruleset:822
 msgid "Cavalry are mounted and highly trained soldiers."
@@ -19338,7 +19531,7 @@ msgstr ""
 #: data/default/units.ruleset:876 data/civ2/units.ruleset:827
 #: data/civ1/units.ruleset:432
 msgid "Armor"
-msgstr "Sausumos Å¡arvuotis"
+msgstr "BlendaÅ­toj"
 
 #: data/default/units.ruleset:902 data/civ2/units.ruleset:853
 #: data/civ1/units.ruleset:458
@@ -19350,7 +19543,7 @@ msgstr ""
 #: data/default/units.ruleset:909 data/civ2/units.ruleset:860
 #: data/civ1/units.ruleset:465
 msgid "Catapult"
-msgstr "Katapulta"
+msgstr "Katapultoj"
 
 #: data/default/units.ruleset:935 data/civ2/units.ruleset:886
 #: data/civ1/units.ruleset:491
@@ -19362,7 +19555,7 @@ msgstr ""
 #: data/default/units.ruleset:942 data/civ2/units.ruleset:893
 #: data/civ1/units.ruleset:498
 msgid "Cannon"
-msgstr "Patranka"
+msgstr "Kanonoj"
 
 #: data/default/units.ruleset:968 data/civ2/units.ruleset:919
 #: data/civ1/units.ruleset:524
@@ -19375,7 +19568,7 @@ msgstr ""
 #: data/default/units.ruleset:976 data/civ2/units.ruleset:927
 #: data/civ1/units.ruleset:532
 msgid "Artillery"
-msgstr "Artilerija"
+msgstr "Artilerio"
 
 #: data/default/units.ruleset:1002 data/civ2/units.ruleset:953
 msgid ""
@@ -19385,7 +19578,7 @@ msgstr ""
 
 #: data/default/units.ruleset:1009 data/civ2/units.ruleset:960
 msgid "Howitzer"
-msgstr "Haubica"
+msgstr "HaÅ­bizoj"
 
 #: data/default/units.ruleset:1035 data/civ2/units.ruleset:986
 msgid ""
@@ -19396,7 +19589,7 @@ msgstr ""
 #: data/default/units.ruleset:1041 data/civ2/units.ruleset:992
 #: data/civ1/units.ruleset:564
 msgid "Fighter"
-msgstr "Naikintuvas"
+msgstr "Ĉasaviadiloj"
 
 #: data/default/units.ruleset:1067 data/civ2/units.ruleset:1018
 #: data/civ1/units.ruleset:590
@@ -19408,7 +19601,7 @@ msgstr ""
 #: data/default/units.ruleset:1073 data/civ2/units.ruleset:1024
 #: data/civ1/units.ruleset:596
 msgid "Bomber"
-msgstr "Bombonešis"
+msgstr "Bombaj ĉasaviadiloj"
 
 #: data/default/units.ruleset:1099 data/civ2/units.ruleset:1050
 #: data/civ1/units.ruleset:622
@@ -19424,31 +19617,27 @@ msgid ""
 "health for every turn not spent in a city, unless you have the United "
 "Nations wonder."
 msgstr ""
-"Sraigtasparnis yra labai galingas dalinys, kadangi jis gali ir skristi, ir "
-"užimti miestus. Tačiau turėtumėte būti atsargūs, jei neturite Jungtinių "
-"tautų stebuklo, nes sraigtasparnis praranda dalelę gyvybės taškų kiekvieną "
-"Ä—jimÄ…, praleistÄ… ne mieste."
 
 #: data/default/units.ruleset:1140 data/civ2/units.ruleset:1091
 msgid "Stealth Fighter"
-msgstr "Stealth naikintuvas"
+msgstr "Kaŝaj ĉasaviadiloj"
 
 #: data/default/units.ruleset:1166 data/civ2/units.ruleset:1117
 msgid "An improved Fighter, with improved attack and a higher movement radius."
-msgstr "Patobulintas naikintuvas, kurio didesnÄ— ataka ir judÄ—jimo atstumas."
+msgstr ""
 
 #: data/default/units.ruleset:1172 data/civ2/units.ruleset:1123
 msgid "Stealth Bomber"
-msgstr "Stealth bombonešis"
+msgstr "Kaŝaj bombaviadiloj"
 
 #: data/default/units.ruleset:1198 data/civ2/units.ruleset:1149
 msgid "An improved Bomber, with improved attack and a higher movement radius."
-msgstr "Patobulintas bombonešis, kurio didesnė ataka ir judėjimo atstumas."
+msgstr ""
 
 #: data/default/units.ruleset:1204 data/civ2/units.ruleset:1155
 #: data/civ1/units.ruleset:629
 msgid "Trireme"
-msgstr "Trirema"
+msgstr "Triremoj"
 
 #: data/default/units.ruleset:1230 data/civ2/units.ruleset:1181
 #: data/civ1/units.ruleset:655
@@ -19459,7 +19648,7 @@ msgstr ""
 
 #: data/default/units.ruleset:1237 data/civ2/units.ruleset:1188
 msgid "Caravel"
-msgstr "KaravelÄ—"
+msgstr "Karaveloj"
 
 #: data/default/units.ruleset:1263 data/civ2/units.ruleset:1214
 msgid ""
@@ -19468,7 +19657,7 @@ msgstr ""
 
 #: data/default/units.ruleset:1269 data/civ2/units.ruleset:1220
 msgid "Galleon"
-msgstr "Galionas"
+msgstr "Galionoj"
 
 #: data/default/units.ruleset:1295 data/civ2/units.ruleset:1246
 msgid ""
@@ -19479,7 +19668,7 @@ msgstr ""
 #: data/default/units.ruleset:1302 data/civ2/units.ruleset:1253
 #: data/civ1/units.ruleset:694
 msgid "Frigate"
-msgstr "Fregata"
+msgstr "Fregatoj"
 
 #: data/default/units.ruleset:1328 data/civ2/units.ruleset:1279
 #: data/civ1/units.ruleset:720
@@ -19491,7 +19680,7 @@ msgstr ""
 #: data/default/units.ruleset:1335 data/civ2/units.ruleset:1286
 #: data/civ1/units.ruleset:727
 msgid "Ironclad"
-msgstr "Jūrų šarvuotis"
+msgstr "Kirasŝipoj"
 
 #: data/default/units.ruleset:1361 data/civ2/units.ruleset:1312
 #: data/civ1/units.ruleset:753
@@ -19502,20 +19691,18 @@ msgstr ""
 
 #: data/default/units.ruleset:1368 data/civ2/units.ruleset:1319
 msgid "Destroyer"
-msgstr "Eskadrinis minininkas"
+msgstr "Destrojeroj"
 
 #: data/default/units.ruleset:1394 data/civ2/units.ruleset:1345
 msgid ""
 "TIP:  A very fast unit, which is very useful for hunting down enemy "
 "Transports."
 msgstr ""
-"PATARIMAS: Labai greitas dalinys, kuris labai naudingas medžiojant priešo "
-"transportinius laivus."
 
 #: data/default/units.ruleset:1400 data/civ2/units.ruleset:1351
 #: data/civ1/units.ruleset:760
 msgid "Cruiser"
-msgstr "Kreiseris"
+msgstr "Krozoŝipoj"
 
 #: data/default/units.ruleset:1426 data/civ2/units.ruleset:1377
 #: data/civ1/units.ruleset:786
@@ -19524,7 +19711,7 @@ msgstr ""
 
 #: data/default/units.ruleset:1431 data/civ2/units.ruleset:1382
 msgid "AEGIS Cruiser"
-msgstr "Raketinis kreiseris"
+msgstr "Krozoŝipoj AEGIS"
 
 #: data/default/units.ruleset:1457 data/civ2/units.ruleset:1408
 msgid ""
@@ -19534,7 +19721,7 @@ msgstr ""
 #: data/default/units.ruleset:1463 data/civ2/units.ruleset:1414
 #: data/civ1/units.ruleset:791
 msgid "Battleship"
-msgstr "Linijinis laivas"
+msgstr "Militŝipoj"
 
 #: data/default/units.ruleset:1489 data/civ2/units.ruleset:1440
 #: data/civ1/units.ruleset:817
@@ -19546,18 +19733,17 @@ msgstr ""
 #: data/default/units.ruleset:1495 data/civ2/units.ruleset:1446
 #: data/civ1/units.ruleset:823
 msgid "Submarine"
-msgstr "Povandeninis laivas"
+msgstr "Submarŝipoj"
 
 #: data/default/units.ruleset:1522 data/civ2/units.ruleset:1473
 #: data/civ1/units.ruleset:849
 msgid "Submarines have a very high strategic value, but have a weak defence."
 msgstr ""
-"Povandeniai lavai turi labai didelÄ™ strateginÄ™ vertÄ™, bet silpnÄ… gynybÄ…."
 
 #: data/default/units.ruleset:1528 data/civ2/units.ruleset:1479
 #: data/civ1/units.ruleset:855
 msgid "Carrier"
-msgstr "Lėktuvnešis"
+msgstr "Aviŝipoj"
 
 #: data/default/units.ruleset:1554 data/civ2/units.ruleset:1505
 #: data/civ1/units.ruleset:881
@@ -19565,14 +19751,11 @@ msgid ""
 "TIP:  Guard Carriers with a handful of fast-moving ships and a battleship, "
 "as losing a fully-equipped Carrier is VERY painful and expensive."
 msgstr ""
-"PATARIMAS: Saugokite transportinius laivus su sauja greitų laivų ir "
-"linijiniu laivu, nes prarasti pilnai prikrautą transportinį laivą yra labai "
-"skausminga ir brangu."
 
 #: data/default/units.ruleset:1561 data/civ2/units.ruleset:1512
 #: data/civ1/units.ruleset:888
 msgid "Transport"
-msgstr "Transportas"
+msgstr "Kargoŝipoj"
 
 #: data/default/units.ruleset:1587 data/civ2/units.ruleset:1538
 #: data/civ1/units.ruleset:914
@@ -19583,15 +19766,13 @@ msgstr ""
 
 #: data/default/units.ruleset:1593 data/civ2/units.ruleset:1544
 msgid "Cruise Missile"
-msgstr "Raketa"
+msgstr "Kroz-misiloj"
 
 #: data/default/units.ruleset:1619 data/civ2/units.ruleset:1570
 msgid ""
 "TIP:  A handful of these can successfully keep the waters around your "
 "treasured homeland free of enemy ships."
 msgstr ""
-"PATARIMAS: Sauja šitų gali patikimai apsaugoti vandenis aplink Jūsų mylimą "
-"tėvynę nuo priešo laivų."
 
 #: data/default/units.ruleset:1651 data/civ2/units.ruleset:1602
 msgid ""
@@ -19611,28 +19792,11 @@ msgid ""
 "and have them ready to fix the fallout on the same turn it occurs!  This "
 "minimizes the chance of nuclear winter.  Eco-friendly nukes!"
 msgstr ""
-"JÅ«s galite statyti branduolinius dalinius, kai JÅ«s turite reikiamas "
-"technologijas ir Jūs ar kuris nors kitas žaidėjas yra pastatę Manheteno "
-"Projekto stebuklÄ….\n"
-"\n"
-"Kontakto metu sprogimas sunaikina visus dalinius 3x3 laukų kvadrate, "
-"įskaitant ir draugiškus dalinius. Smogiant miestui miesto dydis sumažėja per "
-"pusę ir aplinkiniai laukai užteršiami branduolinėmis atliekomis.\n"
-"\n"
-"PATARIMAS 1: Smūgis vandenyne nesukuria branduolinių atliekų ir yra "
-"efektyviausias (bet ir brangiausias) priešo laivų atsikratymo būdas.\n"
-"\n"
-"PATARIMAS 2: Jūs galite atsidurti situacijoje, kai Jūs masiškai įsiveržėte į "
-"priešo teritoriją, bet priešo miestai yra per stiprūs. Prieš panaudodami "
-"branduolinius ginklus surinkite didelį naujakurių ir inžinierių būrį šalia "
-"miesto ir pasiruoškite sunaikinti branduolines atliekas jau kito apsisukimo "
-"metu! Tai sumažina branduolinės žiemos tikimybę. Naudokite ekologiškai švarų "
-"branduolinį ginklą!"
 
 #: data/default/units.ruleset:1672 data/civ2/units.ruleset:1623
 #: data/civ1/units.ruleset:967
 msgid "Diplomat"
-msgstr "Diplomatas"
+msgstr "Diplomato"
 
 #: data/default/units.ruleset:1698 data/civ2/units.ruleset:1649
 #: data/civ1/units.ruleset:993
@@ -19659,7 +19823,7 @@ msgstr ""
 
 #: data/default/units.ruleset:1723 data/civ2/units.ruleset:1674
 msgid "Spy"
-msgstr "Å nipas"
+msgstr "Spiono"
 
 #: data/default/units.ruleset:1749 data/civ2/units.ruleset:1700
 msgid ""
@@ -19682,7 +19846,7 @@ msgstr ""
 #: data/default/units.ruleset:1766 data/civ2/units.ruleset:1717
 #: data/civ1/units.ruleset:1018
 msgid "Caravan"
-msgstr "Karavanas"
+msgstr "Karavanoj"
 
 #: data/default/units.ruleset:1792 data/civ2/units.ruleset:1743
 #: data/civ1/units.ruleset:1044
@@ -19694,48 +19858,37 @@ msgid ""
 "into a city where you have started to build a wonder, and finish it in only "
 "one turn!"
 msgstr ""
-"Kiekvienas karavanas, kuris yra panaudojamas stebuklo statybai, prideda 50 "
-"vienetų prie stebuklo gamybos.\n"
-"\n"
-"PATARIMAS: Jūs galite iš anksto sukaupti karavanų atsargas ir perkelti juos "
-"į miestą, kai tik pradedate stebuklo statybą. Tai leidžia užbaigti stebuklą "
-"per vienÄ… apsisukimÄ…!"
 
 #: data/default/units.ruleset:1802 data/civ2/units.ruleset:1753
 msgid "Freight"
-msgstr "Prekinis automobilis"
+msgstr "Aŭtoĉaroj"
 
 #: data/default/units.ruleset:1828 data/civ2/units.ruleset:1779
 msgid "The Freight unit replaces the Caravan, and moves at twice the speed."
-msgstr "Prekinis automobilis pakeičia karavaną ir juda dvigubai greičiau."
+msgstr ""
 
 #: data/default/units.ruleset:1833 data/civ2/units.ruleset:1784
 msgid "Explorer"
-msgstr "TyrinÄ—tojas"
+msgstr "Skolto"
 
 #: data/default/units.ruleset:1859 data/civ2/units.ruleset:1810
 msgid "Explorers are very useful for mapping unknown territory."
-msgstr "Tyrinėtojai yra labai naudingi ištirti nežinomoms teritorijoms."
+msgstr ""
 
 #: data/default/units.ruleset:1892
 msgid "This is you. If you lose this unit, you lose the game. So don't."
 msgstr ""
-"Čia esate Jūs. Jei prarasite šį dalinį, pralaimėsite žaidimą. Tai "
-"nepraraskite."
 
 #: data/default/units.ruleset:1897 data/civ2/units.ruleset:1815
 #: data/civ1/units.ruleset:1054
 msgid "Barbarian Leader"
-msgstr "Barbarų vadas"
+msgstr "Barbarestro"
 
 #: data/default/units.ruleset:1924 data/civ2/units.ruleset:1841
 msgid ""
 "When barbarian leader is killed on a tile without any defending units, the "
 "100 gold ransom is paid, but only to land units and helicopters."
 msgstr ""
-"Kai barbarų vadas nužudomas plokštelėje, kurioje nėra nėra jokių ginančių "
-"dalinių, 100 aukso vienetų išpirka yra mokama, bet tik sausumos daliniams ir "
-"sraigtasparniams."
 
 #: data/default/units.ruleset:1930
 msgid "AWACS"
@@ -19747,8 +19900,6 @@ msgid ""
 "advanced radar that can determine the location of enemy units over a wide "
 "area."
 msgstr ""
-"AWACS (Airborne Warning and Control System) yra lÄ—ktuvas su specialiu "
-"radaru, kuris leidžia nustatyti priešo dalinių padėtį didelėje teritorijoje,"
 
 #: data/civ2/units.ruleset:115
 msgid ""
@@ -19784,7 +19935,7 @@ msgstr ""
 
 #: data/civ2/units.ruleset:367
 msgid "Fanatics"
-msgstr "Fanatikai"
+msgstr "Fanatikuloj"
 
 #: data/civ2/units.ruleset:394
 msgid ""
@@ -19794,7 +19945,7 @@ msgstr ""
 
 #: data/civ2/units.ruleset:668
 msgid "Elephants"
-msgstr "Drambliai"
+msgstr "Elefantoj"
 
 #: data/civ2/units.ruleset:694
 msgid ""
@@ -19804,7 +19955,7 @@ msgstr ""
 
 #: data/civ2/units.ruleset:700
 msgid "Crusaders"
-msgstr "Kryžiuočiai"
+msgstr "Krucmilitistoj"
 
 #: data/civ2/units.ruleset:726
 msgid ""
@@ -19829,7 +19980,7 @@ msgstr ""
 
 #: data/civ1/units.ruleset:141
 msgid "Militia"
-msgstr "Milicija"
+msgstr "Milicanoj"
 
 #: data/civ1/units.ruleset:263
 msgid ""
@@ -19851,7 +20002,7 @@ msgstr ""
 
 #: data/civ1/units.ruleset:662
 msgid "Sail"
-msgstr "Burlaivis"
+msgstr "Velŝipoj"
 
 #: data/civ1/units.ruleset:688
 msgid ""
@@ -19882,17 +20033,14 @@ msgid ""
 "When barbarian leader is killed on a tile without any defending units, the "
 "100 gold ransom is paid, but only to land units."
 msgstr ""
-"Kai barbarų vadas nužudomas plokštelėje, kurioje nėra nėra jokių ginančių "
-"dalinių, 100 aukso vienetų išpirka yra mokama, bet tik sausumos daliniams ir "
-"sraigtasparniams."
 
 #: data/nation/aborigines.ruleset:3
 msgid "Australian Aboriginal"
-msgstr "Australijos aborigenų"
+msgstr "Aborigena"
 
 #: data/nation/aborigines.ruleset:4
 msgid "?plural:Aborigines"
-msgstr "?plural:Australijos aborigenai"
+msgstr "?plural:Aborigenoj"
 
 #: data/nation/aborigines.ruleset:6
 msgid ""
@@ -19901,17 +20049,14 @@ msgid ""
 "to themselves with different names, including Koori, Yamaji, Nunga, and "
 "Murri."
 msgstr ""
-"Australijos aborigenai yra bendras terminmas skirtas pavadinti vietiniams "
-"Australijos žemyno gyventojams. Aborigenai iš skirtingų Australijos vietų "
-"save vadina skirtingai, pavyzdžiui: koriai, jamajai, nungai ir muriai."
 
 #: data/nation/afghani.ruleset:3
 msgid "Afghani"
-msgstr "Afganistano"
+msgstr "Afgana"
 
 #: data/nation/afghani.ruleset:4
 msgid "?plural:Afghanis"
-msgstr "?plural:Afganai"
+msgstr "?plural:Afganoj"
 
 #: data/nation/afghani.ruleset:6
 msgid ""
@@ -19921,24 +20066,19 @@ msgid ""
 "The Afghanistan nation-state as it is known today came into existence in "
 "1746 when Ahmad Shah founded the Durrani Empire."
 msgstr ""
-"Afganistanas, dažnai vadinamas Centrinės Azijos kryžkele, turėjo labai "
-"neramią istoriją. Per amžius šalis buvo okupuota daugybės jėgų, tarp jų "
-"Persų imperijos, Čingischano ir Aleksandro Makedoniečio. Afganistanas, kaip "
-"tautinė valstybė, pradėjo egzistuoti 1746m., kai Ahmadas Šahas įkurė Duranų "
-"imperijÄ…."
 
 #: data/nation/afghani.ruleset:24
 msgid "Emir"
-msgstr "Emyras"
+msgstr "Emiro"
 
 #: data/nation/afghani.ruleset:25 data/nation/slovakian.ruleset:30
 #: data/nation/soviet.ruleset:27
 msgid "General Secretary"
-msgstr "Generalinis sekretorius"
+msgstr "Äœenerala Sekretario"
 
 #: data/nation/afghani.ruleset:26
 msgid "Mullah"
-msgstr "Mula"
+msgstr "Mulao"
 
 #: data/nation/afghani.ruleset:27 data/nation/australian.ruleset:25
 #: data/nation/british.ruleset:22 data/nation/burmese.ruleset:24
@@ -19955,97 +20095,93 @@ msgstr "Mula"
 #: data/nation/swedish.ruleset:33 data/nation/tibetan.ruleset:29
 #: data/nation/welsh.ruleset:27
 msgid "Prime Minister"
-msgstr "Premjeras"
+msgstr "Ĉefinistro"
 
 #: data/nation/algerian.ruleset:3
 msgid "Algerian"
-msgstr "Alžyro"
+msgstr "Alĝeria"
 
 #: data/nation/algerian.ruleset:4
 msgid "?plural:Algerians"
-msgstr "?plural:Alžyriečiai"
+msgstr "?plural:Alĝerianoj"
 
 #: data/nation/algerian.ruleset:6
 msgid ""
 "Algeria is an Arabic nation in North Africa. It is historically inhabited by "
 "the Berber people."
 msgstr ""
-"Alžyras yra arabų šalis šiaurės Afrikoje. Istoriškai nuo seno joje gyvena "
-"berberų tautybės žmonės."
 
 #: data/nation/american.ruleset:3
 msgid "American"
-msgstr "Amerikos"
+msgstr "Usona"
 
 #: data/nation/american.ruleset:4
 msgid "?plural:Americans"
-msgstr "?plural:Amerikiečiai"
+msgstr "?plural:Usonanoj"
 
 #: data/nation/american.ruleset:6
 msgid ""
 "Formally named the United States of America.  Independent from Great Britain "
 "after a revolution in 1776-1783AD."
 msgstr ""
-"Oficialus pavadinimas yra JungtinÄ—s Amerikos Valstijos. Po 1776-1783 "
-"įvykusios revoliucijos išsikovojo nepriklausomybę nuo Didžiosios Britanijos."
 
 #: data/nation/american.ruleset:51 data/nation/scottish.ruleset:25
 msgid "Speaker"
-msgstr "Spikeris"
+msgstr "Informisto"
 
 #: data/nation/american.ruleset:52 data/nation/texan.ruleset:20
 msgid "Reverend"
-msgstr "Å ventasis"
+msgstr "Reverendo"
 
 #: data/nation/antarctican.ruleset:3
 msgid "Antarctican"
-msgstr "Antarktidos"
+msgstr "Antarkta"
 
 #: data/nation/antarctican.ruleset:4
 msgid "?plural:Antarcticans"
-msgstr "?plural:Antarktidiečiai"
+msgstr "?plural:Antarktanoj"
 
 #: data/nation/antarctican.ruleset:6
 msgid "Independent South Pole, land of penguins."
-msgstr "Nepriklausomas Pietų ašigalis, pingvinų kraštas"
+msgstr "AÅ­tonoma Sud-Poluso, lando de pingvenoj"
 
 #: data/nation/arab.ruleset:3
 msgid "Arab"
-msgstr "Arabijos"
+msgstr "Araba"
 
 #: data/nation/arab.ruleset:4
 msgid "?plural:Arabs"
-msgstr "?plural:Arabai"
+msgstr "?plural:Araboj"
 
 #: data/nation/arab.ruleset:6
 msgid "The Arab/Islamic civilization of 622AD-1495AD."
-msgstr "Arabų/Islamo civilizacija 622 - 1495 m. po Kr."
+msgstr ""
 
 #: data/nation/arab.ruleset:20
 msgid "Caliph"
-msgstr "Kalifas"
+msgstr "Kalifo"
 
 #: data/nation/aramean.ruleset:3
 msgid "Aramean"
-msgstr "Aramėjų"
+msgstr "Aramea"
 
 #: data/nation/aramean.ruleset:4
 msgid "?plural:Arameans"
-msgstr "?plural:AramÄ—jai"
+msgstr "?plural:Arameoj"
 
 #: data/nation/aramean.ruleset:6
 msgid ""
 "According to legend, the Aramean people are the descendants of Aram, the "
 "grandson of Noah."
-msgstr "Pasak legendos, aramėjai yra Aramo, Nojaus anūko, palikuonys."
+msgstr ""
 
 #: data/nation/armenian.ruleset:3
 msgid "Armenian"
-msgstr "ArmÄ—nijos"
+msgstr "Armena"
 
 #: data/nation/armenian.ruleset:4
 msgid "?plural:Armenians"
-msgstr "?plural:ArmÄ—nai"
+msgstr "?plural:Armenoj"
 
 #: data/nation/armenian.ruleset:6
 msgid ""
@@ -20053,23 +20189,19 @@ msgid ""
 "great-great-grandson of Noah. The modern Republic of Armenia gained "
 "independence from Soviet in 1991 AD"
 msgstr ""
-"Pasak legendos, armėnai yra Haiko, Nojaus proproanūkio, palikuonys. Moderni "
-"Armėnijos respublika nepriklausomybę nuo Sovietų Sąjungos gavo 1991m."
 
 #: data/nation/assyrian.ruleset:3
 msgid "Assyrian"
-msgstr "Asirijos"
+msgstr "Asira"
 
 #: data/nation/assyrian.ruleset:4
 msgid "?plural:Assyrians"
-msgstr "?plural:Asirai"
+msgstr "?plural:Asiroj"
 
 #: data/nation/assyrian.ruleset:6
 msgid ""
 "Assyria was an empire in northern Mesopotamia, named after its capital Ashur."
 msgstr ""
-"Asyrija buvo imperija Å¡iaurÄ—s Mesopotamijoje, pavadinta pagal savo sostinÄ™ "
-"AÅ¡urÄ…."
 
 #: data/nation/assyrian.ruleset:21
 msgid "Malka"
@@ -20081,11 +20213,11 @@ msgstr ""
 
 #: data/nation/argentine.ruleset:3
 msgid "Argentine"
-msgstr "Argentinos"
+msgstr "Argentina"
 
 #: data/nation/argentine.ruleset:4
 msgid "?plural:Argentines"
-msgstr "?plural:Argentiniečiai"
+msgstr "?plural:Argentinanoj"
 
 #. TRANS: The fourth letter in "Peron" should be
 #. TRANS: U+00F3 LATIN SMALL LETTER O WITH ACUTE if available in
@@ -20101,11 +20233,11 @@ msgstr ""
 
 #: data/nation/australian.ruleset:3
 msgid "Australian"
-msgstr "Australijos"
+msgstr "AÅ­stralia"
 
 #: data/nation/australian.ruleset:4
 msgid "?plural:Australians"
-msgstr "?plural:Australai"
+msgstr "?plural:AÅ­stralianoj"
 
 #: data/nation/australian.ruleset:6
 msgid ""
@@ -20115,11 +20247,11 @@ msgstr ""
 
 #: data/nation/austrian.ruleset:3
 msgid "Austrian"
-msgstr "Austrijos"
+msgstr "AÅ­stria"
 
 #: data/nation/austrian.ruleset:4
 msgid "?plural:Austrians"
-msgstr "?plural:Austrai"
+msgstr "?plural:AÅ­strianoj"
 
 #: data/nation/austrian.ruleset:6
 msgid ""
@@ -20129,11 +20261,11 @@ msgstr ""
 
 #: data/nation/aztec.ruleset:3
 msgid "Aztec"
-msgstr "Actekų"
+msgstr "Azteka"
 
 #: data/nation/aztec.ruleset:4
 msgid "?plural:Aztecs"
-msgstr "?plural:Actekai"
+msgstr "?plural:Aztekoj"
 
 #: data/nation/aztec.ruleset:6
 msgid ""
@@ -20153,11 +20285,11 @@ msgstr ""
 
 #: data/nation/babylonian.ruleset:3
 msgid "Babylonian"
-msgstr "Babilono"
+msgstr "Babilona"
 
 #: data/nation/babylonian.ruleset:4
 msgid "?plural:Babylonians"
-msgstr "?plural:Babiloniečiai"
+msgstr "?plural:Babilonanoj"
 
 #: data/nation/babylonian.ruleset:6
 msgid ""
@@ -20165,9 +20297,6 @@ msgid ""
 "BC under a succession of peoples including Amorites, Kassites, Assyrians, "
 "and Chaldeans."
 msgstr ""
-"Babilonas buvo dominuojantis Mesopotamijos miestas nuo XVIIIa. iki VIIa. "
-"prieš Kristų. Jį sėkmingai valdė tautos, tokios kaip amoritai, kasitai, "
-"asirai ir chaldÄ—jai."
 
 #: data/nation/babylonian.ruleset:22 data/nation/sumerian.ruleset:21
 msgid "Lugal"
@@ -20175,39 +20304,37 @@ msgstr ""
 
 #: data/nation/barbarian.ruleset:4
 msgid "?plural:Barbarians"
-msgstr "?plural:barbarus"
+msgstr "?plural:Barbaroj"
 
 #: data/nation/barbarian.ruleset:5
 msgid ""
 "Since the dawn of civilization, barbarians have been a threat to cultured "
 "peoples everywhere."
 msgstr ""
-"Nuo pat civilizacijų aušros, barbarai kėlė grėsmę civilizuotiems žmonėms "
-"visame pasaulyje."
 
 #: data/nation/bavarian.ruleset:3
 msgid "Bavarian"
-msgstr "Bavarijos"
+msgstr "Bavara"
 
 #: data/nation/bavarian.ruleset:4
 msgid "?plural:Bavarians"
-msgstr "?plural:Bavarai"
+msgstr "?plural:Bavaroj"
 
 #: data/nation/bavarian.ruleset:6
 msgid ""
 "Bavaria, before national unification in 1870AD, was one of the largest of "
 "the German kingdoms."
 msgstr ""
-"Bavarija, prieš nacionalinį suvienijimą 1870 m., buvo viena didžiausių "
-"Vokietijos karalysčių."
+"Bavario, antaŭ la nacia unuiĝo je 1870 PK, estis unu el la plej vastaj "
+"ĝermanaj reĝlandoj."
 
 #: data/nation/belgian.ruleset:3
 msgid "Belgian"
-msgstr "Belgijos"
+msgstr "Belga"
 
 #: data/nation/belgian.ruleset:4
 msgid "?plural:Belgians"
-msgstr "?plural:Belgai"
+msgstr "?plural:Belgoj"
 
 #: data/nation/belgian.ruleset:6
 msgid ""
@@ -20219,11 +20346,11 @@ msgstr ""
 
 #: data/nation/bengali.ruleset:3
 msgid "Bengali"
-msgstr "Bengalų"
+msgstr "Bengala"
 
 #: data/nation/bengali.ruleset:4
 msgid "?plural:Bengalis"
-msgstr "?plural:Bengalai"
+msgstr "?plural:Bengalanoj"
 
 #: data/nation/bengali.ruleset:6
 msgid ""
@@ -20236,19 +20363,19 @@ msgstr ""
 
 #: data/nation/bengali.ruleset:25
 msgid "Nabob"
-msgstr "Nabobas"
+msgstr ""
 
 #: data/nation/bengali.ruleset:26
 msgid "Major"
-msgstr "Mejoras"
+msgstr ""
 
 #: data/nation/boer.ruleset:3
 msgid "Boer"
-msgstr "Būrų"
+msgstr "Bura"
 
 #: data/nation/boer.ruleset:4
 msgid "?plural:Boers"
-msgstr "?plural:BÅ«rai"
+msgstr "?plural:Buroj"
 
 #: data/nation/boer.ruleset:6
 msgid ""
@@ -20256,85 +20383,78 @@ msgid ""
 "1650AD.  They briefly controlled two republics, the Transvaal and the Orange "
 "Free State, before being defeated by the British in the war of 1899-1902."
 msgstr ""
-"Būrai buvo olandų naujakuriai britų kontroliuojamoje Pietų Afrikoje 1650m. "
-"Jie trumpai kontroliavo dvi respublikas, Transvalį ir Laisvąją Oranžinę "
-"Valstiją, kol buvo buvo britų nugalėti Būrų kare 1899m. - 1902m."
 
 #: data/nation/bosnia.ruleset:3
+#, fuzzy
 msgid "Bosnia & Herzegovina"
-msgstr "Bosnijos ir Hercegovinos"
+msgstr "Bosnia - Hercegovina"
 
 #: data/nation/bosnia.ruleset:4
 msgid "?plural:Bosnians"
-msgstr "?plural:Bosniai"
+msgstr "?plural:Bosnianoj"
 
 #: data/nation/bosnia.ruleset:6
 msgid ""
 "Bosnia and Herzegovina is a country in south-east Europe, and the home of "
 "three constituent peoples: Bosniaks, Serbs, and Croats."
 msgstr ""
-"Bosnia ir Hercegovina yra šalis pietryčių Europoje ir gimtinė trims šią šalį "
-"sudarančioms tautoms: bosniams, serbams ir kroatams."
 
 #: data/nation/bosnia.ruleset:26
 msgid "Ban"
-msgstr "Kunigaikštis"
+msgstr "Duko"
 
 #: data/nation/brazilian.ruleset:3
 msgid "Brazilian"
-msgstr "Brazilijos"
+msgstr "Brazila"
 
 #: data/nation/brazilian.ruleset:4
 msgid "?plural:Brazilians"
-msgstr "?plural:Brazilai"
+msgstr "?plural:Brazilanoj"
 
 #: data/nation/brazilian.ruleset:6
 msgid ""
 "Brazil was founded as a colony of Portugal but became independent in 1822AD. "
 "It is the only country in the New World that has been the seat of a monarchy."
 msgstr ""
-"Brazilija buvo įkurta kaip Portugalijos kolonija, bet tapo nepriklausoma "
-"1822 m. Tai vienintelÄ— Naujojo pasaulio kolonija, kuri turÄ—jo nuosavÄ… "
-"monarchijÄ…."
 
 #: data/nation/brazilian.ruleset:22 data/nation/iraqi.ruleset:21
 #: data/nation/roman.ruleset:39
 msgid "Dictator"
-msgstr "Diktatorius"
+msgstr "Diktatoro"
 
 #: data/nation/brazilian.ruleset:22 data/nation/roman.ruleset:39
 msgid "Dictatrix"
-msgstr "DiktatorÄ—"
+msgstr "Diktatorino"
 
 #: data/nation/brazilian.ruleset:23 data/nation/byzantium.ruleset:25
 #: data/nation/roman.ruleset:40
 msgid "Imperator"
-msgstr "Imperatorius"
+msgstr "Imperiestro"
 
 #: data/nation/brazilian.ruleset:23 data/nation/byzantium.ruleset:25
 #: data/nation/roman.ruleset:40
 msgid "Imperatrix"
-msgstr "ImperatorÄ—"
+msgstr "Imperiestrino"
 
 #: data/nation/brazilian.ruleset:25 data/nation/chinese.ruleset:32
 msgid "Chairman"
-msgstr ""
+msgstr "Prezidanto"
 
 #: data/nation/brazilian.ruleset:25 data/nation/chinese.ruleset:32
 msgid "Chairperson"
-msgstr ""
+msgstr "Estro"
 
 #: data/nation/brazilian.ruleset:26 data/nation/romanian.ruleset:37
 msgid "Director-President"
-msgstr "Direktorius-prezidentas"
+msgstr "Direktoro-Prezidanto"
 
 #: data/nation/british.ruleset:3
 msgid "British"
-msgstr "Britanijos"
+msgstr "Brita"
 
 #: data/nation/british.ruleset:4
 msgid "?plural:Britons"
-msgstr "?plural:Britai"
+msgstr "?plural:Britoj"
 
 #: data/nation/british.ruleset:6
 msgid ""
@@ -20343,33 +20463,28 @@ msgid ""
 "Great Britain - became the leading industrial and maritime power in the 19th "
 "century."
 msgstr ""
-"Jungtinė Karalystė buvo sukurta 1707m. įvykus susitarimui tarp Anglijos ir "
-"Škotijos karalysčių. Ši šalis, dar kitaip žinoma kaip Didžioji Britanija, "
-"tapo pirmaujančia pramonine ir jūrine jėga XIXa."
 
 #: data/nation/bulgarian.ruleset:3
 msgid "Bulgarian"
-msgstr "Bulgarijos"
+msgstr "Bulgara"
 
 #: data/nation/bulgarian.ruleset:4
 msgid "?plural:Bulgarians"
-msgstr "?plural:Bulgarai"
+msgstr "?plural:Bulgaroj"
 
 #: data/nation/bulgarian.ruleset:6
 msgid ""
 "Bulgar leader Khan Asparukh led his people into the northern Balkans, and "
 "founded Bulgaria in 681. This was the first Slavic nation-state in history."
 msgstr ""
-"Bulgarų vadas Khanas Asparukhas vedė savo žmones į šiaurės Balkanus  ir "
-"įkūrė Bulgariją 681 m. Tai buvo pirmoji slaviška valstybė istorijoje."
 
 #: data/nation/bulgarian.ruleset:31
 msgid "Tzar"
-msgstr "Caras"
+msgstr "Caro"
 
 #: data/nation/bulgarian.ruleset:31
 msgid "Tzaritza"
-msgstr "CarienÄ—"
+msgstr "Carino"
 
 #: data/nation/bulgarian.ruleset:34
 msgid "Drugariat"
@@ -20382,7 +20497,7 @@ msgstr ""
 #: data/nation/bulgarian.ruleset:35 data/nation/byzantium.ruleset:26
 #: data/nation/russian.ruleset:49
 msgid "Patriarch"
-msgstr "Patriarchas"
+msgstr "Patriarko"
 
 #: data/nation/bulgarian.ruleset:35
 msgid "Sveta Maika"
@@ -20390,19 +20505,17 @@ msgstr ""
 
 #: data/nation/burmese.ruleset:3
 msgid "Burmese"
-msgstr "Birmiečių"
+msgstr "Birma"
 
 #: data/nation/burmese.ruleset:4
 msgid "?plural:Burmese"
-msgstr "?plural:Birmiečiai"
+msgstr "?plural:Birmanoj"
 
 #: data/nation/burmese.ruleset:6
 msgid ""
 "The Union of Burma (officially \"Myanmar\") is the largest country in "
 "mainland Southeast Asia."
 msgstr ""
-"Burmos Sąjunga (oficialiai \"Mianmaras\") yra didžiausia pietryčių Azijos "
-"Å¡alis.."
 
 #: data/nation/burmese.ruleset:21
 msgid "Bohmugyi"
@@ -20418,11 +20531,11 @@ msgstr ""
 
 #: data/nation/byzantium.ruleset:3
 msgid "Byzantine"
-msgstr "Bizantijos"
+msgstr "Bizanca"
 
 #: data/nation/byzantium.ruleset:4
 msgid "?plural:Byzantines"
-msgstr "?plural:Bizantiečiai"
+msgstr "?plural:Bizancanoj"
 
 #: data/nation/byzantium.ruleset:6
 msgid ""
@@ -20436,31 +20549,29 @@ msgstr ""
 
 #: data/nation/byzantium.ruleset:27
 msgid "Basileus"
-msgstr "BazilÄ—jus"
+msgstr "Bizanca Imperiestro"
 
 #: data/nation/canadian.ruleset:3
 msgid "Canadian"
-msgstr "Kanados"
+msgstr "Kanada"
 
 #: data/nation/canadian.ruleset:4
 msgid "?plural:Canadians"
-msgstr "?plural:Kanadiečiai"
+msgstr "?plural:Kanadanoj"
 
 #: data/nation/canadian.ruleset:7
 msgid ""
 "Canada is the geographically northernmost country in world: The Magnetic "
 "North Pole currently lies on Canadian territory."
 msgstr ""
-"Kanada yra geografiškai šiauriausia šalis: Šiaurinis magnetinis polius yra "
-"Kanados teritorijoje."
 
 #: data/nation/carthaginian.ruleset:3
 msgid "Carthaginian"
-msgstr "Kartaginos"
+msgstr "Kartaga"
 
 #: data/nation/carthaginian.ruleset:4
 msgid "?plural:Carthaginians"
-msgstr "?plural:Kartaginiečiai"
+msgstr "?plural:Kartaganoj"
 
 #: data/nation/carthaginian.ruleset:8
 msgid ""
@@ -20468,56 +20579,53 @@ msgid ""
 "the Mediterranean from the 5th to 2nd centuries BC. Carthage was destroyed "
 "by Rome in 146BC."
 msgstr ""
-"Kartaginiečiai, finikiečių pirklių palikuonys, valdė jūrų imperiją "
-"Viduržemio jūroje nuo Va. iki IIa. prieš Kristų. Kartagina buvo sunaikinta "
-"romėnų 146m. prieš Kristų."
+"Kartaganoj, idoj de fenicaj komercantoj, kreis ŝipan imperon en Mediteraneo "
+"de la 5a ĝis la 2a centjaro AK. Kartago estis detruita de Romianoj dum 146 "
+"AK."
 
 #: data/nation/catalan.ruleset:3
 msgid "Catalan"
-msgstr "Katalonijos"
+msgstr "Kataluna"
 
 #: data/nation/catalan.ruleset:4
 msgid "?plural:Catalans"
-msgstr "?plural:Katalonai"
+msgstr "?plural:Katalunoj"
 
 #: data/nation/catalan.ruleset:6
-#, fuzzy
 msgid ""
 "Catalunya (aka Catalonia in English) is the north-eastern-most coastal "
 "region of Spain near the southern foot of the Pyrenees."
 msgstr ""
-"Catalunya (arba Katalonija lietuviškai) yra šiaurės rytų Ispanijos pakrantės "
-"regionas."
 
 #: data/nation/catalan.ruleset:24
 msgid "Primer Ministre"
-msgstr "Ministras Pirmininkas"
+msgstr "Ĉefministro"
 
 #: data/nation/catalan.ruleset:24
 msgid "Primera Ministre"
-msgstr "MinistrÄ— PirmininkÄ—"
+msgstr "Ĉefministro"
 
 #: data/nation/catalan.ruleset:25 data/nation/galician.ruleset:23
 #: data/nation/venezuelan.ruleset:29
 msgid "Dictador"
-msgstr "Diktatorius"
+msgstr "Diktatoro"
 
 #: data/nation/catalan.ruleset:25 data/nation/galician.ruleset:23
 #: data/nation/venezuelan.ruleset:29
 msgid "Dictadora"
-msgstr "DiktatorÄ—"
+msgstr "Diktatorino"
 
 #: data/nation/catalan.ruleset:26 data/nation/galician.ruleset:24
 msgid "Rei"
-msgstr ""
+msgstr "Reĝo"
 
 #: data/nation/catalan.ruleset:26
 msgid "Reina"
-msgstr ""
+msgstr "Reĝino"
 
 #: data/nation/catalan.ruleset:28
 msgid "Arquebisbe"
-msgstr "Arkivyskupas"
+msgstr "Ĉefepiskopo"
 
 #: data/nation/catalan.ruleset:28
 msgid "Gran Bruixa"
@@ -20525,36 +20633,36 @@ msgstr ""
 
 #: data/nation/chilean.ruleset:3
 msgid "Chilean"
-msgstr "ÄŒilÄ—s"
+msgstr "Ĉilia"
 
 #: data/nation/chilean.ruleset:4
 msgid "?plural:Chileans"
-msgstr "?plural:Čiliečiai"
+msgstr "?plural:Ĉilianoj"
 
 #: data/nation/chilean.ruleset:6
 msgid "Chile is located on the south-western coast of South America."
-msgstr "Čilė yra prie pietvakarinio Pietų Amerikos kranto."
+msgstr "Ĉilio estas ĉe la sud-okcidenta marbordo de Suda Ameriko."
 
 #: data/nation/chilean.ruleset:24
 msgid "Captain General"
-msgstr "Kapitonas generolas"
+msgstr "Kapitan-Generalo"
 
 #: data/nation/chilean.ruleset:25 data/nation/french.ruleset:27
 #: data/nation/german.ruleset:35 data/nation/irish.ruleset:46
 msgid "Archbishop"
-msgstr "Arkivyskupas"
+msgstr "Ĉefepiskopo"
 
 #: data/nation/chilean.ruleset:26
 msgid "Supreme Director"
-msgstr "Aukščiausiasis direktorius"
+msgstr "Äœenerala Direktoro"
 
 #: data/nation/chinese.ruleset:3
 msgid "Chinese"
-msgstr "Kinijos"
+msgstr "Ĉina"
 
 #: data/nation/chinese.ruleset:4
 msgid "?plural:Chinese"
-msgstr "?plural:Kinai"
+msgstr "?plural:Ĉinoj"
 
 #: data/nation/chinese.ruleset:6
 msgid ""
@@ -20566,31 +20674,23 @@ msgid ""
 "occupies the mainland, while the former Nationalist government of the "
 "Republic of China had fled to the island of Taiwan after the civil war."
 msgstr ""
-"Kinija yra seniausia pagrindinÄ— dar egzistuojanti civilizacija, kurios "
-"rašytiniai šaltiniai datuojami 3500m. prieš Kristų. Po to, kai buvo "
-"suvienyta Qin dinastijos 221m. prieš Kristų, Kinijoje pastoviai keitėsi du "
-"periodai – vienybės ir skaidymosi. Dėl to Kinija dažnai buvo užkariaujama "
-"išorinių genčių. Šiais laikais, Kinijos liaudies respublika, komunistų "
-"įkurta 1949m., užima žemyninę dalį, kai ankstesnė nacionalistinė Kinijos "
-"respublikos vyriausybė valdo Taivaną, į kurį paspruko po kilusio pilietinio "
-"karo."
 
 #: data/nation/chinese.ruleset:31 data/nation/japanese.ruleset:20
 #: data/nation/manchu.ruleset:21 data/nation/vietnamese.ruleset:23
 msgid "Emperor"
-msgstr "Imperatorius"
+msgstr "Imperiestro"
 
 #: data/nation/chinese.ruleset:31
 msgid "Dowager"
-msgstr ""
+msgstr "Reĝino-Patrino"
 
 #: data/nation/colombian.ruleset:3
 msgid "Colombian"
-msgstr "Kolumbijos"
+msgstr "Kolombia"
 
 #: data/nation/colombian.ruleset:4
 msgid "?plural:Colombians"
-msgstr "?plural:Kolumbiečiai"
+msgstr "?plural:Kolombianoj"
 
 #: data/nation/colombian.ruleset:6
 msgid ""
@@ -20599,30 +20699,26 @@ msgid ""
 "Colombia's north coast around 1500. In 1819 the The Republic of Colombia "
 "gained independence."
 msgstr ""
-"Kolumbija yra šalis šiaurinėje Pietų Amerikos dalyje. Regionas buvo Amerikos "
-"indėnų kultūrinis centras prieš pasirodant europiečiams. Ispanai pradėjo "
-"kurtis Å¡iaurinÄ—je Kolumbijos pakrantÄ—je apie 1500. 1819m. Kolumbijos "
-"respublika tapo nepriklausoma."
 
 #: data/nation/colombian.ruleset:21 data/nation/swiss.ruleset:19
 msgid "General"
-msgstr "Generolas"
+msgstr "Generalo"
 
 #: data/nation/colombian.ruleset:22 data/nation/venezuelan.ruleset:27
 msgid "Governador"
-msgstr "Gubernatorius"
+msgstr "Guberniestro"
 
 #: data/nation/colombian.ruleset:22 data/nation/venezuelan.ruleset:27
 msgid "Governadora"
-msgstr "GubernatorÄ—"
+msgstr "Guberniestrino"
 
 #: data/nation/confederate.ruleset:3
 msgid "Confederate"
-msgstr "Konfederacijos"
+msgstr "Konfederaciita"
 
 #: data/nation/confederate.ruleset:4
 msgid "?plural:Confederates"
-msgstr "?plural:Konfederatai"
+msgstr "?plural:Konfederaciitoj"
 
 #: data/nation/confederate.ruleset:6
 msgid ""
@@ -20631,36 +20727,40 @@ msgid ""
 "but had to abandon their claims of independence a few years later after "
 "several military defeats by United States troops."
 msgstr ""
+"Konfederaciitaj Åœtatoj de Ameriko estis secesia nacio de Usono dum la "
+"Amerika Intercivitana Milito. Ĝi naskiĝis en 1861 de ses Sudistaj ŝtatoj sed "
+"ili forlasis siajn pretendojn de aÅ­tonomeco post kelkaj jaroj, post multaj "
+"malvenkoj aljuĝitaj de la usona soldataro."
 
 #: data/nation/cornish.ruleset:3
 msgid "Cornish"
-msgstr "Kornių"
+msgstr "Kornvala"
 
 #: data/nation/cornish.ruleset:4
 msgid "?plural:Cornish"
-msgstr "?plural:Korniai"
+msgstr "?plural:Kornvalanoj"
 
 #: data/nation/cornish.ruleset:6
 msgid ""
 "Cornwall is a region in the extreme southwest of England, traditionally the "
 "home of the legendary King Arthur."
 msgstr ""
-"Kornvalis yra pačiuose Anglijos pietvakariuose. Jis laikomas legendinio "
-"karaliaus Arturo gimtine."
+"Kornvalo estas regiono en la ekstrema sud-okcidenta parto de Anglio, kaj laÅ­ "
+"la tradicio ĝi estis la patrujo de legenda Reĝo Arturo."
 
 #: data/nation/cornish.ruleset:20 data/nation/french.ruleset:25
 #: data/nation/gallic.ruleset:22 data/nation/irish.ruleset:44
 #: data/nation/scottish.ruleset:24 data/nation/welsh.ruleset:25
 msgid "Chieftain"
-msgstr "Vadeiva"
+msgstr ""
 
 #: data/nation/croatian.ruleset:3
 msgid "Croatian"
-msgstr "Kroatijos"
+msgstr "Kroata"
 
 #: data/nation/croatian.ruleset:4
 msgid "?plural:Croatians"
-msgstr "?plural:Kroatai"
+msgstr "?plural:Kroatoj"
 
 #: data/nation/croatian.ruleset:6
 msgid ""
@@ -20672,11 +20772,11 @@ msgstr ""
 
 #: data/nation/cuban.ruleset:3
 msgid "Cuban"
-msgstr "Kubos"
+msgstr "Kuba"
 
 #: data/nation/cuban.ruleset:4
 msgid "?plural:Cubans"
-msgstr "?plural:Kubiečiai"
+msgstr "?plural:Kubanoj"
 
 #: data/nation/cuban.ruleset:6
 msgid ""
@@ -20684,39 +20784,38 @@ msgid ""
 "centuries, the island became one of the leading producers of tobacco, sugar "
 "and coffee in the world. Cuba was granted nominal independence in 1902."
 msgstr ""
-"Kuba tapo pavaldi Ispanijai XVIa. Vėlesniais šimtmečiais sala tapo viena "
-"pirmaujančių tabako, cukraus ir kavos gamintojų. Nominali nepriklausomybė "
-"suteikta 1902m."
 
 #: data/nation/czech.ruleset:3
 msgid "Czech"
-msgstr "ÄŒekijos"
+msgstr "Ĉeĥa"
 
 #: data/nation/czech.ruleset:4
 msgid "?plural:Czechs"
-msgstr "?plural:Čekų"
+msgstr "?plural:Ĉeĥoj"
 
 #: data/nation/czech.ruleset:6
 msgid ""
 "Today's Czech Republic was until 1993 part of Czechoslovakia, which had been "
 "until 1918 part of the Austro-Hungarian Empire."
 msgstr ""
+"Hodiaŭa Ĉeĥa Respubliko estis parto de Ĉeĥoslovakio ĝis 1993, kiu estis "
+"parto de Aŭstra-Hungara Imperio ĝis 1918."
 
 #: data/nation/czech.ruleset:36
 msgid "Thane"
-msgstr "Tanas"
+msgstr ""
 
 #: data/nation/czech.ruleset:36
 msgid "Prophetess"
-msgstr "Pranašė"
+msgstr "Profetino"
 
 #: data/nation/danish.ruleset:3
 msgid "Danish"
-msgstr "Danijos"
+msgstr "Dana"
 
 #: data/nation/danish.ruleset:4
 msgid "?plural:Danes"
-msgstr "?plural:Danai"
+msgstr "?plural:Danoj"
 
 #. TRANS: The third letter in "Blatand" should be
 #. TRANS: A+00E5 LATIN SMALL LETTER A WITH RING if available in
@@ -20729,11 +20828,11 @@ msgstr ""
 
 #: data/nation/dutch.ruleset:3
 msgid "Dutch"
-msgstr "Olandijos"
+msgstr "Nederlanda"
 
 #: data/nation/dutch.ruleset:4
 msgid "?plural:Dutch"
-msgstr "?plural:Olandai"
+msgstr "?plural:Nederlandanoj"
 
 #: data/nation/dutch.ruleset:6
 msgid ""
@@ -20745,11 +20844,11 @@ msgstr ""
 
 #: data/nation/egyptian.ruleset:3
 msgid "Egyptian"
-msgstr "Egipto"
+msgstr "Egipta"
 
 #: data/nation/egyptian.ruleset:4
 msgid "?plural:Egyptians"
-msgstr "?plural:Egiptiečiai"
+msgstr "?plural:Egiptanoj"
 
 #: data/nation/egyptian.ruleset:6
 msgid ""
@@ -20757,25 +20856,25 @@ msgid ""
 "times it has been unusually urbanized, supporting a large population on silt "
 "deposited by the annual floodings of the Nile."
 msgstr ""
-"Egiptas buvo antra pagal senumÄ… pasaulio civilizacija. Nuo senovÄ—s ten buvo "
-"neįprastai daug miestų, išlaikančių didelę populiaciją dėl dumblo sunešto "
-"kasmetiniais Nilo potvyniais."
+"Egipto estis la dua el la plej antikvaj civilizo en la mondo. Ekde de "
+"antikva tempo ĝi estas nekutime urbanizita, kun la ĉeesto de multnombra "
+"loĝantaro pro la fruktodona deponaĵo post la jara superakvo de Nilo."
 
 #: data/nation/egyptian.ruleset:26
 msgid "Pharaoh"
-msgstr "Faraonas"
+msgstr "Faraono"
 
 #: data/nation/egyptian.ruleset:27
 msgid "Great Pharaoh"
-msgstr "Didysis faraonas"
+msgstr "Granda Faraono"
 
 #: data/nation/english.ruleset:3
 msgid "English"
-msgstr "Anglijos"
+msgstr "Angla"
 
 #: data/nation/english.ruleset:4
 msgid "?plural:English"
-msgstr "?plural:Anglų"
+msgstr "?plural:Angloj"
 
 #: data/nation/english.ruleset:6
 msgid ""
@@ -20783,62 +20882,55 @@ msgid ""
 "AD, only to be conquered by William of Normandy a century later, in the last "
 "successful invasion of the country."
 msgstr ""
-"Anglija buvo suvienyta Alfredo Didžiojo iš Vesekso IXa. pabaigoje po "
-"Kristaus tik tam, kad šimtmečiu vėliau būtų užkariauta Viljamo iš "
-"Normandijos paskutinėje sėkmingoje invazijoje į šalį."
 
 #: data/nation/english.ruleset:26
 msgid "Lord Protector"
-msgstr "Lordas protektorius"
+msgstr "Lordo-Protektanto"
 
 #: data/nation/english.ruleset:26
 msgid "Lady Protector"
-msgstr "Ledi protektorÄ—"
+msgstr "Lordino-Protektanto"
 
 #: data/nation/estonian.ruleset:3
 msgid "Estonian"
-msgstr "Estijos"
+msgstr "Estona"
 
 #: data/nation/estonian.ruleset:4
 msgid "?plural:Estonians"
-msgstr "?plural:Estai"
+msgstr "?plural:Estonoj"
 
 #: data/nation/estonian.ruleset:6
 msgid ""
 "Estonia is a small country on the south shore of the eastern Baltic Sea.  "
 "Its people and language are closely related to those of Finland."
 msgstr ""
-"Estija yra maža šalis rytiniame Baltijos jūros krante. Jos gyventojai ir "
-"kalba yra artimai susijusi su Suomija."
 
 #: data/nation/ethiopian.ruleset:3
 msgid "Ethiopian"
-msgstr "Etiopijos"
+msgstr "Etiopa"
 
 #: data/nation/ethiopian.ruleset:4
 msgid "?plural:Ethiopians"
-msgstr "?plural:Etiopai"
+msgstr "?plural:Etiopoj"
 
 #: data/nation/ethiopian.ruleset:6
 msgid ""
 "Ethiopia is the oldest nation in Africa and the only one to remain "
 "independent during European colonialism."
 msgstr ""
-"Etopija yra seniausia Afrikos valstybė ir vienintelė išlikusi nepriklausoma "
-"Europai kolonizuojant AfrikÄ…."
 
 #: data/nation/ethiopian.ruleset:24
 #, fuzzy
 msgid "Emporer"
-msgstr "TyrinÄ—tojas"
+msgstr "Skolto"
 
 #: data/nation/filipino.ruleset:3
 msgid "Filipino"
-msgstr "Filipinų"
+msgstr "Filipina"
 
 #: data/nation/filipino.ruleset:4
 msgid "?plural:Filipinos"
-msgstr "?plural:Filipiniečiai"
+msgstr "?plural:Filipinanoj"
 
 #: data/nation/filipino.ruleset:7
 msgid ""
@@ -20848,129 +20940,120 @@ msgstr ""
 
 #: data/nation/finnish.ruleset:3
 msgid "Finnish"
-msgstr "Suomijos"
+msgstr "Finna"
 
 #: data/nation/finnish.ruleset:4
 msgid "?plural:Finns"
-msgstr "?plural:Suomiai"
+msgstr "?plural:Finnoj"
 
 #: data/nation/finnish.ruleset:6
 msgid ""
 "Finland is a small, cold country on the northern fringe of Europe, noted for "
 "exporting timber, cellular phones, and world-class operating systems."
 msgstr ""
-"Suomija yra maža, šalta šalis šiauriniame Europos pakraštyje, žinoma dėl "
-"eksportuojamos medienos, mobiliųjų telefonų ir pasaulinės klasės operacinių "
-"sistemų."
+"Finlando estas eta, malvarma lando en la ekstrema nordo de Eŭropo; ĝi estas "
+"konata  pro eksportado de ligno, pro la porteblaj telefonetoj kaj pro "
+"mastrumaj sistemoj."
 
 #: data/nation/french.ruleset:3
 msgid "French"
-msgstr "Prancūzijos"
+msgstr "Franca"
 
 #: data/nation/french.ruleset:4
 msgid "?plural:French"
-msgstr "?plural:Prancūzai"
+msgstr "?plural:Francoj"
 
-# po Prancūzijos vėliava - Ar ne kalbos kultūros klaida?
 #: data/nation/french.ruleset:6
 msgid ""
 "France has long been a major power in Europe. French conquerer kings like "
 "Napoleon and Charlemagne each united large parts of Europe under the French "
 "flag."
 msgstr ""
-"Prancūzija ilgą laiką buvo pagrindinė jėga Europoje. Prancūzų užkariautojai "
-"karaliai kaip Napoleonas ir Karolis Didysis suvienijo dideles Europos dalis "
-"po Prancūzijos vėliava."
 
 #: data/nation/french.ruleset:26
 msgid "Premier"
-msgstr "Premjeras"
+msgstr "Premiero"
 
 #: data/nation/galician.ruleset:3
 msgid "Galician"
-msgstr "Galisų"
+msgstr "Galega"
 
 #: data/nation/galician.ruleset:4
 msgid "?plural:Galicians"
-msgstr "?plural:Galisai"
+msgstr "?plural:Galeganoj"
 
 #: data/nation/galician.ruleset:6
 msgid "Galicia is a region in the northwest of Spain, just above Portugal."
 msgstr ""
-"Galicija yra regionas šiaurės vakarų Ispanijoje, tiesiai virš Portugalijos."
 
 #: data/nation/galician.ruleset:22
 msgid "Primeiro Ministro"
-msgstr "Ministras Pirmininkas"
+msgstr "Ĉefministro"
 
 #: data/nation/galician.ruleset:22
 msgid "Primeira Ministra"
-msgstr "MinistrÄ— PirmininkÄ—"
+msgstr "Ĉefministro"
 
 #: data/nation/galician.ruleset:24
 msgid "Raina"
-msgstr ""
+msgstr "Reĝina"
 
 #: data/nation/galician.ruleset:25 data/nation/venezuelan.ruleset:30
 #: data/nation/venezuelan.ruleset:31 data/nation/venezuelan.ruleset:32
 msgid "Presidente"
-msgstr "Prezidentas"
+msgstr "Prezidanto"
 
 #: data/nation/galician.ruleset:25 data/nation/venezuelan.ruleset:30
 #: data/nation/venezuelan.ruleset:31 data/nation/venezuelan.ruleset:32
 msgid "Presidenta"
-msgstr "PrezidentÄ—"
+msgstr "Prezidantino"
 
 #: data/nation/galician.ruleset:26
 msgid "Gran Bardo"
-msgstr ""
+msgstr "Granda Bardo"
 
 #: data/nation/galician.ruleset:26
 msgid "Grande Bardesa"
-msgstr ""
+msgstr "Granda Bardino"
 
 #: data/nation/gallic.ruleset:3
 msgid "Gallic"
-msgstr "Galų"
+msgstr "GaÅ­la"
 
 #: data/nation/gallic.ruleset:4
 msgid "?plural:Gauls"
-msgstr "?plural:Galai"
+msgstr "?plural:GaÅ­loj"
 
 #: data/nation/gallic.ruleset:6
 msgid ""
 "The Gauls were a Celtic people occupying what is now France and Belgium."
 msgstr ""
-"Galai yra keltų tauta, įsikūrusi šiuolaikinės Prancūzijos ir Belgijos "
-"teritorijoje."
 
 #: data/nation/gallic.ruleset:23
 msgid "Druid"
-msgstr "Druidas"
+msgstr "Druido"
 
 #: data/nation/georgian.ruleset:3
 msgid "Georgian"
-msgstr "Gruzijos"
+msgstr "Kartvela"
 
 #: data/nation/georgian.ruleset:4
 msgid "?plural:Georgians"
-msgstr "?plural:Gruzinai"
+msgstr "?plural:Kartveloj"
 
 #: data/nation/georgian.ruleset:6
 msgid ""
 "The Georgians were one of the first peoples in history to adopt "
 "Christianity, in the 300s AD."
-msgstr ""
-"Gruzinai buvo pirmieji žmonės istorijoje, kurie 300 m. įtvirtino "
-"krikščionybę, kaip savo nacionalinę religiją."
+msgstr "Gruzoj estis en la unuaj popoloj kiuj adoptis Kristanismon, en 300 PK."
 
 #: data/nation/german.ruleset:3
 msgid "German"
-msgstr "Vokietijos"
+msgstr "Germana"
 
 #: data/nation/german.ruleset:4
 msgid "?plural:Germans"
-msgstr "?plural:Vokiečiai"
+msgstr "?plural:Germanoj"
 
 #: data/nation/german.ruleset:7
 msgid ""
@@ -20979,58 +21062,54 @@ msgid ""
 "After the war it was split into two states, which reunited in 1990 at the "
 "end of the Cold War."
 msgstr ""
-"Vokietija buvo suvienyta 1871 m. Prūsijos karine jėga. Po pirmojo pasaulinio "
-"karo ji tapo respublika, bet 1933 valdžią paėmus nacistams vėliau  pradėjo "
-"antrąjį pasaulinį karą. Po karo ji buvo padalinta į dvi dalis, kurios "
-"susijungÄ— 1990 m. Å¡altojo karo pabaigoje."
 
 #: data/nation/german.ruleset:34
 msgid "Chancellor"
-msgstr "Kancleris"
+msgstr "Kanceliero"
 
 #: data/nation/german.ruleset:36
 msgid "First Secretary"
-msgstr "Pirmasis sekretorius"
+msgstr "Ĉefa Ŝtatsekretario"
 
 #: data/nation/greek.ruleset:3
 msgid "Greek"
-msgstr "SenovÄ—s Graikijos"
+msgstr "Heleno"
 
 #: data/nation/greek.ruleset:4
 msgid "?plural:Greeks"
-msgstr "?plural:SenovÄ—s graikai"
+msgstr "?plural:Helenoj"
 
 #: data/nation/greek.ruleset:6
 msgid "The ancient Greeks, between Mycenae and the Roman conquest."
-msgstr "Senovės graikai, tarp Mikėnų ir Romos užkariavimo."
+msgstr "Antikvaj grekoj, de la micena dominado ĝis la unua romia konkero."
 
 #: data/nation/greek.ruleset:19
 msgid "Despot"
-msgstr "Despotas"
+msgstr "Despoto"
 
 #: data/nation/hellenic.ruleset:3
 msgid "Hellenic"
-msgstr "Graikijos"
+msgstr "Greka"
 
 #: data/nation/hellenic.ruleset:4
 msgid "?plural:Hellenes"
-msgstr "?plural:Graikai"
+msgstr "?plural:Grekoj"
 
 #: data/nation/hellenic.ruleset:6
 msgid ""
 "The Hellenic Republic - also known as Greece - was created when the Hellenic "
 "people gained independence from the Ottoman Empire in 1832."
 msgstr ""
-"Helenų Respublika (kitaip Graikija) buvo sukurta, kai helenai (graikai) "
-"iškovojo nepriklausomybę nuo Osmanų imperijos 1832m."
+"Helena Respubliko - ankaÅ­ konata kiel Grecio - estis kreita kiam la Grekoj "
+"gajnis la aÅ­tonomion el Otomana Imperio en 1832."
 
 #: data/nation/hittite.ruleset:3
 msgid "Hittite"
-msgstr "Hetitų"
+msgstr "Hitita"
 
 #: data/nation/hittite.ruleset:4
 msgid "?plural:Hittites"
-msgstr "?plural:Hetitai"
+msgstr "?plural:Hititoj"
 
 #: data/nation/hittite.ruleset:6
 msgid ""
@@ -21039,30 +21118,26 @@ msgid ""
 "controlled central Anatolia, north-western Syria and Mesopotamia down to "
 "Babylon."
 msgstr ""
-"Hetitų karalystė truko nuo 1680 metų pr.Kr. iki 1180 metų pr. Kr. Ši "
-"civilizacija pirmoji atrado, kaip apdirbti geležį. Savo galybės viršūnėje "
-"jie kontroliavo centrinę Anatoliją, šiaurės vakarų Siriją ir Mesopotamiją "
-"iki pat Babilono."
 
 #: data/nation/hungarian.ruleset:3
 msgid "Hungarian"
-msgstr "Vengrijos"
+msgstr "Hungara"
 
 #: data/nation/hungarian.ruleset:4
 msgid "?plural:Hungarians"
-msgstr "?plural:Vengrai"
+msgstr "?plural:Hungaroj"
 
 #: data/nation/hungarian.ruleset:6
 msgid "Legend says that Hungary was founded by Arpad in the 9th century."
-msgstr "Legenda sako, kad Vengriją įkūrė Arpadas IX amžiuje."
+msgstr "LaÅ­ la legendo, Hungario estis fondita de Arpad en la 9a jarcento."
 
 #: data/nation/icelandic.ruleset:3
 msgid "Icelandic"
-msgstr "Islandijos"
+msgstr "Islanda"
 
 #: data/nation/icelandic.ruleset:4
 msgid "?plural:Icelanders"
-msgstr "?plural:Islandai"
+msgstr "?plural:Islandanoj"
 
 #: data/nation/icelandic.ruleset:6
 msgid ""
@@ -21071,17 +21146,14 @@ msgid ""
 "kept initially under the Norwegian and later the Danish crown until "
 "independence from Denmark in 1944."
 msgstr ""
-"Islandija buvo atrasta ir apgyvendinta Norvegijos vikingų IX a. pabaigoje. "
-"Sala priklausė Norvegijos karūnai, vėliau – Danijos, kol gavo "
-"nepriklausomybÄ™ nuo Danijos 1944 m."
 
 #: data/nation/illyrian.ruleset:3
 msgid "Illyrian"
-msgstr "Ilyrų"
+msgstr "Ilira"
 
 #: data/nation/illyrian.ruleset:4
 msgid "?plural:Illyrians"
-msgstr "?plural:Ilyrai"
+msgstr "?plural:Iliroj"
 
 #: data/nation/illyrian.ruleset:6
 msgid ""
@@ -21095,11 +21167,11 @@ msgstr ""
 
 #: data/nation/inca.ruleset:3
 msgid "Inca"
-msgstr "Inkų"
+msgstr "Inkaa"
 
 #: data/nation/inca.ruleset:4
 msgid "?plural:Incas"
-msgstr "?plural:Inkai"
+msgstr "?plural:Inkaoj"
 
 #: data/nation/inca.ruleset:6
 msgid ""
@@ -21111,48 +21183,48 @@ msgid ""
 msgstr ""
 
 #: data/nation/inca.ruleset:23
+#, fuzzy
 msgid "?title:Inca"
-msgstr "?title:Inkų karalius"
+msgstr "?title:Komputpirato"
 
 #: data/nation/inca.ruleset:24
+#, fuzzy
 msgid "Sapa Inca"
-msgstr ""
+msgstr "Inkaa"
 
 #: data/nation/indian.ruleset:3
 msgid "Indian"
-msgstr "Indijos"
+msgstr "Hinda"
 
 #: data/nation/indian.ruleset:4
 msgid "?plural:Indians"
-msgstr "?plural:Indai"
+msgstr "?plural:Hindoj"
 
 #: data/nation/indian.ruleset:6
 msgid ""
 "The cradle of Ancient Indian civilization lay in the Indus river valley in "
 "modern-day Pakistan."
 msgstr ""
-"Senovinės Indijos civilizacijos lopšys yra  Indo upės slėnis šių dienų "
-"Pakistane."
 
 #: data/nation/indian.ruleset:19
 msgid "Raja"
-msgstr "Radža"
+msgstr "Raĝo"
 
 #: data/nation/indian.ruleset:20
 msgid "Maharaja"
-msgstr "Maharadža"
+msgstr "Maharaĝo"
 
 #: data/nation/indian.ruleset:21
 msgid "Mahatma"
-msgstr "Mahatma"
+msgstr "Mahatmo"
 
 #: data/nation/indonesian.ruleset:3
 msgid "Indonesian"
-msgstr "Indonezijos"
+msgstr "Indonezia"
 
 #: data/nation/indonesian.ruleset:4
 msgid "?plural:Indonesians"
-msgstr "?plural:Indoneziečiai"
+msgstr "?plural:Indonezianoj"
 
 #: data/nation/indonesian.ruleset:6
 msgid ""
@@ -21160,45 +21232,43 @@ msgid ""
 "government on the island of Java. The country has a Muslim majority and is "
 "one of the most populous in the world."
 msgstr ""
-"Indonezija yra didelė valstybė Malajų salyne su vyriausybe Javos saloje. "
-"Šalies daugumą sudaro musulmonų dauguma, be to, yra viena skaitlingiausių "
-"pasaulyje."
 
 #: data/nation/inuit.ruleset:3
 msgid "Inuit"
-msgstr "Inuitų"
+msgstr "Eskima"
 
 #: data/nation/inuit.ruleset:4
 msgid "?plural:Inuits"
-msgstr "?plural:Inuitai"
+msgstr "?plural:Eskimoj"
 
 #: data/nation/inuit.ruleset:6
+#, fuzzy
 msgid ""
 "The Inuit people inhabits northern Canada and Greenland. Legend says that "
 "the Great Shaman Qitdlarssuaq lead his people to Thule (Qaanaaq) on the west "
 "coast of Greenland in the 10th century. All Inuit of today are descendents "
 "of the Thule culture."
 msgstr ""
-"Inuitų tauta gyvena šiaurės Kanadoje ir Grenlandijoje. Legenda sako, kad "
-"didysis šamanas Qitdlarssuaqas X amžiuje vedė savo tautą į Tulę (Qaanaaqą) "
-"vakariniame Grenlandijos krante. Visi šių dienų inuitai yra Tulės kultūros "
-"palikuonys."
+"La eskimoj (aŭ Inuitoj) loĝas en la pli norda parto de Kanado kaj en "
+"Groenlando. Laŭ la legendo, la granda ŝamano Qitdlarssuaq gvidis lian "
+"popolon de Thule (Qaanaaq) ĝis la okcidenta marbordo de Groenlando dum la "
+"10a jarcento. Ĉiu eskimo estas ido de la kulturo de Thule."
 
 #: data/nation/inuit.ruleset:20
 msgid "Shaman"
-msgstr "Å amanas"
+msgstr "Åœamano"
 
 #: data/nation/inuit.ruleset:21
 msgid "Great Shaman"
-msgstr "Didysis Å¡amanas"
+msgstr "Granda Åœamano"
 
 #: data/nation/iraqi.ruleset:3
 msgid "Iraqi"
-msgstr "Irako"
+msgstr "Iraka"
 
 #: data/nation/iraqi.ruleset:4
 msgid "?plural:Iraqis"
-msgstr "?plural:Irakiečiai"
+msgstr "?plural:Irakanoj"
 
 #: data/nation/iraqi.ruleset:6
 msgid ""
@@ -21206,16 +21276,14 @@ msgid ""
 "the ancient region of Mesopotamia at the confluence of the Tigris and "
 "Euphrates rivers."
 msgstr ""
-"Irakas buvo įkurtas po Otomanų imperijos žlugimo. Į jį įeina senieji "
-"Mesopotamijos regionai Tigro ir Eufrato upių santakoje."
 
 #: data/nation/irish.ruleset:3
 msgid "Irish"
-msgstr "Airijos"
+msgstr "Irlanda"
 
 #: data/nation/irish.ruleset:4
 msgid "?plural:Irish"
-msgstr "?plural:Airiai"
+msgstr "?plural:Irlandanoj"
 
 #: data/nation/irish.ruleset:6
 msgid ""
@@ -21225,35 +21293,35 @@ msgid ""
 "North of Ireland was settled in the 17th century by Scottish and English "
 "planters and is now part of the United Kingdom."
 msgstr ""
-"Airija atsilaikė prieš romėnus ir vikingus bet buvo užkariauta normanų "
-"1171m. Ją valdė Anglija iki 1922, kai didžiajai šalies daliai buvo suteikta "
-"ribota autonomija. Airija tapo respublika 1949m. Å iaurÄ—s Airija buvo "
-"apgyvendinta XVIIa. škotų ir anglų kolonistų ir dabar yra Jugtinės "
-"KaralystÄ—s dalis."
+"Irlando repuŝis Romianojn kaj Vikingojn, ĝi estis konkerita de Normanoj en "
+"1171. Ĝi estis regita de Angloj ĝis 1922, kiam la plejparto de la nacio "
+"akiris limigitan aŭtonomion, kiu iĝis respubliko en 1949. Norda Irlando "
+"estis koloniita dum 17a jarcento de anglaj kaj skotaj kamplaboristoj kaj nun "
+"ĝi estas parto de Unuiĝita Reĝolando."
 
 #: data/nation/irish.ruleset:45
 msgid "High King"
-msgstr "Didysis Karalius"
+msgstr "Moŝta Reĝo"
 
 #: data/nation/irish.ruleset:45
 msgid "High Queen"
-msgstr "Didžioji Karalienė"
+msgstr "Moŝta Reĝino"
 
 #: data/nation/irish.ruleset:46
 msgid "Mother Superior"
-msgstr ""
+msgstr "Supera Patrino"
 
 #: data/nation/irish.ruleset:47
 msgid "Taoiseach"
-msgstr ""
+msgstr "Ĉefministro"
 
 #: data/nation/iroquois.ruleset:3
 msgid "Iroquois"
-msgstr "Irokėzų"
+msgstr ""
 
 #: data/nation/iroquois.ruleset:4
 msgid "?plural:Iroquois"
-msgstr "?plural:IrokÄ—zai"
+msgstr ""
 
 #: data/nation/iroquois.ruleset:6
 msgid ""
@@ -21264,34 +21332,28 @@ msgid ""
 "written constitution and a currency system making them the most advanced "
 "state in North America upon the arrival of the Europeans."
 msgstr ""
-"Irokėzų Konfederacija, vietine kalba vadinama Haudenosaunee, buvo Šiaurės "
-"Amerikos tautų grupė su bendra kalba ir kultūra. Jie buvo įsikūrę šiaurinėje "
-"dabartinio Niujorko dalyje. KonfederacijÄ… sudarÄ— penkios tautos: senekai, "
-"kajugai, onondagai, oneidai ir mohaukai.  Ši turėjo parašytą konstituciją ir "
-"valiutą, todėl buvo labiausiai pažengusi Šiaurės Amerikos valstija iki "
-"atvykstant europiečiams. "
 
 #: data/nation/iroquois.ruleset:27 data/nation/sioux.ruleset:29
 msgid "Great Chief"
-msgstr "Didysis vadas"
+msgstr "Granda Ĉefo"
 
 #: data/nation/iroquois.ruleset:28 data/nation/sami.ruleset:22
 #: data/nation/sioux.ruleset:30 data/nation/zulu.ruleset:39
 msgid "Spokesman"
-msgstr ""
+msgstr "Elstarulo"
 
 #: data/nation/iroquois.ruleset:28 data/nation/sami.ruleset:22
 #: data/nation/sioux.ruleset:30 data/nation/zulu.ruleset:39
 msgid "Spokeswoman"
-msgstr ""
+msgstr "Elstarulino"
 
 #: data/nation/israeli.ruleset:3
 msgid "Israeli"
-msgstr "Izraelio"
+msgstr "Israela"
 
 #: data/nation/israeli.ruleset:4
 msgid "?plural:Israelis"
-msgstr "?plural:Žydai"
+msgstr "?plural:Israelanoj"
 
 #: data/nation/israeli.ruleset:6
 msgid ""
@@ -21302,11 +21364,11 @@ msgstr ""
 
 #: data/nation/italian.ruleset:3
 msgid "Italian"
-msgstr "Italijos"
+msgstr "Itala"
 
 #: data/nation/italian.ruleset:4
 msgid "?plural:Italians"
-msgstr "?plural:Italai"
+msgstr "?plural:Italoj"
 
 #: data/nation/italian.ruleset:6
 msgid ""
@@ -21315,43 +21377,45 @@ msgid ""
 "1922, then a fascist state until 1945 after which democracy was restored by "
 "the WWII victors."
 msgstr ""
-"Italų tauta buvo suvienyta 1870 m. po dešimtmečių vietinių nacionalistų "
-"žygių. Ten bvo Savoy'u dinastijos  monarchija iki 1922 m., tada fašistinė "
-"valstybÄ— iki 1945 m. po kurios Antrojo Pasaulinio karo nugalÄ—tojai atstatÄ— "
-"demokratijÄ…."
+"Italio estis unuigita en 1870 DK post dekjaroj de militoj fare de naciistoj. "
+"Ĝi estis monarkio sub la familio Savoia ĝis 1922, kaj poste faŝista ŝtato "
+"ĝis 1945, kiam la demokratio estis restarigita fare de la venkantoj de la "
+"dua mondmilito."
 
 #: data/nation/japanese.ruleset:3
 msgid "Japanese"
-msgstr "Japonijos"
+msgstr "Japana"
 
 #: data/nation/japanese.ruleset:4
 msgid "?plural:Japanese"
-msgstr "?plural:Japonai"
+msgstr "?plural:Japanoj"
 
 #: data/nation/japanese.ruleset:6
 msgid ""
 "According to traditional Japanese mythology, Japan was founded in the 7th "
 "century BC by the ancestral Emperor Jimmu."
 msgstr ""
-"Pasak tradicinės japonų mitologijos, Japonija buvo įkurta VII a. "
-"imperatoriaus Jimmu."
+"LaÅ­ tradicia japanese mitologio, Japano estis fondita en la 7a jarcento AK "
+"de praa Emperiestro Jimmu."
 
 #: data/nation/japanese.ruleset:20 data/nation/manchu.ruleset:21
 #: data/nation/vietnamese.ruleset:23
 msgid "Empress"
-msgstr "ImperatorÄ—"
+msgstr "Imperiestrino"
 
 #: data/nation/japanese.ruleset:21
 msgid "Shogun"
-msgstr "Šiogūnas"
+msgstr "Åœoguno"
 
 #: data/nation/kampuchean.ruleset:3
+#, fuzzy
 msgid "Kampuchean"
-msgstr "Papuasų"
+msgstr "Papua"
 
 #: data/nation/kampuchean.ruleset:4
+#, fuzzy
 msgid "?plural:Kampucheans"
-msgstr "?plural:Papuasai"
+msgstr "?plural:Papuanoj"
 
 #: data/nation/kampuchean.ruleset:6
 msgid ""
@@ -21361,40 +21425,39 @@ msgstr ""
 
 #: data/nation/kampuchean.ruleset:20 data/nation/manchu.ruleset:20
 msgid "Warlord"
-msgstr "Karo vadas"
+msgstr "Militestro"
 
 #: data/nation/kampuchean.ruleset:21
 msgid "Brother"
-msgstr "Brolis"
+msgstr "Fratro"
 
 #: data/nation/kampuchean.ruleset:21
 msgid "Sister"
-msgstr "Sesuo"
+msgstr "Fratrino"
 
 #: data/nation/kenyan.ruleset:3
 msgid "Kenyan"
-msgstr "Kenijos"
+msgstr "Kenja"
 
 #: data/nation/kenyan.ruleset:4
 msgid "?plural:Kenyans"
-msgstr "?plural:Keniečiai"
+msgstr "?plural:Kenjanoj"
 
 #: data/nation/kenyan.ruleset:6
 msgid "Kenya gained independence from Britain in December 1963."
-msgstr "Kenija nepriklausomybę nuo Didžiosios britanijos gavo 1963m."
+msgstr ""
 
 #: data/nation/kenyan.ruleset:18
-#, fuzzy
 msgid "Nabongo"
-msgstr "Nabobas"
+msgstr ""
 
 #: data/nation/korean.ruleset:3
 msgid "Korean"
-msgstr "KorÄ—jos"
+msgstr "Korea"
 
 #: data/nation/korean.ruleset:4
 msgid "?plural:Koreans"
-msgstr "?plural:Korėjiečiai"
+msgstr "?plural:Koreanoj"
 
 #: data/nation/korean.ruleset:6
 msgid ""
@@ -21407,15 +21470,15 @@ msgstr ""
 
 #: data/nation/korean.ruleset:32 data/nation/soviet.ruleset:28
 msgid "Great Leader"
-msgstr "Didysis vadas"
+msgstr "Äœenerala Sekretario"
 
 #: data/nation/lankese.ruleset:3
 msgid "Lankese"
-msgstr "Å ri Lankos"
+msgstr "Lankaa"
 
 #: data/nation/lankese.ruleset:4
 msgid "?plural:Lankese"
-msgstr "?plural:Šri lankiečiai"
+msgstr "?plural:Lankaanoj"
 
 #: data/nation/lankese.ruleset:6
 msgid ""
@@ -21427,29 +21490,29 @@ msgstr ""
 #: data/nation/lankese.ruleset:20 data/nation/silesian.ruleset:21
 #: data/nation/welsh.ruleset:26
 msgid "Prince"
-msgstr "Princas"
+msgstr "Princo"
 
 #: data/nation/lankese.ruleset:20 data/nation/silesian.ruleset:21
 #: data/nation/welsh.ruleset:26
 msgid "Princess"
-msgstr "PrincesÄ—"
+msgstr "Princino"
 
 #: data/nation/lankese.ruleset:21 data/nation/quebecois.ruleset:20
 #: data/nation/texan.ruleset:19
 msgid "Governor"
-msgstr "Gubernatorius"
+msgstr "Guberniestro"
 
 #: data/nation/lankese.ruleset:22
 msgid "Supreme Commander"
-msgstr "Vyriausias vadas"
+msgstr "Supera Komandanto"
 
 #: data/nation/latvian.ruleset:3
 msgid "Latvian"
-msgstr "Latvijos"
+msgstr "Letona"
 
 #: data/nation/latvian.ruleset:4
 msgid "?plural:Latvians"
-msgstr "?plural:Latviai"
+msgstr "?plural:Letonoj"
 
 #: data/nation/latvian.ruleset:7
 msgid ""
@@ -21457,17 +21520,14 @@ msgid ""
 "1940, Latvia was forcibly occupied by the Soviet Union. After the collapse "
 "of Soviet Union in 1991 Latvia restored its independence."
 msgstr ""
-"Pirmojo pasaulinio karo pabaigoje Latvija paskelbÄ— savo nepriklausomybÄ™ nuo "
-"Rusijos. 1940 metais Latvija buvo jėga prijungta prie Tarybų Sąjungos. "
-"Šalies nepriklausomybė buvo atstatyta 1991 metais subyrėjus Tarybų Sąjungai."
 
 #: data/nation/libyan.ruleset:3
 msgid "Libyan"
-msgstr "Libijos"
+msgstr "Libia"
 
 #: data/nation/libyan.ruleset:4
 msgid "?plural:Libyans"
-msgstr "?plural:Libai"
+msgstr "?plural:Libianoj"
 
 #: data/nation/libyan.ruleset:6
 msgid ""
@@ -21476,10 +21536,6 @@ msgid ""
 "of Italy and after the Second World War Libya was granted independence as a "
 "condition of the Allied peace treaty with Italy."
 msgstr ""
-"Regionas, dabar vadinamas Libija, buvo Romos kolonija iki VIIa. įvykusio "
-"arabų užkariavimo. 1912m. ją užėmė Italija, o po Antro pasaulinio karo "
-"Libijai suteikta nepriklausomybė pasirašius sąjunginę taikos sutartį su "
-"Italija."
 
 #: data/nation/libyan.ruleset:23
 msgid "Dey"
@@ -21487,15 +21543,15 @@ msgstr ""
 
 #: data/nation/libyan.ruleset:24
 msgid "Colonel"
-msgstr "Pulkininkas"
+msgstr "Kolonelo"
 
 #: data/nation/lithuanian.ruleset:3
 msgid "Lithuanian"
-msgstr "Lietuvos"
+msgstr "Litova"
 
 #: data/nation/lithuanian.ruleset:4
 msgid "?plural:Lithuanians"
-msgstr "?plural:Lietuviai"
+msgstr "?plural:Litovoj"
 
 #: data/nation/lithuanian.ruleset:6
 msgid ""
@@ -21503,62 +21559,57 @@ msgid ""
 "of Poland.  Lithuanian is the most archaic and complex of the northern Indo-"
 "European languages"
 msgstr ""
-"Lietuva yra maža šalis pietiniame Baltijos jūros krante, į šiaurę nuo "
-"Lenkijos. Lietuvių kalba yra archajiškiausia ir sudėtingiausia iš šiaurinių "
-"Indo-Europiečių kalbų"
 
 #: data/nation/lithuanian.ruleset:28
 msgid "Great Duke"
-msgstr "Didysis kunigaikštis"
+msgstr "Grandduko"
 
 #: data/nation/lithuanian.ruleset:28
 msgid "Great Duchess"
-msgstr "Didžioji kunigaikštienė"
+msgstr "Granddukino"
 
 #: data/nation/malagasy.ruleset:3
 msgid "Malagasy"
-msgstr "Malagasijos"
+msgstr "Malagaŝa"
 
 #: data/nation/malagasy.ruleset:4
 msgid "?plural:Malagasies"
-msgstr "?plural:Magalasiai"
+msgstr "?plural:Malagaŝoj"
 
 #: data/nation/malagasy.ruleset:6
 msgid ""
 "The Malagasy are the people of Madagascar. For centuries, tribes from "
 "Indonesia, East Africa and the Arab world have gathered on the island."
 msgstr ""
-"Malagasiai yra Madagaskaro gyventojai. Šimtmečiais gentys iš Indonezijos, "
-"rytų Afrikos ir arabų pasaulio vykdavo į šią salą."
+"Malagaŝoj estas la popolo de Madagaskaro. Dum multaj jarcentoj, tribuoj el "
+"Indonezio, orienta Afriko kaj Arabujo pli kaj pli enradikiĝis en la insulo."
 
 #: data/nation/malagasy.ruleset:22
 msgid "High Commissioner"
-msgstr "Didysis komisaras"
+msgstr "Supera Komisaro"
 
 #: data/nation/malaysian.ruleset:3
 msgid "Malaysian"
-msgstr "Malaizijos"
+msgstr "Malaja"
 
 #: data/nation/malaysian.ruleset:4
 msgid "?plural:Malaysians"
-msgstr "?plural:Malajiečiai"
+msgstr "?plural:Malajoj"
 
 #: data/nation/malaysian.ruleset:6
 msgid ""
 "Malaysia was started with the founding of Malacca (Melaka) by Parameswara in "
 "the early 14th century."
 msgstr ""
-"Malaizijos valstybė prasidėjo nuo XIV a. Parameswaros įkurto Malacca "
-"(Melaka) miesto."
 
 #: data/nation/malaysian.ruleset:22 data/nation/singaporean.ruleset:31
 #: data/nation/turk.ruleset:23
 msgid "Sultan"
-msgstr "Sultonas"
+msgstr "Sultano"
 
 #: data/nation/malaysian.ruleset:22 data/nation/turk.ruleset:23
 msgid "Sultana"
-msgstr "SultonÄ—"
+msgstr "Sultanino"
 
 #: data/nation/malaysian.ruleset:23
 msgid "Tun"
@@ -21566,11 +21617,11 @@ msgstr ""
 
 #: data/nation/malian.ruleset:3
 msgid "Malian"
-msgstr "Malio"
+msgstr "Malia"
 
 #: data/nation/malian.ruleset:4
 msgid "?plural:Malians"
-msgstr "?plural:Maliečiai"
+msgstr "?plural:Malianoj"
 
 #: data/nation/malian.ruleset:6
 msgid ""
@@ -21588,11 +21639,11 @@ msgstr ""
 
 #: data/nation/manchu.ruleset:3
 msgid "Manchu"
-msgstr "Mandžūrijos"
+msgstr "Manĉura"
 
 #: data/nation/manchu.ruleset:4
 msgid "?plural:Manchus"
-msgstr "?plural:Mandžūrai"
+msgstr "?plural:Manĉuroj"
 
 #: data/nation/manchu.ruleset:6
 msgid ""
@@ -21603,11 +21654,11 @@ msgstr ""
 
 #: data/nation/maori.ruleset:3
 msgid "Maori"
-msgstr "Maorių"
+msgstr "Maora"
 
 #: data/nation/maori.ruleset:4
 msgid "?plural:Maori"
-msgstr "?plural:Maoriai"
+msgstr "?plural:Maoroj"
 
 #: data/nation/maori.ruleset:6
 msgid ""
@@ -21615,62 +21666,57 @@ msgid ""
 "group that is now New Zealand. According to archeological evidence, the "
 "migration commenced in the 900s and continued until the 1400s."
 msgstr ""
-"Maoriai yra polineziečiai, kurie migravo ir kolonizavo salų grupę, dabar "
-"vadinamą Naująja Zelandija. Pasak archeologų, migracija  prasidėjo 900m. ir "
-"tęsėsi iki 1400m."
 
 #: data/nation/martian.ruleset:3
 msgid "Martian"
-msgstr "Marso"
+msgstr "Marsa"
 
 #: data/nation/martian.ruleset:4
 msgid "?plural:Martians"
-msgstr "?plural:Marsiečiai"
+msgstr "?plural:Marsanoj"
 
 #: data/nation/martian.ruleset:6
 msgid "Marsmen landed on Earth in 4000 BC!"
-msgstr "Marsiečiai nusileido Žemėje 4000 m. pr.m.e."
+msgstr "Marsanoj alteriĝis sur Tero en 4000 AK!"
 
 #: data/nation/mayan.ruleset:3
 msgid "Mayan"
-msgstr "Majų"
+msgstr ""
 
 #: data/nation/mayan.ruleset:4
 msgid "?plural:Mayas"
-msgstr "?plural:Majai"
+msgstr ""
 
 #: data/nation/mayan.ruleset:6
 msgid ""
 "The Mayans were a Mesoamerican civilization. Famous for building great "
 "pyramids and palaces in the jungle."
 msgstr ""
-"Majai buvo vidurio Amerikos civilizacija. Garsūs dėl didžių piramidžių ir "
-"rūmų statymo džiunglėse."
 
 #: data/nation/mayan.ruleset:19
 msgid "Ajaw"
-msgstr ""
+msgstr "Lordo"
 
 #: data/nation/mexican.ruleset:3
 msgid "Mexican"
-msgstr "Meksikos"
+msgstr "Meksikia"
 
 #: data/nation/mexican.ruleset:4
 msgid "?plural:Mexicans"
-msgstr "?plural:Meksikiečiai"
+msgstr "?plural:Meksikianoj"
 
 #: data/nation/mexican.ruleset:6
 msgid ""
 "Mexico borrows its name from the Mexica people, another name for the Aztecs."
-msgstr "Meksikos vardas kilęs nuo meksikiečių, kito actekų pavadinimo."
+msgstr ""
 
 #: data/nation/mongol.ruleset:3
 msgid "Mongol"
-msgstr "Mongolijos"
+msgstr "Mongola"
 
 #: data/nation/mongol.ruleset:4
 msgid "?plural:Mongols"
-msgstr "?plural:Mongolai"
+msgstr "?plural:Mongoloj"
 
 #: data/nation/mongol.ruleset:6
 msgid ""
@@ -21679,26 +21725,25 @@ msgid ""
 "continent of Asia.  They became notorious for the utter ruthlessness in "
 "warfare."
 msgstr ""
-"Šimtmečiais po Čingischano suvienijimo momgolai užkariavo didžiausią "
-"imperiją žmonijos istorijoje. Ši imperija apėmė didžiąją Azijos kontinento "
-"dalį. Mongolai iš blogosios pusės pagarsėjo dėl savo visiško negailestingumo "
-"karuose."
+"Dum la jarcentoj sekvantaj al la unuigo farita de Ĝinĝis Ĥano, Mongoloj "
+"kreis la plej grandan imperion en la homa historio, entenante la plejparto "
+"de Azio. Ili estis konataj pro la absoluta krueleco laÅ­ batalado."
 
 #: data/nation/mongol.ruleset:29 data/nation/uyghur.ruleset:29
 msgid "Khan"
-msgstr "Chanas"
+msgstr "Ĥano"
 
 #: data/nation/mongol.ruleset:30 data/nation/uyghur.ruleset:30
 msgid "Khagan"
-msgstr "Chanas"
+msgstr "Grandĥano"
 
 #: data/nation/newzealand.ruleset:3
 msgid "New Zealand"
-msgstr "Naujosios Zelandijos"
+msgstr "Novzelanda"
 
 #: data/nation/newzealand.ruleset:4
 msgid "?plural:New Zealanders"
-msgstr "?plural:Naujieji zelandiečiai"
+msgstr "?plural:Novzelandanoj"
 
 #: data/nation/newzealand.ruleset:7
 msgid ""
@@ -21706,29 +21751,26 @@ msgid ""
 "royal proclamation in 1907, the country became an independent dominion "
 "within the Commonwealth of Nations."
 msgstr ""
-"Naujosios Zelandijos salų grupė buvo aneksuota Britanijos 1840 metais. Po "
-"1907 karališkojo dekreto, šalis tapo neprikausoma dominija Britanijos tautų "
-"sÄ…jungoje."
 
 #: data/nation/nigerian.ruleset:3
 msgid "Nigerian"
-msgstr "Nigerijos"
+msgstr "Niĝeria"
 
 #: data/nation/nigerian.ruleset:4
 msgid "?plural:Nigerians"
-msgstr "?plural:Nigeriečiai"
+msgstr "?plural:Niĝerianoj"
 
 #: data/nation/nigerian.ruleset:6
 msgid "Nigeria won full independence from British rule in 1960."
-msgstr "Nigerija išsikovojo nepriklausomybę nuo britų 1960 m."
+msgstr "Nigerio gajnis plenan aÅ­tonomion el Britujo en 1960."
 
 #: data/nation/norwegian.ruleset:3
 msgid "Norwegian"
-msgstr "Norvegijos"
+msgstr "Norvega"
 
 #: data/nation/norwegian.ruleset:4
 msgid "?plural:Norwegians"
-msgstr "?plural:Norvegai"
+msgstr "?plural:Norvegoj"
 
 #: data/nation/norwegian.ruleset:6
 msgid ""
@@ -21736,17 +21778,14 @@ msgid ""
 "in Eidsvoll, 1814AD. Finally, in 1905AD the Norwegians got their "
 "independence after a union with Sweden."
 msgstr ""
-"Po šimtmečių Danijos valdžioje norvegai paskelbė savo konstituciją "
-"Eidsvolyje 1814m. Galiausiai 1905m. po sÄ…jungos su Å vedija Norvegija gavo "
-"nepriklausomybÄ™."
 
 #: data/nation/ottoman.ruleset:3
 msgid "Ottoman"
-msgstr "Osmanų"
+msgstr "Otomana"
 
 #: data/nation/ottoman.ruleset:4
 msgid "?plural:Ottomans"
-msgstr "?plural:Osmanai"
+msgstr "?plural:Otomanoj"
 
 #: data/nation/ottoman.ruleset:6
 msgid ""
@@ -21769,49 +21808,47 @@ msgstr ""
 
 #: data/nation/ottoman.ruleset:29
 msgid "Padisah"
-msgstr "Padišachas"
+msgstr ""
 
 #: data/nation/ottoman.ruleset:30
 msgid "Imparator"
-msgstr "Imperatorius"
+msgstr ""
 
 #: data/nation/papuan.ruleset:3
 msgid "Papuan"
-msgstr "Papuasų"
+msgstr "Papua"
 
 #: data/nation/papuan.ruleset:4
 msgid "?plural:Papuans"
-msgstr "?plural:Papuasai"
+msgstr "?plural:Papuanoj"
 
 #: data/nation/papuan.ruleset:6
 msgid "The Papuans are a Melanesian people on the island of New Guinea."
 msgstr ""
-"Papuasai yra Melanezijos archipelago tauta, gyvenanti Naujosios GvinÄ—jos "
-"saloje."
 
 #: data/nation/papuan.ruleset:16
 msgid "Governor-General"
-msgstr "Gubernatorius-generolas"
+msgstr "Äœeneral-guberniestro"
 
 #: data/nation/persian.ruleset:3
 msgid "Persian"
-msgstr "Persijos"
+msgstr "Persa"
 
 #: data/nation/persian.ruleset:4
 msgid "?plural:Persians"
-msgstr "?plural:Persai"
+msgstr "?plural:Persoj"
 
 #: data/nation/persian.ruleset:6
 msgid ""
 "The first Persian (Achaemenid) Empire lasted from 550BC to 330BC; the second "
 "(Sassanid) from 226AD to 642AD."
 msgstr ""
-"Pirmoji Persijos (Achaemenidų) imperija truko nuo 550 m. pr. Kr. iki 330 m. "
-"pr. Kr.; antroji (Sasanidų) nuo 226 m. po Kristaus iki 642 m. po Kristaus."
+"La unua persa imperio (Aĉaemenida) estis de 550 AK ĝis 330 AK; la dua "
+"(Sasanida) estis de 226 PK ĝis 642 PK."
 
 #: data/nation/persian.ruleset:21
 msgid "Shah"
-msgstr "Å achas"
+msgstr "Åœaho"
 
 #: data/nation/persian.ruleset:21
 msgid "Shahbanu"
@@ -21819,96 +21856,87 @@ msgstr ""
 
 #: data/nation/persian.ruleset:22
 msgid "Ayatollah"
-msgstr "Ajatola"
+msgstr "Ajatolo"
 
 #: data/nation/phoenician.ruleset:3
 msgid "Phoenician"
-msgstr "Finikijos"
+msgstr "Fenica"
 
 #: data/nation/phoenician.ruleset:4
 msgid "?plural:Phoenicians"
-msgstr "?plural:Finikiečiai"
+msgstr "?plural:Fenicoj"
 
 #: data/nation/phoenician.ruleset:6
 msgid ""
 "Phoenicia was an ancient civilization, based in what is now the coastal "
 "regions of Lebanon and Syria."
 msgstr ""
-"Finikija buvo senovės civilizacija gyvavusi ant dabartinių Libano ir Sirijos "
-"krantų."
 
 #: data/nation/polish.ruleset:3
 msgid "Polish"
-msgstr "Lenkijos"
+msgstr "Pola"
 
 #: data/nation/polish.ruleset:4
 msgid "?plural:Poles"
-msgstr "?plural:Lenkai"
+msgstr "?plural:Poloj"
 
 #: data/nation/polish.ruleset:6
 msgid ""
 "The Polish state was formed about a millennium ago, and reached its Golden "
 "Age near the end of the 16th century."
 msgstr ""
-"Lenkijos valstybė buvo sukurta maždaug prieš tūkstantmetį metų ir pasiekė "
-"savo aukso amžių XVI a."
 
 #: data/nation/polish.ruleset:26
 msgid "Dyktator"
-msgstr "Diktatorius"
+msgstr "Diktatoro"
 
 #: data/nation/polish.ruleset:26
 msgid "Dyktatorka"
-msgstr "DiktatorÄ—"
+msgstr "Diktatorino"
 
 #: data/nation/polish.ruleset:27
 msgid "Prymas"
-msgstr ""
+msgstr "Episkopo"
 
 #: data/nation/polish.ruleset:29
 msgid "Pierwszy Sekretarz"
-msgstr "Pirmasis sekretorius"
+msgstr "Äœenerala Sekretario"
 
 #: data/nation/portuguese.ruleset:3
 msgid "Portuguese"
-msgstr "Portugalijos"
+msgstr "Portugala"
 
 #: data/nation/portuguese.ruleset:4
 msgid "?plural:Portuguese"
-msgstr "?plural:Portugalai"
+msgstr "?plural:Portugaloj"
 
 #: data/nation/portuguese.ruleset:6
 msgid ""
 "Portugal founded the first of the great mercantile empires in the 1400s on "
 "the shipbuilding advances funded by Prince Henry the Navigator."
 msgstr ""
-"Portugalija įkūrė pirmą iš didžiųjų prekybinių imperijų. Įkurta 1400 dėl "
-"pažangos laivų statyme. Šios technologijos vystymąsi paskatino lėšos gautos "
-"iš Princo Henrio navigatoriaus."
 
 #: data/nation/quebecois.ruleset:3
 msgid "Quebecois"
-msgstr "Kvebekiečiai"
+msgstr "Kebeka"
 
 #: data/nation/quebecois.ruleset:4
 msgid "?plural:Quebecois"
-msgstr "?plural:kvebekus"
+msgstr "?plural:Kebekanoj"
 
 #: data/nation/quebecois.ruleset:6
 msgid ""
 "Quebec is the largest province of Canada, housing the majority of the "
 "Francophone population of America."
 msgstr ""
-"Kvebekas yra didžiausia Kanados provincija, kur gyvena dauguma Amerikos "
-"prancūzų."
 
 #: data/nation/romanian.ruleset:3
 msgid "Romanian"
-msgstr "Rumunų"
+msgstr "Rumana"
 
 #: data/nation/romanian.ruleset:4
 msgid "?plural:Romanians"
-msgstr "?plural:Rumunijos"
+msgstr "?plural:Rumanoj"
 
 #: data/nation/romanian.ruleset:6
 msgid ""
@@ -21921,57 +21949,56 @@ msgstr ""
 
 #: data/nation/romanian.ruleset:33
 msgid "Voievod"
-msgstr "Karo vadas"
+msgstr "Princo"
 
 #: data/nation/romanian.ruleset:33
 msgid "Doamna"
-msgstr ""
+msgstr "Lordino"
 
 #: data/nation/romanian.ruleset:34
 msgid "Rege"
-msgstr ""
+msgstr "Reĝo"
 
 #: data/nation/romanian.ruleset:34
 msgid "Regina"
-msgstr "KaralienÄ—"
+msgstr "Reĝino"
 
 #: data/nation/romanian.ruleset:35
 #, fuzzy
 msgid "Presedinte"
-msgstr "Prezidentas"
+msgstr "Prezidanto"
 
 #: data/nation/romanian.ruleset:36
 msgid "Tovaras"
-msgstr ""
+msgstr "Kamarado"
 
 #: data/nation/romanian.ruleset:36
 msgid "Tovarasa"
-msgstr ""
+msgstr "Kamaradino"
 
 #: data/nation/roman.ruleset:3
 msgid "Roman"
-msgstr "Romos"
+msgstr "Romia"
 
 #: data/nation/roman.ruleset:4
 msgid "?plural:Romans"
-msgstr "?plural:RomÄ—nai"
+msgstr "?plural:Romianoj"
 
 #: data/nation/roman.ruleset:6
 msgid ""
 "Rome was, in legend, founded by Romulus in 753 BC.  At its height, Rome "
 "controlled nearly all of Europe, northern Africa and Mesopotamia."
 msgstr ""
-"Roma, pasak legendos, buvo įkurta Romulo 753 m. pr. Kr. Savo galybės "
-"viršūnėje, Roma kontroliavo beveik visą Europą, šiauės Afriką ir "
-"MesopotamijÄ…."
+"LaÅ­ la legendo, Romo estis fondita de Romolo en 753 AK. Dum la maksimuma "
+"ekspansio, Romo regis preskaÅ­ tute EÅ­ropon, nordan Afrikon kaj Mezopotamio."
 
 #: data/nation/russian.ruleset:3
 msgid "Russian"
-msgstr "Rusijos"
+msgstr "Rusa"
 
 #: data/nation/russian.ruleset:4
 msgid "?plural:Russians"
-msgstr "?plural:Rusai"
+msgstr "?plural:Rusoj"
 
 #: data/nation/russian.ruleset:6
 msgid ""
@@ -21989,31 +22016,31 @@ msgstr ""
 
 #: data/nation/russian.ruleset:47 data/nation/serbian.ruleset:36
 msgid "Duke"
-msgstr "Kunigaikštis"
+msgstr "Duko"
 
 #: data/nation/russian.ruleset:47 data/nation/serbian.ruleset:36
 msgid "Duchess"
-msgstr "Kunigaikštienė"
+msgstr "Dukino"
 
 #: data/nation/russian.ruleset:48
 msgid "Tsar"
-msgstr "Caras"
+msgstr "Caro"
 
 #: data/nation/russian.ruleset:48
 msgid "Tsaritsa"
-msgstr "CarienÄ—"
+msgstr "Carino"
 
 #: data/nation/russian.ruleset:49
 msgid "Matriarch"
-msgstr "MatriarchÄ—"
+msgstr "Matriarko"
 
 #: data/nation/ryukyuan.ruleset:3
 msgid "Ryukyuan"
-msgstr "Riūkiū"
+msgstr ""
 
 #: data/nation/ryukyuan.ruleset:4
 msgid "?plural:Ryukyuans"
-msgstr "?plural:Riūkiai"
+msgstr ""
 
 #: data/nation/ryukyuan.ruleset:6
 msgid ""
@@ -22023,42 +22050,38 @@ msgstr ""
 
 #: data/nation/ryukyuan.ruleset:21
 msgid "Koku-o"
-msgstr ""
+msgstr "Reĝo"
 
 #: data/nation/ryukyuan.ruleset:21
 msgid "Jo-o"
-msgstr ""
+msgstr "Reĝino"
 
 #: data/nation/sami.ruleset:3
 msgid "Sami"
-msgstr "Samių"
+msgstr "Samea"
 
 #: data/nation/sami.ruleset:4
 msgid "?plural:Sami"
-msgstr "?plural:Samiai"
+msgstr "?plural:Sameoj"
 
 #: data/nation/sami.ruleset:6
-#, fuzzy
 msgid ""
 "The Sami are a people of northern Scandinavia. Their nation spans over the "
 "northernmost regions of the Scandinavian countries: Finnmark of Norway and "
 "Lapland of Sweden and Finland."
 msgstr ""
-"Samiai, arba lapiai, yra šiaurės Skandinavijos žmonės, kurių tauta driekiasi "
-"pačiais šiauriausiais Skandinavijos regionais: Norvegijos Finmarką ir "
-"Å vedijos bei Suomijos LaplandijÄ…."
 
 #: data/nation/sami.ruleset:21
 msgid "Noaydde"
-msgstr ""
+msgstr "Åœamano"
 
 #: data/nation/scottish.ruleset:3
 msgid "Scottish"
-msgstr "Å kotijos"
+msgstr "Skota"
 
 #: data/nation/scottish.ruleset:4
 msgid "?plural:Scots"
-msgstr "?plural:Å kotai"
+msgstr "?plural:Skotoj"
 
 #: data/nation/scottish.ruleset:6
 msgid ""
@@ -22066,21 +22089,18 @@ msgid ""
 "displaced the native Picts, was an independent kingdom from around 1034AD to "
 "the Union of Crowns with England in 1701."
 msgstr ""
-"Škotija, iš pradžių apgyvendinta airių plėšikų, kurie išstūmė vietinius "
-"piktus, buvo nepriklausoma karalystė nuo 1034 iki 1701, kuomet įvyko Karūnų "
-"unija su Anglija."
 
 #: data/nation/scottish.ruleset:26
 msgid "First Minister"
-msgstr "Ministras pirmininkas"
+msgstr "Ĉefministro"
 
 #: data/nation/serbian.ruleset:3
 msgid "Serbian"
-msgstr "Serbijos"
+msgstr "Serba"
 
 #: data/nation/serbian.ruleset:4
 msgid "?plural:Serbians"
-msgstr "?plural:Serbai"
+msgstr "?plural:Serboj"
 
 #: data/nation/serbian.ruleset:6
 msgid ""
@@ -22088,53 +22108,47 @@ msgid ""
 "Ottomans after the collapse of the Byzantine Empire.  During most of the "
 "20th century it was part of the Yugoslav Federation."
 msgstr ""
-"Serbija yra dalis pietinių slavų regiono, kuris buvo nukariautas Osmanų "
-"imperijos po Bizantijos imperijos žlugimo. XX a. antroje puseje Serbija "
-"priklausÄ— Jugoslavijos federacijai."
 
 #: data/nation/silesian.ruleset:3
 msgid "Silesian"
-msgstr "Silezijos"
+msgstr "Sileza"
 
 #: data/nation/silesian.ruleset:4
 msgid "?plural:Silesians"
-msgstr "?plural:Sileziečiai"
+msgstr "?plural:Silezoj"
 
 #: data/nation/silesian.ruleset:6
 msgid ""
 "Silesia is a region of southern Poland that was at one time an independent "
 "kingdom."
 msgstr ""
-"Silezija yra pietinės Lenkijos regionas, vienu metu buvęs nepriklausoma "
-"karalyste."
 
 #: data/nation/singaporean.ruleset:15
 msgid "Singaporean"
-msgstr "Singapūro"
+msgstr "Singapura"
 
 #: data/nation/singaporean.ruleset:16
 msgid "?plural:Singaporeans"
-msgstr "?plural:Singapūriečiai"
+msgstr "?plural:Singapuranoj"
 
 #: data/nation/singaporean.ruleset:18
 msgid ""
 "Singapore is a mercantile city-state located at the southernmost tip of the "
 "Malaysian Peninsula."
 msgstr ""
-"Singapūras yra prekybinis miestas, esantis Malaizijos pusiasalio pietiniame "
-"iškyšulyje."
 
 #: data/nation/singaporean.ruleset:32
 msgid "Encik"
-msgstr ""
+msgstr "Lordo"
 
 #: data/nation/sioux.ruleset:3
 msgid "Sioux"
-msgstr "Sijų"
+msgstr ""
 
 #: data/nation/sioux.ruleset:4
+#, fuzzy
 msgid "?plural:Sioux"
-msgstr "?plural:Sijai"
+msgstr "?plural:Siuoj"
 
 #: data/nation/sioux.ruleset:6
 msgid ""
@@ -22142,57 +22156,50 @@ msgid ""
 "against the United States. It consisted of three distinct groups of tribes: "
 "the Lakota, the Dakota and the Nakota."
 msgstr ""
-"Sijai buvo Šiaurės Amerikos tauta, kuri kovėsi keliuose lemiamuose mūšiuose "
-"prieš Jungtines Valstijas. Sijai susidėjo iš trijų atskirų genčių: lakotų, "
-"dakotų ir nakotų."
 
 #: data/nation/slovenian.ruleset:3
 msgid "Slovenian"
-msgstr "SlovÄ—nijos"
+msgstr "Slovena"
 
 #: data/nation/slovenian.ruleset:4
 msgid "?plural:Slovenians"
-msgstr "?plural:SlovÄ—nai"
+msgstr "?plural:Slovenoj"
 
 #: data/nation/slovenian.ruleset:6
 msgid ""
 "Slovenia was the most western and northern republic of the old Yugoslav "
 "Federation."
 msgstr ""
-"Slovėnia buvo pati vakariškiausia ir šiauriausia Jugoslavijos Federacijos "
-"respublika."
 
 #: data/nation/slovakian.ruleset:3
 msgid "Slovakian"
-msgstr "Slovakijos"
+msgstr "Slovaka"
 
 #: data/nation/slovakian.ruleset:4
 msgid "?plural:Slovakians"
-msgstr "?plural:Slovakai"
+msgstr "?plural:Slovakoj"
 
 #: data/nation/slovakian.ruleset:6
 msgid ""
 "Slovakia is a country in the heart of Europe. Formerly part of "
 "Czechoslovakia, until 1918 it was part of the Austro-Hungarian Empire."
 msgstr ""
-"Slovakija yra šalis Europos širdyje. Anksčiau dalis Čekoslovakijos, kuri iki "
-"1918 m. buvo dalis Austrijos-Vengrijos imperijos."
 
 #: data/nation/slovakian.ruleset:29
 msgid "Pope"
-msgstr "Popiežius"
+msgstr "Papo"
 
 #: data/nation/slovakian.ruleset:29
 msgid "Priestess"
-msgstr "Žynė"
+msgstr "Ĉefsacerdotino"
 
 #: data/nation/southafrican.ruleset:3
 msgid "South African"
-msgstr "Pietų Afrikos"
+msgstr "Sudafrika"
 
 #: data/nation/southafrican.ruleset:4
 msgid "?plural:South Africans"
-msgstr "?plural:Pietų afrikiečiai"
+msgstr "?plural:Sudafrikanoj"
 
 #: data/nation/southafrican.ruleset:6
 msgid ""
@@ -22208,11 +22215,11 @@ msgstr ""
 
 #: data/nation/soviet.ruleset:3
 msgid "Soviet"
-msgstr "Sovietų"
+msgstr "Sovetia"
 
 #: data/nation/soviet.ruleset:4
 msgid "?plural:Soviets"
-msgstr "?plural:Sovietai"
+msgstr "?plural:Sovetianoj"
 
 #: data/nation/soviet.ruleset:6
 msgid ""
@@ -22222,19 +22229,14 @@ msgid ""
 "powerful states in the 20th century. But by the end of 1991 due to many "
 "social shocks it disintegrated into fifteen independent countries"
 msgstr ""
-"Tarybų sąjungos istorija prasidėjo 1917 metų lapkritį, kai Rusijoje įvyko "
-"Lenino vadovaujama bolševikų revoliucija. 1922 metų gruodžio 31 dieną "
-"keturios tarybinės respublikos susijungė į vieną šalį. Tarybų sąjunga tapo "
-"viena iš galingiausių 20 amžiaus valstybių. 1991 metų pabaigoje socialiniai "
-"pokyčiai suskaidė šalį į penkioliką nepriklausomų valstybių."
 
 #: data/nation/spanish.ruleset:3
 msgid "Spanish"
-msgstr "Ispanijos"
+msgstr "Hispana"
 
 #: data/nation/spanish.ruleset:4
 msgid "?plural:Spanish"
-msgstr "?plural:Ispanai"
+msgstr "?plural:Hispanoj"
 
 #: data/nation/spanish.ruleset:6
 msgid ""
@@ -22243,45 +22245,40 @@ msgid ""
 "Moslems.  The Reconquista was completed in 1492AD, the same year Columbus "
 "sailed."
 msgstr ""
-"Å iuolaikinÄ— Ispanijos valstybÄ— buvo suformuota, kai Kastilijos ir Aragono "
-"karalysčių valdovai atsiėmė Iberijos pusiasalį iš musulmonų. Rekonkista buvo "
-"biagta 1492 m. po Kristaus. Tais pačiais metais K. Kolumbas atrado Ameriką."
 
 #: data/nation/spanish.ruleset:28
 msgid "Caudillo"
-msgstr "Klaudijus"
+msgstr "Estro"
 
 #: data/nation/spanish.ruleset:28
 msgid "Caudilla"
-msgstr "Klaudija"
+msgstr "Estrino"
 
 #: data/nation/spanish.ruleset:29
 msgid "Cardinal"
-msgstr "Kardinolas"
+msgstr "Kardinalo"
 
 #: data/nation/sudanese.ruleset:3
 msgid "Sudanese"
-msgstr "Sudano"
+msgstr "Sudana"
 
 #: data/nation/sudanese.ruleset:4
 msgid "?plural:Sudanese"
-msgstr "?plural:Sudaniečiai"
+msgstr "?plural:Sudananoj"
 
 #: data/nation/sudanese.ruleset:6
 msgid ""
 "In 1820 Sudan came under Egyptian rule and later British rule. Sudan became "
 "independent in 1956."
 msgstr ""
-"1820 m. Sudanas pateko Egipto valdžion. Vėliau jį užėmė britai. 1956 m. jis "
-"atgavo nepriklausomybÄ™."
 
 #: data/nation/sumerian.ruleset:3
 msgid "Sumerian"
-msgstr "Å umero"
+msgstr "Sumera"
 
 #: data/nation/sumerian.ruleset:4
 msgid "?plural:Sumerians"
-msgstr "?plural:Å umerai"
+msgstr "?plural:Sumeranoj"
 
 #: data/nation/sumerian.ruleset:6
 msgid ""
@@ -22289,9 +22286,6 @@ msgid ""
 "of Sumerian writing some 5500 years old have been found, pre-dating every "
 "other writing in history."
 msgstr ""
-"Šumerai kontroliavo pietinę Mesoptamiją iki Babilonijos iškilimo. Šumerijoje "
-"rastos molinės lentelės su užrašais. Jos datuojamos 5500 m. todėl šumerai "
-"laikomi pirmaisiais sukūrusiais raštą."
 
 #: data/nation/sumerian.ruleset:22
 msgid "Ensi"
@@ -22299,11 +22293,11 @@ msgstr ""
 
 #: data/nation/swazi.ruleset:3
 msgid "Swazi"
-msgstr "Svazilando"
+msgstr "Svazia"
 
 #: data/nation/swazi.ruleset:4
 msgid "?plural:Swazis"
-msgstr "?plural:Svazilandiečiai"
+msgstr "?plural:Svazioj"
 
 #: data/nation/swazi.ruleset:6
 msgid ""
@@ -22322,11 +22316,11 @@ msgstr ""
 
 #: data/nation/swedish.ruleset:3
 msgid "Swedish"
-msgstr "Å vedijos"
+msgstr "Sveda"
 
 #: data/nation/swedish.ruleset:4
 msgid "?plural:Swedes"
-msgstr "?plural:Å vedai"
+msgstr "?plural:Svedoj"
 
 #: data/nation/swedish.ruleset:6
 msgid ""
@@ -22338,28 +22332,20 @@ msgid ""
 "its gained territory. The country has not been involved in an armed conflict "
 "since 1814."
 msgstr ""
-"Švedijos karalystė buvo apkrikštyta ir sujungta į politinę vienovę XIIa. po "
-"Kristaus. Šalis, kaip viena didžiųjų Europos jėgų, tapo žymi XVIIa. po "
-"svarbių taip vadinamų Karių – Karalių užkariavimų. Kaip bebūtų, dėl "
-"blogėjančios ekonomikos ir keleto skaudžių pralaimėjimų Rusijai, Švedija "
-"prarado didžiąja dalį savo užkariautos teritorijos. Šalis nebuvo įsitraukusi "
-"į ginkluotą konfliktą nuo 1814m."
 
 #: data/nation/swiss.ruleset:3
 msgid "Swiss"
-msgstr "Å veicarijos"
+msgstr "Svisa"
 
 #: data/nation/swiss.ruleset:4
 msgid "?plural:Swiss"
-msgstr "?plural:Å veicarai"
+msgstr "?plural:Svisoj"
 
 #: data/nation/swiss.ruleset:6
 msgid ""
 "Switzerland is a federation of cantons, some of which have more than 700 "
 "years of history as a confederacy."
 msgstr ""
-"Šveicarija yra kantonų federacija, kai kurie iš jų jau daugiau nei 700 metų "
-"yra konfederacijoje."
 
 #: data/nation/swiss.ruleset:20
 msgid "Bailiff"
@@ -22367,35 +22353,37 @@ msgstr ""
 
 #: data/nation/swiss.ruleset:21
 msgid "Elected King"
-msgstr "IÅ¡rinktas karalius"
+msgstr ""
 
 #: data/nation/swiss.ruleset:21
 msgid "Elected Queen"
-msgstr "IÅ¡rinkta karalienÄ—"
+msgstr ""
 
 #: data/nation/swiss.ruleset:22
+#, fuzzy
 msgid "Elected Priest"
-msgstr "Išrinktas žynys"
+msgstr "Elektro"
 
 #: data/nation/swiss.ruleset:22
+#, fuzzy
 msgid "Elected Priestess"
-msgstr "Išrinkta žynė"
+msgstr "Ĉefsacerdotino"
 
 #: data/nation/swiss.ruleset:23 data/nation/swiss.ruleset:24
 msgid "President of the Confederation"
-msgstr "Konfederacijos prezidentas"
+msgstr "Federacia Prezidanto"
 
 #: data/nation/swiss.ruleset:25
 msgid "Federal Chancellor"
-msgstr "Federalinis Kancleris"
+msgstr "Federacia Kanceliero"
 
 #: data/nation/taiwanese.ruleset:3
 msgid "Taiwanese"
-msgstr "Taivano"
+msgstr "Tajvana"
 
 #: data/nation/taiwanese.ruleset:4
 msgid "?plural:Taiwanese"
-msgstr "?plural:Taivaniečiai"
+msgstr "?plural:Tajvananoj"
 
 #: data/nation/taiwanese.ruleset:6
 msgid ""
@@ -22403,49 +22391,42 @@ msgid ""
 "communists, the nationalist government evacuated to the island of Taiwan "
 "where they formed the Republic of China."
 msgstr ""
-"Kai Kinijos nacionalistai pralaimÄ—jo ginkluotÄ… kovÄ… Kinijos komunistams, "
-"nacionalinė vyriausybė išsikėlė į Taivano salą, kur jie sukūrė Kinijos "
-"respublikÄ…."
 
 #: data/nation/texan.ruleset:3
 msgid "Texan"
-msgstr "Teksaso"
+msgstr "Teksasa"
 
 #: data/nation/texan.ruleset:4
 msgid "?plural:Texans"
-msgstr "?plural:Teksasiečiai"
+msgstr "?plural:Teksasanoj"
 
 #: data/nation/texan.ruleset:6
 msgid ""
 "Texas is second largest and second most populous state of the USA, famous "
 "for it's \"larger than life\" cowboy mentality."
 msgstr ""
-"Teksasas yra antra pagal dydį ir gyventojų skaičių Amerikos valstija, garsi "
-"dėl savo „didesnių nei gyvenimas“ kaubojiškų tradicijų."
 
 #: data/nation/thai.ruleset:3
 msgid "Thai"
-msgstr "Tailando"
+msgstr "Taja"
 
 #: data/nation/thai.ruleset:4
 msgid "?plural:Thai"
-msgstr "?plural:Tailandiečiai"
+msgstr "?plural:Tajoj"
 
 #: data/nation/thai.ruleset:6
 msgid ""
 "The Thai kingdom was the only country in Southeast Asia to preserve its "
 "independence throught the colonial era of the 18th and 19th centuries AD."
 msgstr ""
-"Tajų karalystė buvo vienintelė šalis pietryčių Azijoje, sugebėjusi išsaugoti "
-"savo nepriklausomybÄ™ per kolonijinÄ™ epochÄ… XVIIIa. - XIXa. po Kristaus."
 
 #: data/nation/tibetan.ruleset:3
 msgid "Tibetan"
-msgstr "Tibeto"
+msgstr "Tibeta"
 
 #: data/nation/tibetan.ruleset:4
 msgid "?plural:Tibetans"
-msgstr "?plural:Tibetiečiai"
+msgstr "?plural:Tibetanoj"
 
 #: data/nation/tibetan.ruleset:6
 msgid ""
@@ -22458,28 +22439,22 @@ msgid ""
 "established a buddhist religious state under the control of the Gelugpa "
 "school of Tibetan Buddhism."
 msgstr ""
-"Tibeto šalis dažnai vadinama „Pasaulio stogu“. Tai yra aukščiausiai iškilęs "
-"pasaulio regionas. 7-tame amžiuje Songtsen Gampo įkūrė Tibeto imperiją, "
-"kurią pripažino Kinija ir Indija. Imperija gyvavo iki 11 amžiaus, kol ją "
-"sunaikino mongolai. Po kelių šimtmečių susilpnėjus mongolų valdžiai Lozang "
-"Gyatso (gimęs 1617), penktasis Dalai Lama, įkūrė budistų religinę valstybę, "
-"kuriÄ…valdÄ— Gelugpa Tibeto budizmo mokykla."
 
 #: data/nation/tibetan.ruleset:27
 msgid "Lama"
-msgstr "Lama"
+msgstr "Lamao"
 
 #: data/nation/tibetan.ruleset:28
 msgid "Dalai Lama"
-msgstr "Dalai Lama"
+msgstr "Dalai-Lamao"
 
 #: data/nation/tunisian.ruleset:3
 msgid "Tunisian"
-msgstr "Tuniso"
+msgstr "Tuniza"
 
 #: data/nation/tunisian.ruleset:4
 msgid "?plural:Tunisians"
-msgstr "?plural:Tunisiečiai"
+msgstr "?plural:Tunizanoj"
 
 #: data/nation/tunisian.ruleset:6
 msgid ""
@@ -22492,22 +22467,15 @@ msgid ""
 "1861. But in 1881 Tunisia was invaded by the French and was made a French "
 "protectorate. The country became independent in 1956."
 msgstr ""
-"Finikiečiai įsteigė Kartaginą dabartinėje Tuniso teritorijoje. "
-"Kartaginiečiai vėliau tapo pagrindine jėga Viduržemio jūros regione iki tol, "
-"kol juos 146 m. pr. Kr. nugalėjo Romėnai. Vėliau Arabų musulmonų "
-"užkariautojai 7-tame amžiuje migravo iš arabų ir osmanų šalių. Bet čia taip "
-"pat buvo daug žydų ir Ispanų maurų, kurie atvyko čia 16-to  amžiaus "
-"pabaigoje. Tunisas pasidarė autonomiškas nuo Osmanų imperijos 1861. Bet 1881 "
-"į Tunisą įsiveržė prancūzai ir padarė prancūzų protektoriatą. Šalis pasidarė "
-"nepriklausoma 1956."
 
 #: data/nation/turk.ruleset:3
+#, fuzzy
 msgid "Turk"
-msgstr "Turkijos"
+msgstr "Turkmena"
 
 #: data/nation/turk.ruleset:4
 msgid "?plural:Turks"
-msgstr "?plural:Turkai"
+msgstr "?plural:Turkoj"
 
 #: data/nation/turk.ruleset:6
 msgid ""
@@ -22516,38 +22484,32 @@ msgid ""
 "Powers.  The country was subsequently reformed and secularized by Kemal "
 "Mustapha, the hero of the defense of Gallipoli."
 msgstr ""
-"Šiuolaikinė Turkija yra Osmanų imperijos palikuonė. Osmanų imperija sunyko "
-"ir buvo suskaidyta po Pirmojo pasaulinio karo dÄ—l priklausimo Centro "
-"valstybių sąjungai. Turkija buvo palaipsniui reformuojama ir supasaulietinta "
-"Mustafa Kemalio, Galipolio gynybos didvyrio."
 
 #: data/nation/ukrainian.ruleset:3
 msgid "Ukrainian"
-msgstr "Ukrainos"
+msgstr "Ukrajna"
 
 #: data/nation/ukrainian.ruleset:4
 msgid "?plural:Ukrainians"
-msgstr "?plural:Ukrainiečiai"
+msgstr "?plural:Ukrajnanoj"
 
 #: data/nation/ukrainian.ruleset:6
 msgid ""
 "The Ukraine is a vast region on the westernmost marches of the former Soviet "
 "Union. It includes some of the most fertile black-soil cropland on Earth."
 msgstr ""
-"Ukraina yra platus regionas buvusios Sovietų Sąjungos vakarinių sienų "
-"vietoje. Joje yra vienas derlingiausių Žemėje juodasis dirvožemis."
 
 #: data/nation/ukrainian.ruleset:18
 msgid "Hetman"
-msgstr "Etmonas"
+msgstr ""
 
 #: data/nation/uyghur.ruleset:3
 msgid "Uyghur"
-msgstr "Ugrų"
+msgstr ""
 
 #: data/nation/uyghur.ruleset:4
 msgid "?plural:Uyghurs"
-msgstr "?plural:Ugrai"
+msgstr ""
 
 #: data/nation/uyghur.ruleset:6
 msgid ""
@@ -22558,20 +22520,15 @@ msgid ""
 "Asian states of Uzbekistan, Kazakhstan and Kyrgyzstan. They are also the "
 "main minority of the Xinjiang province of China."
 msgstr ""
-"Uighurai buvo rytinė Turkų imperija ir civilizacija. Savo klestėjimo "
-"viršūnėje ji kontroliavo didžiąją centrinės ir šiaurės Azijos dalį. Po kovų "
-"su kinais, kurios tęsėsi keletą šimtmečių, jie galiausiai buvo pajungti "
-"Qingų dinastijos 1700m. Šiais laikas uighurų palikuonys gyvena Centrinės "
-"Azijos valstybÄ—se, tokiose kaip Uzbekistanas, Kazakstanas ir Kirgizstanas. "
-"Jie taip pat sudaro pagrindinę mažumą Kinijos Xinjiang provincijoje."
 
 #: data/nation/venezuelan.ruleset:3
+#, fuzzy
 msgid "Venezuela"
-msgstr "Venesuelos"
+msgstr "Venezuela"
 
 #: data/nation/venezuelan.ruleset:4
 msgid "?plural:Venezuelans"
-msgstr "?plural:Venesueliečiai"
+msgstr "?plural:Venezuelanoj"
 
 #. TRANS: The fourth letter in "Simon" should be
 #. TRANS: U+00F3 LATIN SMALL LETTER O WITH ACUTE if available in
@@ -22583,72 +22540,64 @@ msgid ""
 "July 5th 1811 under the leadership of El Libertador Simon Bolivar - The "
 "Liberator."
 msgstr ""
-"Venesuela yra šiauriausia Pietų Amerijos šalis. Šalis buvo Ispanijos "
-"kolonija nuo 16 amžiaus ir atgavo nepriklausomybę 1811 metų liepos 5 dieną "
-"Simono Bolivaro \"IÅ¡vaduotojo\" vadovaujamo sukilimo metu."
 
 #: data/nation/venezuelan.ruleset:28
 msgid "Terrateniente"
-msgstr ""
+msgstr "Grandbienulo"
 
 #: data/nation/vietnamese.ruleset:3
 msgid "Vietnamese"
-msgstr "Vietnamo"
+msgstr "Vjetnama"
 
 #: data/nation/vietnamese.ruleset:4
 msgid "?plural:Vietnamese"
-msgstr "?plural:Vietnamiečiai"
+msgstr "?plural:Vjetnamanoj"
 
 #: data/nation/vietnamese.ruleset:6
 msgid ""
 "The Vietnamese nation was founded in the first century AD by twin sisters "
 "who became the war leaders of a revolt against a Chinese military governor."
 msgstr ""
-"Vietnamas buvo sukurtas I a. dvynių seserų, kurios buvo karo vadės "
-"revoliucijos prieš Kinijos karinę valdžią."
 
 #: data/nation/viking.ruleset:3
 msgid "Viking"
-msgstr "Vikingų"
+msgstr "Vikinga"
 
 #: data/nation/viking.ruleset:4
 msgid "?plural:Vikings"
-msgstr "?plural:Vikingai"
+msgstr "?plural:Vikingoj"
 
-# Rusios ar Rusijos
 #: data/nation/viking.ruleset:6
 msgid ""
 "The Vikings raided and traded along the coasts of Europe between 800AD and "
 "1100AD. Viking raiders eventually became the rulers of Normandy, Russia, and "
 "a short-lived kingdom in Sicily."
 msgstr ""
-"Vikingai prekiavo ir plÄ—Å¡Ä— Europos krantus tarp 800 m. po Kristaus ir 1100 "
-"m. po Kristaus. Vikingų plėšikai galiausiai tapo Normandijos, Rusios ir "
-"trumpai gyvavusios Sicilijos karalystÄ—s valdovais."
+"Vikingoj prirabis kaj komercis laŭlonge de Eŭropa marbordo de 800 PK ĝis "
+"1100 PK. Vikingoj iĝis regantoj de Normandio, de Rusio kaj, nur mallonge, de "
+"Sicilio."
 
 #: data/nation/welsh.ruleset:3
 msgid "Welsh"
-msgstr "Velso"
+msgstr "Kimra"
 
 #: data/nation/welsh.ruleset:4
 msgid "?plural:Welsh"
-msgstr "?plural:Velsiečiai"
+msgstr "?plural:Kimroj"
 
 #: data/nation/welsh.ruleset:6
 msgid ""
 "The Welsh at one time controlled all of what is now England until being "
 "driven into the mountainous western reaches by invading Saxons."
 msgstr ""
-"Velsiečiai vienu metu kontroliavo šiuolaikinės Anglijos teritoriją. Nacija "
-"buvo išstumta į kalnuotas vakarines sritis saksų invazijos metu."
 
 #: data/nation/westphalian.ruleset:3
 msgid "Westphalian"
-msgstr "Vestfalijos"
+msgstr "Vestfala"
 
 #: data/nation/westphalian.ruleset:4
 msgid "?plural:Westphalians"
-msgstr "?plural:Vestfaliečiai"
+msgstr "?plural:Vestfaloj"
 
 #: data/nation/westphalian.ruleset:6
 msgid ""
@@ -22656,17 +22605,14 @@ msgid ""
 "duchy of Saxony. Present-day it consists of the Northern part of the largest "
 "German federal state, North Rhine-Westphalia."
 msgstr ""
-"Vestfalija, prieš tapdama Prūsijos provinsija, buvo vakarinė Saksonijos "
-"kunigaikštystės dalis. Šiuo metu regionas yra šiaurinė didžiausios "
-"Vokietijos federacinės žemės, Šiaurės Reino-Vestfalijos, dalis."
 
 #: data/nation/zulu.ruleset:3
 msgid "Zulu"
-msgstr "Zulusų"
+msgstr "Zulua"
 
 #: data/nation/zulu.ruleset:4
 msgid "?plural:Zulus"
-msgstr "?plural:Zulusai"
+msgstr "?plural:Zuluoj"
 
 #: data/nation/zulu.ruleset:6
 msgid ""
@@ -22674,69 +22620,64 @@ msgid ""
 "into southern Africa beginning in the early 1700s, conquering the native "
 "Khoisan peoples and clashing with European settlers."
 msgstr ""
-"Zulai yra karingi Bantu žmonės, kurie migravo iš vakarų centrinės Afrikos į "
-"pietus XVIII a.pradžioje, užkariaudami vietinius Khoisanus ir susidurdami su "
-"europiečių kolonistais."
 
 #: data/scenario/british-isles-85x80-v2.80.sav:3
 msgid "British Isles (medium/classic)"
-msgstr "Britų salos (vidutinis/klasikinis)"
+msgstr "Britaj Insuloj (meza, klasika)"
 
 #: data/scenario/british-isles-85x80-v2.80.sav:4
 msgid "Classic-style 85x80 map of the British Isles."
-msgstr "Klasikinio stiliaus 85x80 dydžio Britų salų žemėlapis."
+msgstr "Klasika 85x80 mapo de Britaj Insuloj."
 
 #: data/scenario/earth-160x90-v2.sav:3
 msgid "Earth (classic, large)"
-msgstr "Žemė (klasikinis, didelis)"
+msgstr "Tero (klasika, larĝa)"
 
 #: data/scenario/earth-160x90-v2.sav:4
 msgid "Classic-style 160x90 Earth scenario."
-msgstr "Klasikinio stiliaus 160x90 dydžio Žemės scenarijus."
+msgstr "Klasika 160x90 scenejo de Terglobo."
 
 #: data/scenario/earth-80x50-v2.sav:3
 msgid "Earth (classic, small)"
-msgstr "Žemė (klasikinis, nedidelis)"
+msgstr "Tero (klasika, eta)"
 
 #: data/scenario/earth-80x50-v2.sav:4
 msgid "Classic-style 80x50 Earth scenario."
-msgstr "Klasikinio stiliaus 80x50 dydžio Žemės scenarijus."
+msgstr "Klasika 80x50 scenejo de Terglobo."
 
 #: data/scenario/europe-200x100-v2.sav:3
 msgid "Europe (giant/classic)"
-msgstr "Europa (milžiniškas/klasikinis)"
+msgstr "EÅ­ropo (giganta/klasika)"
 
 #: data/scenario/europe-200x100-v2.sav:4
 msgid "Very large classic-style map of Europe."
-msgstr "Labai didelis klasikinio stiliaus Europos žemėlapis."
+msgstr "Klasika ege larĝa mapo de Eŭropo."
 
 #: data/scenario/hagworld-120x60-v1.2.sav:5
 msgid "Earth (classic, medium)"
-msgstr "Žemė (klasikinis, vidutinis)"
+msgstr "Tero (klasika, meza)"
 
 #: data/scenario/hagworld-120x60-v1.2.sav:6
 msgid "Classic-style 120x60 Earth scenario."
-msgstr "Klasikinio stiliaus 120x60 dydžio Žėmės scenarijus."
+msgstr "Klasika 120x60 scenejo de Terglobo."
 
 #: data/scenario/iberian-peninsula-136x100-v1.0.sav:3
 msgid "Iberian Peninsula (classic/large)"
-msgstr "Iberijos pusiasalis (klasikinis/didelis)"
+msgstr "Ibera Duoninsulo (klasika/larĝa)"
 
 #: data/scenario/iberian-peninsula-136x100-v1.0.sav:4
 msgid ""
 "Large classic-style map of the Iberian Peninsula (modern-day Spain and "
 "Portugal)."
-msgstr ""
-"Didelis klasikinio stiliaus Iberijos (šių dienų Ispanija ir Portugalija) "
-"pusiasalio žemėlapis."
+msgstr "Klasika larĝa mapo de Ibera Duoninsulo (nune Hispanio kaj Portugalio)."
 
 #: data/scenario/tutorial.sav:3
 msgid "Tutorial"
-msgstr "Apmokymas"
+msgstr "Lernilo"
 
 #: data/scenario/tutorial.sav:4
 msgid "Tutorial Scenario."
-msgstr "Apmokomasis scenarijus."
+msgstr "Lernilo pri scenejo"
 
 #: data/scenario/tutorial.sav:18
 msgid ""
@@ -23053,288 +22994,1277 @@ msgstr ""
 
 #: data/scenario/tutorial.sav:380
 msgid "Loading tutorial events."
-msgstr "Įkeliami apmokymo įvykiai."
+msgstr ""
 
 #: data/civ1/game.ruleset:101 data/civ2/game.ruleset:101
 #: data/default/game.ruleset:129
 msgid "Team 0"
-msgstr "Komanda 0"
+msgstr "Grupo 0"
 
 #: data/civ1/game.ruleset:102 data/civ2/game.ruleset:102
 #: data/default/game.ruleset:130
 msgid "Team 1"
-msgstr "Komanda 1"
+msgstr "Grupo 1"
 
 #: data/civ1/game.ruleset:103 data/civ2/game.ruleset:103
 #: data/default/game.ruleset:131
 msgid "Team 2"
-msgstr "Komanda 2"
+msgstr "Grupo 2"
 
 #: data/civ1/game.ruleset:104 data/civ2/game.ruleset:104
 #: data/default/game.ruleset:132
 msgid "Team 3"
-msgstr "Komanda 3"
+msgstr "Grupo 3"
 
 #: data/civ1/game.ruleset:105 data/civ2/game.ruleset:105
 #: data/default/game.ruleset:133
 msgid "Team 4"
-msgstr "Komanda 4"
+msgstr "Grupo 4"
 
 #: data/civ1/game.ruleset:106 data/civ2/game.ruleset:106
 #: data/default/game.ruleset:134
 msgid "Team 5"
-msgstr "Komanda 5"
+msgstr "Grupo 5"
 
 #: data/civ1/game.ruleset:107 data/civ2/game.ruleset:107
 #: data/default/game.ruleset:135
 msgid "Team 6"
-msgstr "Komanda 6"
+msgstr "Grupo 6"
 
 #: data/civ1/game.ruleset:108 data/civ2/game.ruleset:108
 #: data/default/game.ruleset:136
 msgid "Team 7"
-msgstr "Komanda 7"
+msgstr "Grupo 7"
 
 #: data/civ1/game.ruleset:109 data/civ2/game.ruleset:109
 #: data/default/game.ruleset:137
 msgid "Team 8"
-msgstr "Komanda 8"
+msgstr "Grupo 8"
 
 #: data/civ1/game.ruleset:110 data/civ2/game.ruleset:110
 #: data/default/game.ruleset:138
 msgid "Team 9"
-msgstr "Komanda 9"
+msgstr "Grupo 9"
 
 #: data/civ1/game.ruleset:111 data/civ2/game.ruleset:111
 #: data/default/game.ruleset:139
 msgid "Team 10"
-msgstr "Komanda 10"
+msgstr "Grupo 10"
 
 #: data/civ1/game.ruleset:112 data/civ2/game.ruleset:112
 #: data/default/game.ruleset:140
 msgid "Team 11"
-msgstr "Komanda 11"
+msgstr "Grupo 11"
 
 #: data/civ1/game.ruleset:113 data/civ2/game.ruleset:113
 #: data/default/game.ruleset:141
 msgid "Team 12"
-msgstr "Komanda 12"
+msgstr "Grupo 12"
 
 #: data/civ1/game.ruleset:114 data/civ2/game.ruleset:114
 #: data/default/game.ruleset:142
 msgid "Team 13"
-msgstr "Komanda 13"
+msgstr "Grupo 13"
 
 #: data/civ1/game.ruleset:115 data/civ2/game.ruleset:115
 #: data/default/game.ruleset:143
 msgid "Team 14"
-msgstr "Komanda 14"
+msgstr "Grupo 14"
 
 #: data/civ1/game.ruleset:116 data/civ2/game.ruleset:116
 #: data/default/game.ruleset:144
 msgid "Team 15"
-msgstr "Komanda 15"
+msgstr "Grupo 15"
 
 #: data/civ1/game.ruleset:117 data/civ2/game.ruleset:117
 #: data/default/game.ruleset:145
 msgid "Team 16"
-msgstr "Komanda 16"
+msgstr "Grupo 16"
 
 #: data/civ1/game.ruleset:118 data/civ2/game.ruleset:118
 #: data/default/game.ruleset:146
 msgid "Team 17"
-msgstr "Komanda 17"
+msgstr "Grupo 17"
 
 #: data/civ1/game.ruleset:119 data/civ2/game.ruleset:119
 #: data/default/game.ruleset:147
 msgid "Team 18"
-msgstr "Komanda 18"
+msgstr "Grupo 18"
 
 #: data/civ1/game.ruleset:120 data/civ2/game.ruleset:120
 #: data/default/game.ruleset:148
 msgid "Team 19"
-msgstr "Komanda 19"
+msgstr "Grupo 19"
 
 #: data/civ1/game.ruleset:121 data/civ2/game.ruleset:121
 #: data/default/game.ruleset:149
 msgid "Team 20"
-msgstr "Komanda 20"
+msgstr "Grupo 20"
 
 #: data/civ1/game.ruleset:122 data/civ2/game.ruleset:122
 #: data/default/game.ruleset:150
 msgid "Team 21"
-msgstr "Komanda 21"
+msgstr "Grupo 21"
 
 #: data/civ1/game.ruleset:123 data/civ2/game.ruleset:123
 #: data/default/game.ruleset:151
 msgid "Team 22"
-msgstr "Komanda 22"
+msgstr "Grupo 22"
 
 #: data/civ1/game.ruleset:124 data/civ2/game.ruleset:124
 #: data/default/game.ruleset:152
 msgid "Team 23"
-msgstr "Komanda 23"
+msgstr "Grupo 23"
 
 #: data/civ1/game.ruleset:125 data/civ2/game.ruleset:125
 #: data/default/game.ruleset:153
 msgid "Team 24"
-msgstr "Komanda 24"
+msgstr "Grupo 24"
 
 #: data/civ1/game.ruleset:126 data/civ2/game.ruleset:126
 #: data/default/game.ruleset:154
 msgid "Team 25"
-msgstr "Komanda 25"
+msgstr "Grupo 25"
 
 #: data/civ1/game.ruleset:127 data/civ2/game.ruleset:127
 #: data/default/game.ruleset:155
 msgid "Team 26"
-msgstr "Komanda 26"
+msgstr "Grupo 26"
 
 #: data/civ1/game.ruleset:128 data/civ2/game.ruleset:128
 #: data/default/game.ruleset:156
 msgid "Team 27"
-msgstr "Komanda 27"
+msgstr "Grupo 27"
 
 #: data/civ1/game.ruleset:129 data/civ2/game.ruleset:129
 #: data/default/game.ruleset:157
 msgid "Team 28"
-msgstr "Komanda 28"
+msgstr "Grupo 28"
 
 #: data/civ1/game.ruleset:130 data/civ2/game.ruleset:130
 #: data/default/game.ruleset:158
 msgid "Team 29"
-msgstr "Komanda 29"
+msgstr "Grupo 29"
 
 #: data/civ1/game.ruleset:131 data/civ2/game.ruleset:131
 #: data/default/game.ruleset:159
 msgid "Team 30"
-msgstr "Komanda 30"
+msgstr "Grupo 30"
 
 #: data/civ1/game.ruleset:132 data/civ2/game.ruleset:132
 #: data/default/game.ruleset:160
 msgid "Team 31"
-msgstr "Komanda 31"
+msgstr "Grupo 31"
+
+#~ msgid "Technology: %s"
+#~ msgstr "Teĥnologio: %s"
+
+#~ msgid "City: %s"
+#~ msgstr "Urbo: %s"
+
+#~ msgid "Global: %s"
+#~ msgstr "Äœenerala: %s"
+
+#~ msgid "Hut: %s"
+#~ msgstr "Kabano: %s"
 
-#~ msgid "Units: "
-#~ msgstr "Daliniai: "
+#~ msgid "Nation: %s"
+#~ msgstr "Nacio: %s"
 
-#~ msgid "?outputlist: or "
-#~ msgstr "?outputlist: arba "
+#~ msgid "Unit: %s"
+#~ msgstr "Unuo: %s"
 
-#~ msgid "?outputlist: and "
-#~ msgstr "?outputlist: ir "
+#~ msgid "Selected New Goal"
+#~ msgstr "Nova celo estis elektita"
+
+#~ msgid "Sold"
+#~ msgstr "Vendita"
+
+#~ msgid "Famine"
+#~ msgstr "Malsatmisero"
+
+#~ msgid "Growth"
+#~ msgstr "Pliiĝo"
+
+#~ msgid "Nuked"
+#~ msgstr "Atombombita"
+
+#~ msgid "Bribe"
+#~ msgstr "Subaĉeto"
+
+#~ msgid "Caused Incident"
+#~ msgstr "KaÅ­zita akcidento"
+
+#~ msgid "Escape"
+#~ msgstr "Forkuro"
+
+#~ msgid "Failed"
+#~ msgstr "Malsukceso"
+
+#~ msgid "Incite"
+#~ msgstr "Instigo"
+
+#~ msgid "Poison"
+#~ msgstr "Venenado"
+
+#~ msgid "Theft"
+#~ msgstr "Åœtelo"
+
+#~ msgid "Civil War"
+#~ msgstr "Intercivitana milito"
+
+#~ msgid "Broken"
+#~ msgstr "Rompo"
+
+#~ msgid "Peace"
+#~ msgstr "Paco"
+
+#~ msgid "Finished"
+#~ msgstr "Finita"
+
+#~ msgid "Started"
+#~ msgstr "Starinta"
+
+#~ msgid "Stopped"
+#~ msgstr "Haltita"
+
+#~ msgid "Server Aborting"
+#~ msgstr "Ĉesigado de la gastiga komputilo"
+
+#~ msgid "Server Problems"
+#~ msgstr "Problemoj de gastiga komputilo"
+
+#~ msgid "Away"
+#~ msgstr "For"
+
+#~ msgid "Cheating"
+#~ msgstr "Babillineo"
+
+#~ msgid "\"%s\" units"
+#~ msgstr "\"%s\" unuoj"
+
+#~ msgid "%s AI"
+#~ msgstr "%s AI"
+
+#~ msgid "%s terrain"
+#~ msgstr "%s areo"
+
+#~ msgid "Oceanic"
+#~ msgstr "Oceana"
+
+#~ msgid "Base"
+#~ msgstr "Bazo"
+
+#~ msgid "Freeciv version %s (%s)"
+#~ msgstr "Freeciv versio %s (%s)"
+
+#~ msgid "Please report this message at %s"
+#~ msgstr "Bonvolu sendi tiun ĉi mesaĝon al %s"
 
 #~ msgid ""
-#~ "* Military units away from home and field units will cause one citizen to "
-#~ "become unhappy.\n"
+#~ "%s can't build %s from the worklist; only AI of level %s may build this.  "
+#~ "Postponing..."
 #~ msgstr ""
-#~ "* Kariniai daliniai toli nuo namų ir lauko daliniai vieną gyventoją "
-#~ "padarys nelaimingÄ….\n"
+#~ "%s ne povas prepari %sn de la laborlisto; Nur AI je nivelo %s povas "
+#~ "konstrui tion. Äœi estas prokrastita..."
 
 #~ msgid ""
-#~ "%s%s  -  %s%s\n"
-#~ "\n"
+#~ "%s can't build %s from the worklist; %s terrain class is required.  "
+#~ "Postponing..."
 #~ msgstr ""
-#~ "%s%s  -  %s%s\n"
-#~ "\n"
+#~ "%s ne povas prepari %sn de la laborlisto; %s grundo estas necesa. Äœi "
+#~ "estas prokrastita..."
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "Celebrations in your honour in %s."
+#~ msgstr "Celebrado por vi en %s."
 
-#~ msgid ", "
-#~ msgstr ","
+#~ msgid ""
+#~ "cheating\n"
+#~ "cheating <player-name>"
+#~ msgstr ""
+#~ "cheating\n"
+#~ "cheating <ludantonomo>"
+
+#~ msgid "Set one or all AI players to 'cheating'."
+#~ msgstr "Agordu unu aÅ­ pluraj IA-ludantoj laÅ­ nivelo 'babillineo'."
 
 #~ msgid "%s Welcome"
-#~ msgstr "%s Sveiki atvykÄ™"
+#~ msgstr "%s Bonvenon"
 
 #~ msgid "Client rejected: %s."
-#~ msgstr "Klientas atmestas: %s."
+#~ msgstr "Rifuzita kliento: %s."
+
+#~ msgid "%s has client version %d.%d.%d%s"
+#~ msgstr "%s havas version de kliento %d.%d.%d%s"
+
+#~ msgid "Invalid username '%s'"
+#~ msgstr "Nevalida uzantonomo '%s'"
+
+#~ msgid "'%s' already connected."
+#~ msgstr "'%s' estas jam konektita."
+
+#~ msgid "Cannot create unit on enemy tile."
+#~ msgstr "Vi ne povas krei unuon en malamika areo."
+
+#~ msgid "Cannot create %s unit on this terrain."
+#~ msgstr "Vi ne povas krei %s unuon en tiu ĉi areo."
+
+#~ msgid "Cannot build city on this tile."
+#~ msgstr "Vi ne povas fondi urbon en tiu ĉi areo."
+
+#~ msgid "Could not create city."
+#~ msgstr "Vi ne povas fondi urbon."
+
+#~ msgid "Could not change city size."
+#~ msgstr "Vi ne povas ŝanĝi la grandon de la urbo."
+
+#~ msgid "Cannot remove knowledge about own city."
+#~ msgstr "Vi ne povas formovi scion pri via urbo."
+
+#~ msgid "Cannot remove knowledge about own unit."
+#~ msgstr "Vi ne povas formovi scion pri via unuo."
+
+#~ msgid "No units placed for %s!"
+#~ msgstr "Neniu unuo estas disponita por %s!"
+
+#~ msgid "%s is the rebellious leader of the %s."
+#~ msgstr "%s estas la estro de la ribelo de la %s."
+
+#~ msgid "Civil war partitions the %s; the %s now hold %d city."
+#~ msgid_plural "Civil war partitions the %s; the %s now hold %d cities."
+#~ msgstr[0] "La intercivitana milito dividas la %sn; la %s nun havas %d urbo."
+#~ msgstr[1] ""
+#~ "La intercivitana milito dividas la %sn; la %s nun havas %d urboj."
+
+#~ msgid "%2d: The Supreme %s"
+#~ msgstr "%2d: La Plejsuperaj %s"
+
+#~ msgid "%2d: The Great %s"
+#~ msgstr "%2d: La Grandaj %s"
+
+#~ msgid "%2d: The Glorious %s"
+#~ msgstr "%2d: La Gloroplenaj %s"
+
+#~ msgid "%2d: The Excellent %s"
+#~ msgstr "%2d: La Plej Eminentaj %s"
+
+#~ msgid "%2d: The Eminent %s"
+#~ msgstr "%2d: La Eminentaj %s"
+
+#~ msgid "%2d: The Distinguished %s"
+#~ msgstr "%2d: La Distingitaj %s"
+
+#~ msgid "%2d: The Average %s"
+#~ msgstr "%2d: La Normalaj %s"
+
+#~ msgid "%2d: The Mediocre %s"
+#~ msgstr "%2d: La Mezvaloraj %s"
+
+#~ msgid "%2d: The Ordinary %s"
+#~ msgstr "%2d: La Ordinaraj %s"
+
+#~ msgid "%2d: The Pathetic %s"
+#~ msgstr "%2d: La Mizeraj %s"
 
-#~ msgid "Your bombarding %s%s became more experienced!"
-#~ msgstr "Jūsų bombarduojantis %s%s tapo labiau patyręs!"
+#~ msgid "%2d: The Valueless %s"
+#~ msgstr "%2d: La Senvaloraj %s"
+
+#~ msgid "%2d: The Worthless %s"
+#~ msgstr "%2d: La SentaÅ­gaj %s"
+
+#~ msgid "%2d: The Wretched %s"
+#~ msgstr "%2d: La Malnoblaj %s"
+
+#~ msgid "Limited number of AI players"
+#~ msgstr "Limigita nombro da AI-ludantoj"
+
+#~ msgid "Savegame compression algorithm"
+#~ msgstr "Kunprem-algoritmo por konservotaj ludoj"
 
 #~ msgid ""
-#~ "Your %s%s survived the pathetic attack from %s's %s and became more "
-#~ "experienced!"
-#~ msgstr "Jūsų %s%s išgyveno apgailėtiną %s %s ataką ir įgavo patirties!"
+#~ "Compression library to use for savegames.\n"
+#~ " 0 - none\n"
+#~ " 1 - zlib (gzip format)\n"
+#~ " 2 - bzip2\n"
+#~ "Not all servers support all compression methods."
+#~ msgstr ""
+#~ "Uzeblaj kumpremaj bibliotekoj por konservotaj ludoj.\n"
+#~ " 0 - neniu\n"
+#~ " 1 - zlib (gzip formato)\n"
+#~ " 2 - bzip2\n"
+#~ "Ne ĉiuj kumprem-metodoj estas subtenitaj de ĉiuj serviloj."
 
-#~ msgid " outside %s"
-#~ msgstr "%s išorėje"
+#~ msgid "Running"
+#~ msgstr "Plenumanta"
 
-#~ msgid " near %s"
-#~ msgstr " arti %s"
+#~ msgid "Game over"
+#~ msgstr "Ludfino"
 
-#~ msgid " Choose Your Diplomat's Strategy"
-#~ msgstr " Pasirinkite savo diplomato strategijÄ…"
+#~ msgid "Waiting"
+#~ msgstr "Atendante"
+
+#~ msgid "Unsupported compression type %d"
+#~ msgstr "Nesubtenita kunpremo %d"
 
-#, fuzzy
 #~ msgid ""
 #~ "Your client is too old. To use this server, please upgrade your client to "
-#~ "a Freeciv 2.1 or later."
+#~ "a Freeciv 2.2 or later."
 #~ msgstr ""
-#~ "Jūsų klientas yra per senas. Kad galėtumėte prisijungti prie šio "
-#~ "serverio, prašome atsinaujinti savo klientą iš CVS į naujesnį nei 2003-11-"
-#~ "28 arba Freeciv 2.1 ir naujesnį."
+#~ "Vi kliento estas tro malnova. Por uzi tiun ĉi servilon, bonvolu "
+#~ "anstataÅ­igi vian kliento per Freeciv 2.2 aÅ­ sekvaj versioj."
+
+#~ msgid "%s replacing %s as an AI-controlled player."
+#~ msgstr "%s anstataÅ­as %s-n kiel AI-ludanto."
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Uzo:\n"
+#~ "%s"
+
+#~ msgid "Option: %s  -  %s"
+#~ msgstr "Opcio: %s  -  %s"
+
+#~ msgid "Option: %s"
+#~ msgstr "Opcio: %s"
+
+#~ msgid "players=%d cities=%d citizens=%d units=%d"
+#~ msgstr "ludantoj=%d urboj=%d civitanoj=%d unuoj=%d"
 
-#~ msgid ", nation %s"
-#~ msgstr ", tauta %s"
+#~ msgid "Reassigned nation to %s by server console."
+#~ msgstr "La nacio estis ree asignita al %s fere de la servilo."
 
-#~ msgid ", team %s"
-#~ msgstr ", komanda %s"
+#~ msgid "Reassigned nation to %s by %s."
+#~ msgstr "La nacio estis ree asignita al %s fare de %s."
 
-#~ msgid "_Map"
-#~ msgstr "_Žemėlapis"
+#~ msgid "Command: %s  -  %s"
+#~ msgstr "Komando: %s  -  %s"
 
-#~ msgid "Create _player"
-#~ msgstr "Sukurti _žaidėją"
+#~ msgid "%s cannot move that far from the coast line."
+#~ msgstr "%s ne povas movi tiom malproksime de la marbordo."
 
-#~ msgid "_Release player"
-#~ msgstr "At_jungti žaidėją"
+#~ msgid ""
+#~ "Only applies to \"%s\" units.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Oni aplikas nur al \"%s\" unuoj.\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Requires AI player of level %s.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Necesas AI-ludantoj je nivelo %s.\n"
+#~ "\n"
 
-#~ msgid "Gover_nment"
-#~ msgstr "_VyriausybÄ—"
+#~ msgid ""
+#~ "Requires %s terrain.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Necesas %s grundo.\n"
+#~ "\n"
 
-#~ msgid "_Players"
-#~ msgstr "Žai_dėjai"
+#~ msgid "  * %s units\n"
+#~ msgstr "  * %s unuoj\n"
 
-#~ msgid "_Science"
-#~ msgstr "_Mokslas"
+#~ msgid "Font"
+#~ msgstr "Tiparo"
 
-#~ msgid "S_paceship"
-#~ msgstr "_ErdvÄ—laivis"
+#~ msgid "?clistlast:, and %s"
+#~ msgstr "?clistlast:, kaj %s"
 
-#~ msgid "Game _Options..."
-#~ msgstr "Žaidimo _nustatymai..."
+#~ msgid "?clistlast: and %s"
+#~ msgstr "?clistlast: kaj %s"
 
-#~ msgid "Clear _Log"
-#~ msgstr "Išvalyti _žurnalą"
+#~ msgid "Loading tileset \"%s\"."
+#~ msgstr "Ŝargante grafikaĵon \"%s\"."
 
-#~ msgid "Work_lists"
-#~ msgstr "_Darbų sąrašai"
+#~ msgid "Using default tileset instead."
+#~ msgstr "Oni uzas defaŭltan grafikaĵon anstataŭe."
 
-#~ msgid "Science Report"
-#~ msgstr "Mokslo ataskaita"
+#~ msgid "clear all"
+#~ msgstr "vakigu ĉion"
 
-#~ msgid "Reason: line not found"
-#~ msgstr "Priežastis: eilutė nerasta"
+#~ msgid "Known"
+#~ msgstr "Konata"
 
-#~ msgid "Plugin '%s' is now selected"
-#~ msgstr "Dabar pasirinktas įskiepis '%s'."
+#~ msgid "Toggle"
+#~ msgstr "Mastrumu"
 
-#~ msgid "http://www.libsdl.org/projects/SDL_mixer/index.html"
-#~ msgstr "http://www.libsdl.org/projects/SDL_mixer/index.html"
+#~ msgid "Paint"
+#~ msgstr "Pentru"
 
-#~ msgid "Will continue with disabled sounds."
-#~ msgstr "Bus tęsiama su išjungtu garsu."
+#~ msgid "Player"
+#~ msgstr "Ludanto"
 
-#~ msgid "file: \"%s\""
-#~ msgstr "byla: „%s“"
+#~ msgid "Activity"
+#~ msgstr "Aktiveco"
 
-#, fuzzy
-#~ msgid "Couldn't blit text to display: %s"
-#~ msgstr "Negaliu konvertuoti tekstinio failo iš %s į %s: %s"
+#~ msgid "Activity Target"
+#~ msgstr "Celo de la aktiveco"
+
+#~ msgid "Activity Count"
+#~ msgstr "Konto de la aktiveco"
+
+#~ msgid "Owner"
+#~ msgstr "Posedanto"
+
+#~ msgid "Editing Tools"
+#~ msgstr "Redaktilo"
+
+#~ msgid "Select _all"
+#~ msgstr "_Elektu ĉion"
+
+#~ msgid "Edit Nation"
+#~ msgstr "Redaktu nacion"
+
+#~ msgid "City Label"
+#~ msgstr "Langeto de urbo"
+
+#~ msgid "Notify Label"
+#~ msgstr "Langeto de notoj"
+
+#~ msgid "Spaceship Label"
+#~ msgstr "Langeto de kosmoŝipo"
+
+#~ msgid "Help Label"
+#~ msgstr "Langeto de la helpilo"
+
+#~ msgid "Help Link"
+#~ msgstr "Helpilo (ligilo)"
+
+#~ msgid "Help Text"
+#~ msgstr "Helpilo (teksto)"
+
+#~ msgid "Chatline Area"
+#~ msgstr "Babillineo"
+
+#~ msgid "Beta Label"
+#~ msgstr "Langeto de Beta"
+
+#~ msgid "Small Font"
+#~ msgstr "Eta tiparo"
+
+#~ msgid "Comment Label"
+#~ msgstr "Langeto de komentoj"
+
+#~ msgid "_Options"
+#~ msgstr "_Opcioj"
+
+#~ msgid "_Local Client"
+#~ msgstr "_Loka kliento"
+
+#~ msgid "_Message"
+#~ msgstr "_Mesaĝoj"
+
+#~ msgid "_Remote Server"
+#~ msgstr "_Fora servilo"
+
+#~ msgid "Save Options _Now"
+#~ msgstr "Konservu opciojn _nun"
+
+#~ msgid "_Edit"
+#~ msgstr "_Redaktu"
+
+#~ msgid "Editing _Mode"
+#~ msgstr "Redaktomoduso"
+
+#~ msgid "Editing _Tools"
+#~ msgstr "Redak_tiloj"
+
+#~ msgid "Recalculate _Borders"
+#~ msgstr "Reen taksu la landlimojn"
+
+#~ msgid "Regenerate _Water"
+#~ msgstr "Regeneru ak_von"
+
+#~ msgid "Select same type in tile"
+#~ msgstr "Elektu saman specon en kahelo"
+
+#~ msgid "_Editor"
+#~ msgstr "R_edaktilo"
+
+#~ msgid "_Edit Nation..."
+#~ msgstr "R_edaktu nacion.."
+
+#~ msgid "Never"
+#~ msgstr "Neniam"
+
+#~ msgid "Loading theme \"%s\"."
+#~ msgstr "Åœargante temon \"%s\"."
+
+#~ msgid "Editing Mode"
+#~ msgstr "Redakta moduso"
+
+#~ msgid "Tools"
+#~ msgstr "Iloj"
+
+#~ msgid "Editor"
+#~ msgstr "Redaktilo"
+
+#~ msgid "Water"
+#~ msgstr "Akvo"
+
+#~ msgid "Lake"
+#~ msgstr "Lago"
+
+#~ msgid "?ocean:Shelf"
+#~ msgstr "?ocean:Malprofundaĵo"
+
+#~ msgid "Briny Deep"
+#~ msgstr "Mara profundaĵo"
+
+#~ msgid "?ocean:Abyss"
+#~ msgstr "?ocean:Abismo"
+
+#~ msgid "Oceanic Ridge"
+#~ msgstr "Oceana Ĉeno"
+
+#~ msgid "Oceanic Vent"
+#~ msgstr "Oceana kavaĵo"
+
+#~ msgid "Glacial hills"
+#~ msgstr "Frostaj montetoj"
+
+#~ msgid "Desert hills"
+#~ msgstr "Dezertaj montetoj"
+
+#~ msgid "Alpine forest"
+#~ msgstr "Alpa arbaro"
+
+#~ msgid "Evergreen forest"
+#~ msgstr "Ĉiamverda arbodensejo"
+
+#~ msgid "Deciduous forest"
+#~ msgstr "Intensa arbodensejo"
+
+#~ msgid "Deciduous wetland"
+#~ msgstr "Intensa marĉo"
+
+#~ msgid "Wooded hills"
+#~ msgstr "Arbaraj montetoj"
+
+#~ msgid "Forested hills"
+#~ msgstr "Arbaregaj montetoj"
+
+#~ msgid "Tropical rainforest hills"
+#~ msgstr "Tropikaj pluv-arbaraj montetoj"
+
+#~ msgid "Heather hills"
+#~ msgstr "Erikoriĉaj montetoj"
+
+#~ msgid "Verdant hills"
+#~ msgstr "Herboriĉaj montetoj"
+
+#~ msgid "Tropical rainforest"
+#~ msgstr "Tropika pluv-arbaro"
+
+#~ msgid "Temperate rainforest"
+#~ msgstr "Moderklima pluv-arbaro"
+
+#~ msgid "Glacial peaks"
+#~ msgstr "Glaciejoj"
+
+#~ msgid "Temperate rainforest hills"
+#~ msgstr "Moderklimaj pluv-arbaraj montetoj"
+
+#~ msgid "Evergreen swamp"
+#~ msgstr "Ĉiamverda marĉo"
+
+#~ msgid "Temperate swamp"
+#~ msgstr "Moderklima marĉo"
+
+#~ msgid "Tropical swamp"
+#~ msgstr "Tropika marĉo"
+
+#~ msgid "Alpine tundra"
+#~ msgstr "Monta tundro"
+
+#~ msgid "Volcano"
+#~ msgstr "Vulkano"
+
+#~ msgid "Volcanic peaks"
+#~ msgstr "Vulkanaj pintoj"
+
+#~ msgid ""
+#~ "The Mechanized Infantry has the strongest defensive strength of any land "
+#~ "unit, but is only available near the end of the technology tree."
+#~ msgstr ""
+#~ "La Mekanizita Infanterio havas la plej altan defendan kapablon el ĉiuj "
+#~ "teraj trupoj, sed ĝi estas disponebla nur preskaŭ en la fino de la "
+#~ "teĥnologia evoluo."
+
+#~ msgid "?female:Prime Minister"
+#~ msgstr "?female:Ĉefinistro"
+
+#~ msgid "Ainu"
+#~ msgstr "Aina"
+
+#~ msgid "?plural:Ainu"
+#~ msgstr "?plural:Ainoj"
+
+#~ msgid "Nipa"
+#~ msgstr "Ĉefulo"
+
+#~ msgid "Nipsa"
+#~ msgstr "Mastro"
+
+#~ msgid "?female:Speaker"
+#~ msgstr "?female:Informistino"
+
+#~ msgid "?female:Reverend"
+#~ msgstr "?female:Reverendo"
+
+#~ msgid "Aymara"
+#~ msgstr "Ajmara"
+
+#~ msgid "?plural:Aymaras"
+#~ msgstr "?plural:Ajmaroj"
+
+#~ msgid "Mama"
+#~ msgstr "Sacerdoto"
+
+#~ msgid "Azeri"
+#~ msgstr "Azera"
+
+#~ msgid "?plural:Azeris"
+#~ msgstr "?plural:Azeroj"
+
+#~ msgid "Khatan"
+#~ msgstr "Ĥatano"
+
+#~ msgid "Basque"
+#~ msgstr "EÅ­ska"
+
+#~ msgid "?plural:Basques"
+#~ msgstr "?plural:EÅ­skoj"
+
+#~ msgid "Buruzagi"
+#~ msgstr "Estro"
+
+#~ msgid "?female:Buruzagi"
+#~ msgstr "?female:Estrino"
+
+#~ msgid "Apaiz nagusi"
+#~ msgstr "Lordo-Protektanto"
+
+#~ msgid "Emakume Apaiz nagusi"
+#~ msgstr "Lordino-Protektanto"
+
+#~ msgid "Errege"
+#~ msgstr "Reĝo"
+
+#~ msgid "Erregina"
+#~ msgstr "Reĝino"
+
+#~ msgid "Belarusian"
+#~ msgstr "Belorusa"
+
+#~ msgid "?plural:Belarusians"
+#~ msgstr "?plural:Belorusoj"
+
+#~ msgid "?female:Director-President"
+#~ msgstr "?female:Direktoro-Prezidantino"
+
+#~ msgid "Breton"
+#~ msgstr "Bretona"
+
+#~ msgid "?plural:Bretons"
+#~ msgstr "?plural:Bretonoj"
+
+#~ msgid "Burgundian"
+#~ msgstr "Burgunda"
+
+#~ msgid "?plural:Burgundians"
+#~ msgstr "?plural:Burgundoj"
+
+#~ msgid "Burundi"
+#~ msgstr "Burunda"
+
+#~ msgid "?plural:Burundi"
+#~ msgstr "?plural:Burundoj"
+
+#~ msgid "Mwami"
+#~ msgstr "Reĝo"
+
+#~ msgid "Mwamikazi"
+#~ msgstr "Reĝino"
+
+#~ msgid "?female:Basileus"
+#~ msgstr "?female:Bizanca Imperiestrino"
+
+#~ msgid "Cambodian"
+#~ msgstr "Kamboĝia"
+
+#~ msgid "?plural:Cambodians"
+#~ msgstr "?plural:Kamboĝianoj"
+
+#~ msgid "Cherokee"
+#~ msgstr "Ĉeroka"
+
+#~ msgid "?plural:Cherokees"
+#~ msgstr "?plural:Ĉerokoj"
+
+#~ msgid "?female:Great Chief"
+#~ msgstr "?female:Granda Ĉefino"
+
+#~ msgid "Principal Chief"
+#~ msgstr "Unua Ĉefo"
+
+#~ msgid "?female:Principal Chief"
+#~ msgstr "?female:Unua Ĉefino"
+
+#~ msgid "?plural:Cholas"
+#~ msgstr "?plural:Chola"
+
+#~ msgid "Uchimaahkaan"
+#~ msgstr "Ĉefulo"
+
+#~ msgid "Uchimaahkaaniskweu"
+#~ msgstr "Ĉefuledznino"
+
+#~ msgid "Chihchiuchimaau"
+#~ msgstr "Reĝo"
+
+#~ msgid "Chihchiuchimaaskweu"
+#~ msgstr "Reĝino"
+
+#~ msgid "Dominican"
+#~ msgstr "Dominikia"
+
+#~ msgid "?plural:Dominicans"
+#~ msgstr "?plural:Dominikianoj"
+
+#~ msgid "?female:Pharaoh"
+#~ msgstr "?female:Faraono"
+
+#~ msgid "?female:Great Pharaoh"
+#~ msgstr "?female:Granda Faraono"
+
+#~ msgid "Emirati"
+#~ msgstr "Emirlanda"
+
+#~ msgid "?plural:Emiratis"
+#~ msgstr "?plural:Emirlandanoj"
+
+#~ msgid "Sheikh"
+#~ msgstr "Åœejko"
+
+#~ msgid "Esperant"
+#~ msgstr "Esperanta"
+
+#~ msgid "?plural:Esperants"
+#~ msgstr "?plural:Esperantistoj"
+
+#~ msgid ""
+#~ "The Esperants are a world community united by the Esperanto language."
+#~ msgstr "Esperantistoj estas tutmonda komunumo kunigita de Esperanto."
+
+#~ msgid "European"
+#~ msgstr "EÅ­ropa"
+
+#~ msgid "?plural:Europeans"
+#~ msgstr "?plural:EÅ­ropanoj"
+
+#~ msgid "Popess"
+#~ msgstr "Papino"
+
+#~ msgid "President of the Commission"
+#~ msgstr "Prezidanto de la Komisiono"
+
+#~ msgid "?female:Premier"
+#~ msgstr "?female:Premierino"
+
+#~ msgid "?female:Archbishop"
+#~ msgstr "?female:Ĉefepiskopo"
+
+#~ msgid "Don"
+#~ msgstr "Lordo"
+
+#~ msgid "Dona"
+#~ msgstr "Lordino"
+
+#~ msgid ""
+#~ "The Gauls were a Celtic people occupying what is now France and Belgium.  "
+#~ "They lived in chiefdom-level societies that grew increasingly centralized "
+#~ "and stratified under the influence of the Greek and Roman merchants and "
+#~ "soldiers who came to Gaul.  Julius Caesar launched his eight year "
+#~ "invasion of Gaul in 59 BCE.  He claimed to have killed one million people "
+#~ "and enslaved another million out of an original population of three "
+#~ "million.  The Gauls united and rallied under Vercingetorix, who defeated "
+#~ "Caesar at the battle of Gergovia, but was later crushed by him at the "
+#~ "battle of Alesia."
+#~ msgstr ""
+#~ "Gaŭloj estis Keltaj kiuj loĝis en nuna Francio kaj Belgio.  Ili vivis en "
+#~ "triba societo kiu kreskis pli kaj pli alcentrigita kaj aranĝita laŭ "
+#~ "statumoj sub la influo de la helenaj kaj romianaj komercistoj kaj "
+#~ "soldatoj kiuj alvenis en GaÅ­lujo.  Julio Cesaro plenumis la okan jaron de "
+#~ "invado de GaÅ­lujo en 59 AK.  Li deklaris ke li mortigis unu milionon de "
+#~ "homoj kaj sklavigis alian milionon el popolo en kiu estis tri milionoj da "
+#~ "homoj.  Gaŭloj kuniĝis kaj kuraĝiĝis sub Vercingetorix, kiu venkis "
+#~ "Cesaron en la batalo de Gergovia, sed poste estis venkobatita de Cesaro "
+#~ "mem en la batalo de Alesia."
+
+#~ msgid "?female:Druid"
+#~ msgstr "?female:Druidino"
+
+#~ msgid "?female:Chancellor"
+#~ msgstr "?female:Kanceliero"
+
+#~ msgid "?female:First Secretary"
+#~ msgstr "?female:Ĉefa Ŝtatsekretario"
+
+#~ msgid "?female:Despot"
+#~ msgstr "?female:Despotino"
+
+#~ msgid "Hacker"
+#~ msgstr "Komputpirata"
+
+#~ msgid "?plural:Hackers"
+#~ msgstr "?plural:Komputpiratoj"
+
+#~ msgid "?female:Hacker"
+#~ msgstr "?female:Komputpiratino"
+
+#~ msgid "Hawaiian"
+#~ msgstr "Havaja"
+
+#~ msgid "?plural:Hawaiians"
+#~ msgstr "?plural:Havajanoj"
+
+#~ msgid "Hopi"
+#~ msgstr "Hopia"
+
+#~ msgid "?plural:Hopis"
+#~ msgstr "?plural:Hopioj"
+
+#~ msgid "Inka"
+#~ msgstr "Inkao"
+
+#~ msgid "?female:Raja"
+#~ msgstr "?female:Raĝino"
+
+#~ msgid "?female:Maharaja"
+#~ msgstr "?female:Maharaĝino"
+
+#~ msgid "?female:Mahatma"
+#~ msgstr "?female:Mahatmo"
+
+#~ msgid "?female:Shaman"
+#~ msgstr "?female:Åœamanino"
+
+#~ msgid "?female:Great Shaman"
+#~ msgstr "?female:Granda Åœamanino"
+
+#~ msgid "Iranian"
+#~ msgstr "Irana"
+
+#~ msgid "?plural:Iranians"
+#~ msgstr "?plural:Irananoj"
+
+#~ msgid "Raiis Jomhoor"
+#~ msgstr "Prezidanto"
+
+#~ msgid "Dictatress"
+#~ msgstr "Diktatorino"
+
+#~ msgid "?female:Taoiseach"
+#~ msgstr "?female:Ĉefministro"
+
+#~ msgid "Kazakh"
+#~ msgstr "Kazaĥa"
+
+#~ msgid "?plural:Kazakhs"
+#~ msgstr "?plural:Kazaĥoj"
+
+#~ msgid "Kongo"
+#~ msgstr "Konga"
+
+#~ msgid "?plural:Kongo"
+#~ msgstr "?plural:Konganoj"
+
+#~ msgid "Kurdish"
+#~ msgstr "Kurda"
+
+#~ msgid "?plural:Kurds"
+#~ msgstr "?plural:Kurdoj"
+
+#~ msgid "Asian"
+#~ msgstr "Aziano"
+
+#~ msgid "Medieval"
+#~ msgstr "Medievalulo"
+
+#~ msgid "Kyrgyz"
+#~ msgstr "Kirgiza"
+
+#~ msgid "?plural:Kyrgyzs"
+#~ msgstr "?plural:Kirgizoj"
+
+#~ msgid "?female:Governor"
+#~ msgstr "?female:Guberniestrino"
+
+#~ msgid "?female:Supreme Commander"
+#~ msgstr "?female:Supera Komandanto"
+
+#~ msgid "Laotian"
+#~ msgstr "Laosa"
+
+#~ msgid "?plural:Laotians"
+#~ msgstr "?plural:Laosanoj"
+
+#~ msgid "Lojbanistani"
+#~ msgstr "Loĵbana"
+
+#~ msgid "?plural:Lojbanistanis"
+#~ msgstr "?plural:Loĵbanistoj"
 
 #~ msgid ""
-#~ "When built, every civilization's attitude toward you is improved by 25%."
+#~ "Lojbanistan is a fictional place where people speak Lojban. Lojban is a "
+#~ "constructed language meant for human communication. Lojban is "
+#~ "syntactically unambiguous (\"Time flies like an arrow. Fruit flies like a "
+#~ "banana.\"), culturally neutral and simple to learn."
 #~ msgstr ""
-#~ "Kai pastatytas, kiekvienos civilzacijos požiūris į jus pagerinamas 25%."
+#~ "Loĵbanujo (Lojbanistan) estas fantazia loko kie oni parolas Loĵbano. "
+#~ "Loĵbano estas planlingvo kreita por la homa komunikado. Lojban estas  "
+#~ "sintakse ne-dubsenca (malsame ol la angla frazo \"Time flies like an "
+#~ "arrow. Fruit flies like a banana.\"), kulture neÅ­trala kaj facile "
+#~ "lernebla."
+
+#~ msgid "?female:High Commissioner"
+#~ msgstr "?female:Supera Komisaro"
+
+#~ msgid "?female:Ajaw"
+#~ msgstr "?female:Lordino"
+
+#~ msgid "Ah kin"
+#~ msgstr "Sacerdoto"
+
+#~ msgid "?female:Ah kin"
+#~ msgstr "?female:Sacerdotino"
+
+#~ msgid "Moldovan"
+#~ msgstr "Moldava"
+
+#~ msgid "?plural:Moldovans"
+#~ msgstr "?plural:Moldavoj"
+
+#~ msgid "?female:Khan"
+#~ msgstr "?female:Ĥano"
+
+#~ msgid "?female:Khagan"
+#~ msgstr "?female:Grandĥano"
+
+#~ msgid "Norman"
+#~ msgstr "Normana"
+
+#~ msgid "?plural:Normans"
+#~ msgstr "?plural:Normanoj"
+
+#~ msgid "North Korean"
+#~ msgstr "Nord-korea"
+
+#~ msgid "?plural:North Koreans"
+#~ msgstr "?plural:Nord-koreanoj"
+
+#~ msgid "Nubian"
+#~ msgstr "Nubia"
+
+#~ msgid "?plural:Nubians"
+#~ msgstr "?plural:Nubianoj"
+
+#~ msgid "Chaabat"
+#~ msgstr "Ĉefulo"
+
+#~ msgid "Ha'wiih"
+#~ msgstr "Kronprinco"
+
+#~ msgid "Pakistani"
+#~ msgstr "Pakistana"
+
+#~ msgid "?plural:Pakistanis"
+#~ msgstr "?plural:Pakistananoj"
+
+#~ msgid "Peruvian"
+#~ msgstr "Perua"
+
+#~ msgid "?plural:Peruvians"
+#~ msgstr "?plural:Peruanoj"
+
+#~ msgid "Protector"
+#~ msgstr "Protektanto"
+
+#~ msgid "Pirate"
+#~ msgstr "Pirata"
+
+#~ msgid "?plural:Pirates"
+#~ msgstr "?plural:Piratoj"
+
+#~ msgid "?female:Prymas"
+#~ msgstr "?female:Episkopo"
+
+#~ msgid "?female:Pierwszy Sekretarz"
+#~ msgstr "?female:Äœenerala Sekretario"
+
+#~ msgid "Polynesian"
+#~ msgstr "Polinezia"
+
+#~ msgid "?plural:Polynesian"
+#~ msgstr "?plural:Polinezianoj"
+
+#~ msgid "Prussian"
+#~ msgstr "Prusa"
+
+#~ msgid "?plural:Prussians"
+#~ msgstr "?plural:Prusoj"
+
+#~ msgid "Grand Master"
+#~ msgstr "Granda Majstro"
+
+#~ msgid "Elector"
+#~ msgstr "Elektisto"
+
+#~ msgid "Caconzi"
+#~ msgstr "Reĝo"
+
+#~ msgid "Rwandan"
+#~ msgstr "Ruanda"
+
+#~ msgid "?plural:Rwandans"
+#~ msgstr "?plural:Ruandoj"
+
+#~ msgid "?female:Noaydde"
+#~ msgstr "?female:Åœamanino"
+
+#~ msgid "?female:First Minister"
+#~ msgstr "?female:Ĉefministro"
+
+#~ msgid "?female:Encik"
+#~ msgstr "?female:Lordino"
+
+#~ msgid "SioÅ­"
+#~ msgstr "Siua"
+
+#~ msgid "?female:Leader"
+#~ msgstr "?female:Estrino"
+
+#~ msgid "?female:General Secretary"
+#~ msgstr "?female:Äœenerala Sekretario"
+
+#~ msgid "South Korean"
+#~ msgstr "Sud-Korea"
+
+#~ msgid "?plural:South Koreans"
+#~ msgstr "?plural:Sud-Koreanoj"
+
+#~ msgid "?female:Great Leader"
+#~ msgstr "?female:Äœenerala Sekretario"
+
+#~ msgid "?female:Cardinal"
+#~ msgstr "?female:Kardinalo"
+
+#~ msgid "?female:General"
+#~ msgstr "?female:Äœeneralo"
+
+#~ msgid "?female:Federal Chancellor"
+#~ msgstr "?female:Federacia Kanceliero"
+
+#~ msgid "Syrian"
+#~ msgstr "Siria"
+
+#~ msgid "?plural:Syrians"
+#~ msgstr "?plural:Sirianoj"
+
+#~ msgid "Cacike"
+#~ msgstr "Ĉefulo"
+
+#~ msgid "Bohike"
+#~ msgstr "Sacerdoto"
+
+#~ msgid "Hankwa"
+#~ msgstr "Ĉefulo"
+
+#~ msgid "Tajik"
+#~ msgstr "Taĝika"
+
+#~ msgid "?plural:Tajiks"
+#~ msgstr "?plural:Taĝikoj"
+
+#~ msgid "Knights Templar"
+#~ msgstr "Templana"
+
+#~ msgid "?plural:Templars"
+#~ msgstr "?plural:Templanoj"
+
+#~ msgid "Grand Mistress"
+#~ msgstr "Granda Majstrino"
+
+#~ msgid "Thracian"
+#~ msgstr "Traka"
+
+#~ msgid "?plural:Thracians"
+#~ msgstr "?plural:Trakoj"
+
+#~ msgid "Dharma King"
+#~ msgstr "Darma-Reĝo"
+
+#~ msgid "Lant"
+#~ msgstr "Reĝo"
+
+#~ msgid "Lantsa"
+#~ msgstr "Reĝino"
+
+#~ msgid "Morubixaba"
+#~ msgstr "Ĉefulo"
+
+#~ msgid "Paje"
+#~ msgstr "Åœamano"
+
+#~ msgid "?plural:Turkmens"
+#~ msgstr "?plural:Turkmenoj"
+
+#~ msgid "Turkish"
+#~ msgstr "Turka"
+
+#~ msgid "UN"
+#~ msgstr "UN-a"
+
+#~ msgid "?plural:UN"
+#~ msgstr "?plural:UN-anoj"
+
+#~ msgid ""
+#~ "The United Nations believe in human rights and the protection of the weak."
+#~ msgstr ""
+#~ "Unuiĝintaj Nacioj kredas je la homaj rajtoj kaj la protekto al la "
+#~ "malfortuloj."
+
+#~ msgid "?female:Chairperson"
+#~ msgstr "?female:Estrino"
+
+#~ msgid "Secretary-General"
+#~ msgstr "Äœenerala Sekretario"
+
+#~ msgid "?female:Secretary-General"
+#~ msgstr "?female:Äœenerala Sekretario"
+
+#~ msgid "Representative"
+#~ msgstr "Delegito"
+
+#~ msgid "?female:Representative"
+#~ msgstr "?female:Delegito"
+
+#~ msgid "Uruguayan"
+#~ msgstr "Urugvaja"
+
+#~ msgid "?plural:Uruguayans"
+#~ msgstr "?plural:Urugvajanoj"
+
+#~ msgid "Uzbek"
+#~ msgstr "Uzbeka"
+
+#~ msgid "?plural:Uzbeks"
+#~ msgstr "?plural:Uzbekoj"
+
+#~ msgid "Terratenienta"
+#~ msgstr "Grandbienulino"
diff --git a/po/es.gmo b/po/es.gmo
index bdd65e1..c4591bc 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 03b6bbf..fd239f5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.1-beta1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-08-11 01:51+0300\n"
 "Last-Translator: Claudio M. Camacho <claudiomkd at gmail.com>\n"
 "Language-Team: Español <es at li.org>\n"
@@ -55,22 +55,22 @@ msgstr "Lujo"
 msgid "Science"
 msgstr "Ciencia"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "C"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "m"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "O"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundante:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "C"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "m"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -490,81 +490,81 @@ msgstr "Mensajes de conectando/desconectado"
 msgid "AI Debug messages"
 msgstr "Mensajes de debug del Ordenador"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "Genocida"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "Beligerante"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "Hostil"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "Incooperativo"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "No fácil"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "Neutral"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "Respetuoso"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "Ayudado"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "Entusiasta"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "Admirador"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "Excelentísima"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "Armisticio"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "Guerra"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "Tregua"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "Paz"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "Alianza"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "Sin contacto"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "Grupo"
 
@@ -614,13 +614,13 @@ msgstr "%s unidades"
 msgid "Size %d"
 msgstr "Tamaño %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Siguiente Tecno. %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -632,65 +632,65 @@ msgstr "Siguiente Tecno. %d"
 msgid "None"
 msgstr "Ninguna"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Siguiente Tecno."
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Desconocida)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Camino"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Regadío"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Vía férrea"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Mina"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Contaminación"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Choza"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Fortaleza"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Río"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Huerta"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Base aérea"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Radioactividad"
 
@@ -800,11 +800,11 @@ msgstr "Misil Nuclear"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " y "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr ", "
 
@@ -964,83 +964,83 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (en total %d vez)"
 msgstr[1] " (en total %d veces)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Falta el argumento de \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Falta el argumento de \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d A.C."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d D.C."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "FREECIV_PATH existe pero está vacío; se usará en su lugar el path por "
 "defecto."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "No se puede leer el directorio de datos %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "Los directorios de datos se pueden indicar por medio de la variable de "
 "entorno FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Los directorios de datos actuales son: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "El fichero \"%s\" es necesario ... ¡abortando!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Error fatal: ¡estás intentando ejecutarme como superusuario!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Mejor usa una cuenta de usuario sin privilegios.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "coincidencia exacta"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "única coincidencia"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "ambiguo"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "vacío"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "demasiado largo"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "no hay coincidencias"
 
@@ -1069,23 +1069,23 @@ msgstr "Los %s han empezado a construir %s en %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s ha vendido %s (no se necesitaba) por %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 "*%s (Ordenador)* En modo ausente el Ordenador no puede firmar este tratado"
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (Ordenador)* Primero rompe tu alianza con %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (Ordenador)* Detengamos nuestras hostilidades antes, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1094,49 +1094,49 @@ msgstr ""
 "*%s (Ordenador)* Antes me gustaría que mantuvieses la tregua por un poco más "
 "de tiempo, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 "*%s (Ordenador)* Sinceramente no confío en tí porque tienes una alianza, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (Ordenador)* No conozco la ciudad que mencionas."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (Ordenador)* Lo siento pero no es seguro compartir la vision."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 "*%s (Ordenador)* ¡Este pacto no nos ha sido muy bueno para nosotros, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (Ordenador)* ¡Bienvenido a nuestra alianza %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (Ordenador)* Sí, que nuestra amistad sea eterna, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (Ordenador)* ¡Sí, paz en nuestros días!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (Ordenador)* De acuerdo. Que acaben las hostilidades, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1145,24 +1145,24 @@ msgstr ""
 "*%s (Ordenador)* ¡Saludos %s! ¿Te interesaría una tregua mientras nos vamos "
 "conociendo mejor el uno al otro?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (Ordenador)* El Espacio nunca será tuyo. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "*%s (Ordenador)* ¡Ya he tolerado tus vicios tontos demasiado tiempo! ¡A la "
 "guerra!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (Ordenador)* Paz en ... otro momento."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1171,18 +1171,18 @@ msgstr ""
 "*%s (Ordenador)* ¡Al final te he encontrado!  ¿Creías que tus crímenes iban "
 "a escapar sin castigo?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 "*%s (Ordenador)* ¡Tus chanchullos hostiles te han llevado a esta guerra!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (Ordenador)* ¡Tu agresión contra %s ha sido tu último error!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1197,7 +1197,7 @@ msgstr[1] ""
 "*%s (Ordenador)* Lanzaremos un ataque con todas nuestras fuerzas contra %s "
 "en %d turnos para detener el lanzamiento de la nave espacial."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1206,7 +1206,7 @@ msgstr ""
 "*%s (Ordenador)* Confiamos en tu colaboración en este asunto. Larga vida "
 "nuestro glorioso "
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1227,7 +1227,7 @@ msgstr[1] ""
 "esperamos honrarnos de tu alianza con nosotros y que respondas de la misma "
 "manera!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1242,7 +1242,7 @@ msgstr[1] ""
 "*%s (Ordenador)* Tenemos la intención de alcanzar la rica civilización de %"
 "s. Nosotros declararemos la guerra en %d turnos."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1250,7 +1250,7 @@ msgstr ""
 "*%s (Ordenador)* Si quieres una pieza del botín, ¡no dudes en unirte a la "
 "acción!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1265,14 +1265,14 @@ msgstr[1] ""
 "*%s (Ordenador)* La hemos tenido con %s. Desarraigémonos de esta patética "
 "civilización. Declararemos la guerra en %d turnos."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (Ordenador)* Como nuestros gloriosos aliados, esperamos vuestra ayuda en "
 "esta guerra."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1287,7 +1287,7 @@ msgstr[1] ""
 "*%s (Ordenador)* Honremos nuestra alianza y declaremos la guerra a los %s en "
 "%d turnos."
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1302,7 +1302,7 @@ msgstr[1] ""
 "*%s (Ordenador)* Honremos nuestra alianza con %s y declaremos la guerra a "
 "los %s in %d turnos. Esperamos que hagas como nosotros."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1311,7 +1311,7 @@ msgstr ""
 "*%s (Ordenador)* Tus intentos de conquistar el espacio para tí solo "
 "demuestran tus verdaderas intenciones.  ¡Nuestra alianza ha terminado!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1320,7 +1320,7 @@ msgstr ""
 "*%s (Ordenador)* Tus intentos de dominar el espacio unilateralmente resultan "
 "de lo más ofensivos."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1329,12 +1329,12 @@ msgstr ""
 "*%s (Ordenador) ¡Si no interrumpes la construcción de tu nave espacial puede "
 "que me vea obligado a actuar!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr " %s (Ordenador)* Lo siento, pero compartir la visión ya no es seguro."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1343,7 +1343,7 @@ msgstr ""
 "*%s (Ordenador)* Saludos, nuestro aliado más digno de confianza. Te "
 "solicitamos que destruyas a nuestro enemigo, %s."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1352,7 +1352,7 @@ msgstr ""
 "*%s (Ordenador)* Saludos, aliado.  Veo que aún no has emprendido la guerra "
 "contra nuestro enemigo, %s.  ¿Por qué tengo que recordarte tus promesas?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1362,21 +1362,21 @@ msgstr ""
 "*%s (Ordenador)* ¡A pesar de nuestra alianza, sigues en paz con nuestro "
 "enemigo mortal, %s! ¡Esto es inaceptable, nuestra alianza ha terminado!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr "*%s (Ordenador)* Saludos amigo, ¿te parece bien una campaña conjunta?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "*%s (Ordenador)* Saludos vecino, ¿te parece bien que mejoremos nuestras "
 "relaciones?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1385,7 +1385,7 @@ msgstr ""
 "*%s (AI)* Estamos hartos de ver tanta sangre derramada. ¿Te parece bien que "
 "cesemos nuestras hostilidades?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1396,59 +1396,64 @@ msgstr ""
 "olvidado!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Todas las opciones"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (veterana)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Este nombre no se permite."
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "No encuentro el fichero de sonido %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 "Atención: se ha adquirido el nombre del invitado '%s', se le renombra a '%s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "En este servidor no se permiten invitados. Lo siento."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "Rechazado %s: Invitados no permitidos."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1457,7 +1462,7 @@ msgstr ""
 "Ha habido un error leyendo la base de datos de usuarios, conectando como el "
 "invitado '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1465,41 +1470,41 @@ msgstr ""
 "Ha habido un error leyendo la base de datos de usuarios, y además no se "
 "permiten las conexiones como invitado.  Lo siento."
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "Rechazado %s: Error en la base de datos e invitados no permitidos."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Introduce la contraseña para %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Introduce una nueva contraseña (y recuérdala)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Este servidor sólo permite usuarios preregistrados.  Lo siento."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "Rechazado %s: Sólo se permiten usuarios preregistrados."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Lo siento, demasiados intentos fallidos..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 "Rechazado %s: Demasiadas verificaciones de contraseña incorrectas para el "
 "nuevo usuario."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1507,32 +1512,32 @@ msgstr ""
 "Atención: Ha habido un error escribiendo en la base de datos.  Se prosigue, "
 "pero tus estadísticas no se van a almacenar."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "Rechazado %s: Demasiados intentos fallidos."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Tu contraseña es incorrecta. Inténtalo de nuevo."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Lo siento, tu conexión ha expirado..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "Rechazado %s: Demasiado tiempo esperando por la contraseña."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 "Tu contraseña es demasiado corta, la longitud mínima es %d.  Inténtalo de "
 "nuevo."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2334,16 +2339,14 @@ msgid "Cast a vote."
 msgstr "Emitir un voto."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Un jugador con nivel de acceso, entrando comandos de nivel de control, "
 "provoca que comience un nuevo voto para el comando. El comando /vote seguido "
@@ -2354,7 +2357,7 @@ msgstr ""
 "si como mínimo la mitad de ellos vota en contra. Si pasa un turno completo, "
 "el voto se aplicará si nadie vota en contra."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2362,13 +2365,13 @@ msgstr ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 "Activa/Desactiva la información de debug del Ordenador para una entidad en "
 "concreto."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2376,23 +2379,23 @@ msgstr ""
 "Muestra información de debug del Ordenador acerca una entidad en concreto y "
 "activa/desactiva la información de debug continua."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <nombre-de-opción> <valor>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Cambia una opción del servidor."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <nombre-del-jugador> [equipo]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Cambia, añade o elimina la pertenencia de un jugador a un equipo."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2405,15 +2408,15 @@ msgstr ""
 "visión compartida y embajadas, y juegan juntos para alcanzar la victoria del "
 "equipo, con una puntuación promedio para cada jugador."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <directorio>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Escoger un nuevo directorio de ruleset o modpack."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2422,15 +2425,15 @@ msgstr ""
 "muestra el ruleset actual."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <meta-línea>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Establece la línea de información del metaservidor."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2439,19 +2442,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <meta-línea>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Establece la línea de información de parches del metaservidor."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Controlar la conexión con el metaservidor."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2462,33 +2465,33 @@ msgstr ""
 "'metaconnection up' o 'metac u' establece una conexión con el metaservidor."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <dirección>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Establece la dirección (URL) del metaservidor para informar."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <nombre-del-jugador>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Conmuta el control del ordenador sobre un jugador."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [nombre-de-conexión] <nombre-del-jugador>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Jugar reemplazando a un jugador determinado."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2503,15 +2506,15 @@ msgstr ""
 "jugador, uno es creado y asignado a la conexión."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [nombre-de-conexión] [nombre-del-jugador]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Observar a un jugador o todo el juego."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2526,15 +2529,15 @@ msgstr ""
 "entonces la conexión se asigna a un observador global."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <nombre-de-conexión>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "Abandonar un jugador."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2543,35 +2546,35 @@ msgstr ""
 "forzar a otras conexiones a abandonar un jugador."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <nombre-del-jugador>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Crea un jugador controlado por el ordenador."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "El comando 'create' sólo está disponible antes de comenzar la partida."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
 msgstr "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Tu jugador entra en modo ausente.  El ordenador cuida de tu nación."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "El ordenador gobierna tu nación pero sólo hace cambios mínimos."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2579,12 +2582,12 @@ msgstr ""
 "novice\n"
 "novice <nombre-del-jugador>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr ""
 "Cambia uno o todos los jugadores controlados por el ordenador a 'novato'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2596,7 +2599,7 @@ msgstr ""
 "Con un argumento, cambia el nivel de juego de ese jugador solamente."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2604,11 +2607,11 @@ msgstr ""
 "easy\n"
 "easy <nombre-del-jugador>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Cambia jugadores controlados por el ordenador a 'fácil'."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2620,7 +2623,7 @@ msgstr ""
 "cambia el nivel de juego de ese jugador solamente."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2628,11 +2631,11 @@ msgstr ""
 "normal\n"
 "normal <nombre-del-jugador>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Cambia jugadores controlados por el ordenador a 'normal'."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2644,7 +2647,7 @@ msgstr ""
 "cambia el nivel de juego de ese jugador solamente."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2652,11 +2655,11 @@ msgstr ""
 "hard\n"
 "hard <nombre-del-jugador>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Cambia jugadores controlados por el ordenador a 'difícil'."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2668,7 +2671,7 @@ msgstr ""
 "cambia el nivel de juego de ese jugador solamente."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2676,11 +2679,11 @@ msgstr ""
 "experimental\n"
 "experimental <nombre-del-jugador>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Cambia jugadores controlados por el ordenador a 'experimental'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2696,7 +2699,7 @@ msgstr ""
 "produce efecto alguno."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2710,11 +2713,11 @@ msgstr ""
 "cmdlevel <nivel> first\n"
 "cmdlevel <nivel> <nombre-de-conexión>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Consultar o establecer el nivel de acceso a comandos."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2757,22 +2760,22 @@ msgstr ""
 "comando ahora utiliza como parámetro el nombre de la conexión y no el del "
 "jugador."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 "Si no hay ninguno, se convierte en el organizador del juego con con permisos "
 "añadidos."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <turnos> <aumento> <valor> <factor>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Véase \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2784,24 +2787,24 @@ msgstr ""
 "duración de turno dinámica."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Fin del juego inmediatamente con empate."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "surrender"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Concede la partida."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2811,15 +2814,15 @@ msgstr ""
 "juego acaba."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <nombre-del-jugador>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Eliminar completamente a un jugador de la partida."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2828,7 +2831,7 @@ msgstr ""
 "ciudades, unidades, etc. ¡Úsalo con cuidado!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2836,11 +2839,11 @@ msgstr ""
 "save\n"
 "save <nombre-de-fichero>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Salva la partida en un fichero."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2859,7 +2862,7 @@ msgstr ""
 "nuevo."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2867,11 +2870,11 @@ msgstr ""
 "load\n"
 "load <nombre-de-fichero>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Carga una partida de un fichero."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2881,28 +2884,28 @@ msgstr ""
 "las opciones del servidor.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <nombre-de-fichero>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Ejecutar los comandos del servidor contenidos en un fichero."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <nombre-de-fichero>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Guardar las opciones actuales como comandos del servidor."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Alterna el estilo del servidor entre el 'RFC' y el normal."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Simplemente retorna el id del servidor."
 
@@ -3419,28 +3422,37 @@ msgstr "Has causado un incidente al provocar disturbios en %s."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s ha causado un incidente al provocar disturbios en %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "Aún no están soportadas las unidades navales de inicio. Nadie, recibe %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Año: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "La duración máxima del turno ha excedido su valor máximo, no se puede "
 "aumentar más."
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "La duración máxima del turno es negativa, quedará a cero."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "¡Sólo los clientes GGZ pueden llamar a civclient en modo ggz!\n"
 
@@ -3483,11 +3495,11 @@ msgstr "No hay ninguna conexi
 msgid "There is no player nor connection by the name %s."
 msgstr "No hay ningún jugador ni conexión llamado %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "¡Hay calentamiento global!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
@@ -3495,17 +3507,17 @@ msgstr ""
 "Las costas se han inundado y extensas áreas de praderas se han transformado "
 "en desierto."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "¡Ha llegado el Invierno Nuclear!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Las marismas se han secado y extensas áreas de praderas se han transformado "
 "en tundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3515,7 +3527,7 @@ msgstr ""
 "       Los obreros se reúnen espontáneamente e instalan vías férreas en "
 "todas las ciudades."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3526,12 +3538,12 @@ msgstr ""
 "       Los obreros se reúnen espontáneamente e instalan vías férreas en "
 "todas las ciudades."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Tu %s se ha movido al transformar el terreno."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Se desarticula a tu %s al transformar el terreno."
@@ -3594,27 +3606,27 @@ msgstr "Revoluci
 msgid "You should choose a new government from the government menu."
 msgstr "Deberías escoger un nuevo gobierno des del menú gobierno."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "La tasa de impuestos excedía la tasa máxima para %s; corregido."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "La tasa de ciencia excedía la tasa máxima para %s; corregido."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "La tasa de lujos excedía la tasa máxima para %s; corregido."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "¡%s ya no nos da visión compartida!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3623,14 +3635,14 @@ msgstr ""
 "El Senado no permitirá romper tu pacto con los %s. Puedes disolver el Senado "
 "o esperar a otro momento más adecuado."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 "El Senado ha aprobado tu ley por las constantes provocaciones de los %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3639,12 +3651,12 @@ msgstr ""
 "El Senado se niega a romper el paco con los %s, pero puedes buscarte un "
 "Senado nuevo sin problema."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "El estado diplomático entre los %s y los %s ahora es %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3653,14 +3665,14 @@ msgstr ""
 "¡%s ha cancelado el acuerdo diplomático! El estado diplomático entre los %s "
 "y los %s ahora es %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 "¡%s ha atacado a uno de tu aliado %s! Tu cancelas la alianza con el agresor."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3669,43 +3681,43 @@ msgstr ""
 "Tu compañero de grupo %s ha declarado la guerra a %s. Así que tu eres "
 "obligado a cancelar la alianza con %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Se ha eliminado al jugador %s de la partida."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "¡Te han echado de la partida!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "Han echado a %s de la partida."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Has contactado con los %s, gobernados por %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, fuzzy, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 "¡%s ha atacado a uno de tu aliado %s! Tu cancelas la alianza con el agresor."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "No se pudo instigar la guerra civil en %s - demasiados jugadores"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "No se pudo instigar la guerra civil en %s - demasiados jugadores"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3714,12 +3726,12 @@ msgstr ""
 "Tu nación ha entrado en guerra civil. %s se declara jefe de los territorios "
 "sublevados."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s declara una alianza con %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3958,21 +3970,21 @@ msgstr "
 msgid "th"
 msgstr "º"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "La cadena de \"demography\" contiene caracteres incorrectos.  Prueba \"help "
 "demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Informe demográfico:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Lo siento, el informe demográfico no está disponible."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "El %s de los %s (%s)"
@@ -3983,11 +3995,11 @@ msgstr "El %s de los %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "No se ha podido encontrar un fichero \"%s.%s\" ruleset legible."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Cargando rulesets"
 
@@ -4004,7 +4016,7 @@ msgstr ""
 "sucediera algún error durante la grabación.  Si continúas puede que Freeciv "
 "no funcione correctamente."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
@@ -4030,13 +4042,13 @@ msgstr ""
 "'%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4073,7 +4085,7 @@ msgstr "Internas"
 msgid "Networking"
 msgstr "De Red"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Todas"
@@ -4094,7 +4106,7 @@ msgstr "Raras"
 msgid "Changed"
 msgstr "Cambiado"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4102,7 +4114,7 @@ msgstr ""
 "La cadena de \"allowtake\" contiene caracteres incorrectos.  Prueba \"help "
 "allowtake\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4110,7 +4122,7 @@ msgstr ""
 "La cadena de unidades iniciales contiene caracteres \n"
 "incorrectos.  Prueba \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4120,15 +4132,15 @@ msgstr ""
 "un unidad de colonos.  Prueba \n"
 "\"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "No se puede cambiar maxplayers en modo GGZ"
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -4137,11 +4149,16 @@ msgstr ""
 "El número de jugadores ya es mas alto que el especificado; Se mantiene el "
 "valor anterior."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "No se te permite cambiar esta opción."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Tamaño del mapa (en miles de casillas)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4151,12 +4168,12 @@ msgstr ""
 "  tamaño = 4 es un mapa normal de 4,000 casillas (defecto)\n"
 "  tamaño = 20 es un mapa grandioso de 20,000 casillas"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Índice de la topología del mapa"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4225,11 +4242,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Método para generar el mapa"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4249,11 +4266,11 @@ msgstr ""
 "inicio.  Si se usa el valor por defecto de startpos entonces el valor de "
 "startpos será escogido en base al generador.  Véa la opción \"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Método usado para escoger las posiciones de inicio"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4276,36 +4293,36 @@ msgstr ""
 "Nota: los generadores tratan de crear el número correcto de continentes para "
 "el valor de startpos y el número de jugadores."
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Existencia de islas 1x1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = sin islas 1x1; 1 = algunas islas 1x1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Forzar que los polos sean continentes separados"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = los continentes pueden estart unidos a los polos; 1 = polos separados"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Todo el mapa es temperado"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = Normal cómo el planeta Tierra; 1 = planeta todo temperado"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Temperatura media del planeta"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4337,21 +4354,21 @@ msgstr ""
 "\n"
 "0 significa un planeta muy frío con grandes zonas polares y sin trópicos"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Porcentaje del mapa que será tierra"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr "Este valor indica el porcentage aproximado del mapa que será tierra."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Cantidad de colinas y montañas"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4359,11 +4376,11 @@ msgstr ""
 "Con valores pequeños se obtienen mapas llanos, mientras que valores más "
 "altos proporciona un mapa más abrupto con más colinas y montañas."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Cantidad de agua en la tierra firme"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4371,11 +4388,11 @@ msgstr ""
 "Valores pequeños provocarán mucha tierra seca y muchos desiertos; valores "
 "altos darán lugar a un mapa más húmedo con ciénagas, jungla y más ríos."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Semilla para la generación del mapa"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4386,11 +4403,11 @@ msgstr ""
 "aleatorio. Esta opción es especialmente de interés cuando se está depurando "
 "el juego."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Semilla aleatoria del juego"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4398,11 +4415,11 @@ msgstr ""
 "Si vale cero (valor por defecto) la semilla se elegirá basándose en la hora. "
 "Está opción es especialmente de interés cuando se está depurando el juego."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Núm. de casillas con recursos \"especiales\""
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4410,11 +4427,11 @@ msgstr ""
 "Los recursos especiales suponen una mejora para el terreno en el que se "
 "encuentran.  La escala de esta variable es la proporción en partes por mil."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Cantidad de chozas (aldeas indígenas)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4423,23 +4440,24 @@ msgstr ""
 "Las chozas son pequeños poblados tribales que pueden ser investigados por "
 "unidades."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Mínimo número de jugadores"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "La partida no empezará hasta que haya este número de jugadores (ya sean "
 "humanos o controlados por el ordenador)."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Máximo número de jugadores"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4450,13 +4468,13 @@ msgstr ""
 "ya se ha conectado este número de jugadores, no se permitirá que se conecten "
 "más jugadores."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr ""
 "Número total de jugadores (incluyendo los jugadores controlados por "
 "ordenador)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4465,11 +4483,11 @@ msgstr ""
 "eliminados automáticamente para mantener el total de jugadores en esta "
 "cantidad."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Lista de las unidades iniciales de los jugadores"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4496,31 +4514,31 @@ msgstr ""
 "    a   = Unidad de ataque rápida (eg., Caballeros)\n"
 "    A   = Unidad de ataque fuerte (eg., Catapulta)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Separación de las unidades iniciales"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "Este valor es el radio de la circumferencia en la que se dispersarán las "
 "unidades iniciales."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Monedas de oro iniciales para cada jugador"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 "Al comienzo de la partida, cada jugador recibirá este valor en monedas de "
 "oro."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Número de tecnologías iniciales para cada jugador"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4532,11 +4550,11 @@ msgstr ""
 "del valor de tech_cost_style en el ruleset, un valor alto en techlevel puede "
 "hacer que las siguientes tecnologías sean demasiado caras."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Porcentaje multiplicador del coste de la tecnología"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4547,11 +4565,11 @@ msgstr ""
 "(como un porcentaje). La base de los costes tecnológicos está determinada "
 "por el ruleset u otras configuraciones del juego."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Penalización por cambiar la investigación"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4562,12 +4580,12 @@ msgstr ""
 "investigación.  No obstante, esto no sucederá si acabas de obtener una "
 "tecnología en ese turno."
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Penalización por avances de un pacto"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4580,11 +4598,11 @@ msgstr ""
 "investigar un nuevo avance.  Así puedes acabar con un número negativo de "
 "puntos de investigación."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Penalización por avances de las conquistas"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4595,11 +4613,11 @@ msgstr ""
 "porcentaje del coste de investigar un nuevo avance.  Así puedes acabar con "
 "un número negativo de puntos de investigación."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Penalización por avances gratis"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4613,11 +4631,11 @@ msgstr ""
 "investigación igual a este porcentaje del coste de investigar un nuevo "
 "avance.  Así puedes acabar con un número negativo de puntos de investigación."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Alimento que se necesita para crecer"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4627,12 +4645,12 @@ msgstr ""
 "Este valor es multiplicado por otro valor que está en el ruleset y que es "
 "dependiente del tamaño de la ciudad."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Alimento perdido por necesitar Acueducto"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4642,11 +4660,11 @@ msgstr ""
 "Alcantarillado), pierde este porcentaje de su alimento almacenado (o la "
 "mitad de esa cantidad si tiene un Granero)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Porcentaje multiplicador para los costes de producción"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4654,11 +4672,11 @@ msgstr ""
 "Esto afecta a la rapidez en que las unidades y los edificios se construyen. "
 "La base de los costes se multiplica por este valor (como un porcentaje)."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Tamaño mínimo para generar todo el comercio"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4671,11 +4689,11 @@ msgstr ""
 "penalización excepto por la corrupción normal) para un tamaño de "
 "fulltradesize.  Véase también notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Tamaño límite para que una ciudad genere comercio"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4685,11 +4703,11 @@ msgstr ""
 "alguno.  Conforme el tamaño de la ciudad se aproxima a fulltradesize, el "
 "comercio generado va aumentando.  Véase también fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Mín. tamaño para que aparezcan descontentos"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4698,11 +4716,11 @@ msgstr ""
 "unhappysize ciudadanos de una ciudad están conformes, y los ciudadanos "
 "subsiguientes están descontentos.  Véase también cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Número de ciudades para mayor descontento"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4715,11 +4733,11 @@ msgstr ""
 "para otros tipos de gobierno el efecto sucede para un número menor de "
 "ciudades."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Mínima distancia entre ciudades"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4733,11 +4751,11 @@ msgstr ""
 "cercana en todas las direcciones. Si se fija a 0 (valor por defecto), se "
 "usará el valor fijado en el fichero ruleset."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Periodo en turnos del efecto de las celebraciones"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4746,11 +4764,11 @@ msgstr ""
 "una ciudad para crecer.  Si se le da el valor n, las ciudades crecerán tras "
 "estar en celebraciones durante n+1 turnos."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Destrucción durante una conquista"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4758,11 +4776,11 @@ msgstr ""
 "Cuando un jugador conquista una ciudad, cada Instalación Urbana tiene este "
 "porcentaje de probabilidad de resultar destruido."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Probabilidad de moverse después de atacar"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4776,11 +4794,11 @@ msgstr ""
 "la casilla).  Si el valor está entre 0 y 100, ése será el porcentaje de "
 "probabilidad de \"ocupar\" la casilla."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Activa/Desactiva el autoataque en el servidor"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4788,11 +4806,11 @@ msgstr ""
 "Si está activado, las unidades en movimiento atacarán automáticamente a las "
 "unidades enemigas que pasen al lado de ellas."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Reducir la población tras un ataque"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4809,11 +4827,11 @@ msgstr ""
 "  4 = helicóptero\n"
 "  8 = aérea"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Radio de la frontera nacional"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4824,12 +4842,12 @@ msgstr ""
 "especiales para casillas de océano o casillas dentro del radio de otras "
 "ciudades de otras naciones."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr ""
 "Las unidades dentro de las fronteras nacionales no causan descontento. "
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4837,11 +4855,11 @@ msgstr ""
 "Si está activado, las unidades dentro de las fronteras nacionales no causan "
 "descontento."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Posibilidad de diplomacia entre jugadores"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4856,11 +4874,11 @@ msgstr ""
 "3 = sólo se permite la diplomacia entre equipos.\n"
 "4 = nadie puede usar la diplomacia."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Restringir nombres de ciudades"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4886,11 +4904,11 @@ msgstr ""
 "ciudades prefijados para otras naciones a no ser que lo sean también de su "
 "nación."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Frecuencia de aparición de bárbaros"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4904,19 +4922,19 @@ msgstr ""
 "3 = aparición frecuente de bárbaros\n"
 "4 = hordas de bárbaros"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Año de aparición de los bárbaros"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Los bárbaros no aparecen antes de este año."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "duración en turnos de las revoluciones"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4925,11 +4943,11 @@ msgstr ""
 "durará este valor. Asigna este valor a cero dará como resultado que es "
 "generará un número aleatorio entre 0 y 6 turnos."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Activar la niebla en la guerra"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4939,13 +4957,13 @@ msgstr ""
 "unidades y ciudades.  No verás nuevas ciudades ni cambios en el terreno de "
 "las casillas que no estén a la vista."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 "Oportunidad inicial de los diplomáticos y los espías de conseguir su "
 "objetivo."
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4954,20 +4972,20 @@ msgstr ""
 "Oportunidad de que un espía vuelva de su misión victoriosa y la oportunidad "
 "inicial de que los diplomáticos y espías consigan su objetivo."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Permitir o no la carrera espacial"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr ""
 "Si esta opción vale 1, los jugadores pueden construir naves espaciales."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Mínimas ciudades para la guerra civil"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4978,11 +4996,11 @@ msgstr ""
 "opción se establece a su máximo valor, las guerras civiles quedan "
 "completamente imposibilitadas."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Turnos hasta que se pierde el contacto"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4993,12 +5011,12 @@ msgstr ""
 "unidades, aunque no se tenga embajada. Si se fija el valor a 0, sólo se "
 "pueden solicitar encuentros diplomáticos sin se tiene una embajada."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Reconstruir palacio si conquistan la capital"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -5009,11 +5027,11 @@ msgstr ""
 "gratuita y automáticamente en otra ciudad elegida al azar, se haya "
 "descubierto o no la tecnología requerida."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Usar los nombres naturales para las ciudades"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -5021,11 +5039,11 @@ msgstr ""
 "Si se activa, los nombres por defecto para las ciudades se elegirán de "
 "acuerdo con el terreno circundante."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Jugadores que se permite tomar a los usuarios"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -5094,11 +5112,11 @@ msgstr ""
 "conexiones.\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Control por ordenador durante desconexión"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5107,24 +5125,27 @@ msgstr ""
 "toma el control de su nación.  Si el jugador vuelve a conectarse recuperará "
 "el control de su nación."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Año en que acaba el juego"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "La partida acabará al final del año proporcionado."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Duración máxima en segundos de un turno"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Si no todos los jugadores han pulsado \"Fin del Turno\" antes de que "
 "transcurra este tiempo, el turno acaba automáticamente.  Cero indica que no "
@@ -5132,12 +5153,12 @@ msgstr ""
 "activa el modo autojuego, para pruebas. Usa esta opción junto con el comando "
 "\"timeoutincrease\" para conseguir una duración de turno dinámica."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 "Añade como mínimo n segundos de tiempo cuando un enemino mueva unidades"
 
-#: server/settings.c:896
+#: server/settings.c:889
 #, fuzzy
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
@@ -5146,11 +5167,11 @@ msgstr ""
 "Cada vez que una unidad vista por un enemigo se mueve, si el tiempo de turno "
 "es menor a este valor se asigna a este."
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Posibilidad de tener fases simultáneas de jugador."
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5158,11 +5179,11 @@ msgstr ""
 "Si es verdadero, todas las fases de movimiento de los jugadores ocurrirán al "
 "mismo tiempo; si no, los jugadores moverán alternativamente."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Máx. segundos de bloqueo de conexiones de los clientes"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5172,11 +5193,11 @@ msgstr ""
 "cierra la conexión TCP. Cero significa que no hay más límite de tiempo que "
 "el propio de la implementación de TCP en cuestión."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Máx. segundos de espera para que los búferes TCP se vacíen"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5186,11 +5207,11 @@ msgstr ""
 "desbloqueen todos los búferes de las conexiones TCP de los clientes. Un "
 "valor de cero hace que el servidor no espere en absoluto."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Intervalo entre PINGs en segundos"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5198,21 +5219,21 @@ msgstr ""
 "El servidor sondeará a los clientes con un PING con la periodicidad indicada "
 "por esta opción."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Plazo de desconexión de un cliente"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Si un cliente no contesta a un PING antes de este plazo, se le desconecta."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Modo de juego con bloqueo de turnos"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
@@ -5221,11 +5242,11 @@ msgstr ""
 "Si esta opción vale 1, game.info.turn no se avanza hasta que todos los "
 "jugadores hayan terminado su turno, inclusive los jugadores desconectados."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Modo de juego con turnos de duración fija"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5235,11 +5256,11 @@ msgstr ""
 "tiempo haya expirado, aunque todos los jugadores hayan hecho click en \"Fin "
 "del Turno\""
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Qué hay en el informe demográfico"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5280,11 +5301,11 @@ msgstr ""
 "El orden de estos caracteres es indiferente, pero sí importa si son "
 "mayúsculas o minúsculas."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Turnos entre salvado automático"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5292,11 +5313,11 @@ msgstr ""
 "Cada vez que transcurra este número de turnos la partida se salvará "
 "automáticamente. Un cero desactiva el salvado automático."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Compresión de las partidas salvadas"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5307,11 +5328,11 @@ msgstr ""
 "lentos. Si el valor máximo es cero, el uso de zlib fue inhabilitado en la "
 "compilación de este servidor."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Prefijo para auto-salvado"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5319,11 +5340,11 @@ msgstr ""
 "Las partidas salvadas automáticamente tienen como nombre \"<prefijo><año>.sav"
 "\". Esto permite cambiar la parte de <prefijo>."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Registrar las estadísticas de los jugadores"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5339,7 +5360,7 @@ msgstr ""
 "No se permite que el servidor lea la entrada estándar, así que lo que se "
 "introduzca será descartado."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Servidor: dirección incorrecta: [%s:%d]."
@@ -5482,109 +5503,109 @@ msgstr "Error salvando la partida en el fichero %s"
 msgid "Game saved as %s"
 msgstr "Partida salvada en el fichero %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "La partida ya está en marcha."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%s perdió el control a nivel de comandos al comienzo de la partida. Utiliza "
 "el voto a partir de ahora."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Empezando la partida."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "solicitud de informe desconocido (tipo %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Aviso: rechazando cliente antiguo %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr ""
 "Se ha recibido un paquete de tipo %d de un jugador muerto o de un observador"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Por favor, elige un nombre no vacío."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "La nation ya se está usando."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr ""
 "Ya hay otro jugador llamado '%s' en esta partida.  Por favor, elige otro "
 "nombre."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Por favor, elige un nombre que contenga sólo caracteres ASCII."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "La nación %s no está disponible en este escenario."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "La nacion %s está en uso."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s es %s, el gobernante de los %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr ""
 "Esperando para empezar la partida: %d de %d jugadores están preparados para "
 "empezar."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "Se ha añadido %s como el jugador %s controlado por el Ordenador."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Jugador %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s gobierna a los %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Enviando información al metaservidor [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "¡La partida ha finalizado!"
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Aceptando más conexiones de clientes."
 
@@ -5605,7 +5626,7 @@ msgstr "(ambiguo)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5785,7 +5806,7 @@ msgstr ""
 msgid "Removed player %s from the game."
 msgstr "Se ha eliminado al jugador %s de la partida."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "El nombre \"%s\" se ha prohibido por motivos de seguridad."
@@ -5867,204 +5888,204 @@ msgstr ""
 "No puedes aumentar el nivel de acceso a comandos a '%s'; tú mismo sólo "
 "tienes '%s'."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Se le ha dado el mivel de acceso a comandos '%s' a la conexión %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "No se ha podido dar el nivel de comandos '%s' a la conexión %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr ""
 "El nivel de acceso a comandos para nuevas conexiones se ha establecido en %s."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 "El nivel de acceso a comandos para el primer jugador en llegar se ha "
 "establecido en %s."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 "El comando 'first' no tiene sentido en la línea de comandos del servidor."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Juego: Ya tienes el nivel de acceso a comandos '%s' o uno superior."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Ya hay alguien que es organizador del juego."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "La conexión %s optó por asumir la organización del juego."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Argumento inválido: %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Uso: timeoutincrease <turnos> <aumento> <valor> <factor>"
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "La duración dinámica de turno se cambia a %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Opción:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Descripción:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "modificable"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fijo"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Valor: %d, Mínimo: 0, Por defecto: %d, Máximo: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Valor: %d, Mínimo: %d, Por defecto: %d, Máximo: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Valor: \"%s\", Por defecto: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Existen explicaciones para las siguientes opciones del servidor:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Todavía no se ha escrito esa explicación."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Nombre de opción ambiguo."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Operador del servidor: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "El jugador '%s' ahora juega según la dificultad '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s no está controlado por el ordenador."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "El nivel de dificultad por defecto se ha establecido en '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Este comando sólo se puede utilizar desde un cliente."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Uso: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Sólo jugadores pueden usar el comando away."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s pasa a modo ausente."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s ha vuelto a la partida."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Lo siento, tu acceso no te permite ver la opción '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Opción desconocida: '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Todas las opciones sin valor por defecto"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Todas las opciones"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Opciones principales"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Opciones situacionales"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Opciones raras"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ quiere decir que puedes cambiar la opción"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= quiere decir que la opción está en su valor por defecto"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s valor   (mín,máx)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Opción"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "descripción"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -6072,39 +6093,39 @@ msgstr ""
 "Prueba 'show situational' o 'show rare' para ver más opciones.\n"
 "Prueba 'show changed' para ver las opciones sin valor por defecto."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "No se pueden cambiar los equipos tras el inicio de la partida."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Argumento indefinido. Uso: team <jugador> <equipo>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 "No existe el equipo %s. Por favor, introduce un nombre o número de equipo "
 "válidos."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "No se puede agregar un jugador bárbaro a un equipo."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "El jugador %s ahora pertenece al equipo %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Argumento indefinido. Uso: vote yes|no [no voto]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Los observadores no pueden votar."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -6112,39 +6133,39 @@ msgstr ""
 "Sólo se puede votar en una partida en curso. Usa 'first' para ser el "
 "organizador de la partida si no hay ninguno actualmente."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Voto %d \"%s\": %d a favor, %d en contra"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "No hay votos en curso."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Último voto no legal."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "El valor debe ser un número entero."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "No existe el voto (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Tu votaste a favor de \"%s\"."
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Tu votaste en contra de \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6152,437 +6173,465 @@ msgstr ""
 "Argumentos indefinidos. Uso: debug <diplomaciy <jugador> | city <x> <y> | "
 "units <x> <y> | unit <id> | tech <player> | timing | info>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Sólo se pueden usar este comando después del inicio de la partida."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "La diplomacia %s ya no será depurada"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "La diplomacia %s fue depurada"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "La tecnología %s ya no será depurada"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "La tecnología %s fue depurada"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "El valor 2 i 3 debe ser un número entero."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Coordenadas de mapa incorrectas."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "No hay ninguna ciudad en estas coordenadas."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s ya no será depurado"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "El %2$s de %1$s ya no será depurado"
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "El %2$s de %1$s fue depurado."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "El valor 2 debe ser un número entero."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "La unidad %d no existe."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Argumento indefinido.  Uso: set <opción> <valor>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "No se te permite cambiar esta opción."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Esta opción no se puede cambiar tras el inicio de la partida."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "El valor debe ser un número entero."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Valor fuera de rango (mínimo: 0, máximo: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Opción: %s ahora vale %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Valor fuera de rango (mínimo: %d, máximo: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Cadena demasiado larga.  Uso: set <opción> <valor>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Opción: %s ahora vale \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Lo siento, en esta partida no se permite observar globalmente."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr "Lo siento, no se permite controlar a un observador global. Observa-lo."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr ""
+"Lo siento, en esta partida no se permite controlar a los jugadores humanos."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Lo siento, en esta partida no se permite observar a los bárbaros."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Lo siento, en esta partida no se permite controlar a los bárbaros."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr ""
 "Lo siento, en esta partida no se permite observar a los jugadores muertos."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr ""
 "Lo siento, en esta partida no se permite controlar a los jugadores muertos."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 "Lo siento, en esta partida no se permite observar a los jugadores "
 "controlados por el ordenador."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 "Lo siento, en esta partida no se permite controlar a los jugadores "
 "controlados por el ordenador."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 "Lo siento, en esta partida no se permite observar a los jugadores humanos."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 "Lo siento, en esta partida no se permite controlar a los jugadores humanos."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Lo siento, en esta partida no se permite observar jugadores."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Lo siento, en esta partida no se permite controlar otros jugadores."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 "Lo siento, en esta partida no se permite controlar jugadores ya conectados."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Uso: observe [nombre-de-conexión] <nombre-de-jugador>"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Uso: observe <nombre-del-jugador>"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s ya controla %s.  Si se usa 'observe' se eliminaría %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s ya observa %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s ya está observando."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s ahora observa %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s ahora observa"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Uso: take <nombre-de-conexión> <nombre-de-jugador>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Uso: take <nombre-del-jugador>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Uso: take [nombre-de-conexión] <nombre-de-jugador>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s ya controla %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "No hay ningún jugador ni conexión llamado %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "abandona %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s ahora controla %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Bárbaro"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "Ordenador"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Humano"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Vivo"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Muerto"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s no está conectado a ningún jugador."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Uso: detach <nombre-de-conexión>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "No puedes forzar a otros jugadores a abandonar."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s no está conectado a ningún jugador."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s se desconecta de %s."
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s ya no está observando."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "desconectado de %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Uso: load <nombre juego>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "No se puede cargar una partida mientras hay otra en marcha."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 "No se pudo encontrar una partida guardada o un escenario con el nombre \"%s"
 "\"."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "No he podido cargar la partida guardada en el fichero: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "El directorio de ruleset actual es \"%s\"."
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "El directorio de ruleset \"%s\" no existe."
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "El directorio de ruleset ya es \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Se ha cambiado el directorio de ruleset a \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Adiós."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Lo siento, no se te permite usar comandos del servidor."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Aviso: '%s' se interpreta como '%s', pero es ambiguo.  Prueba '%shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Comando desconocido.  Prueba '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Tu nuevo voto ha cancelado el previo."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Nuevo voto, (número %d), por %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "No se te permite usar ese comando."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(prompt del servidor)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "La partida ha acabado en tablas"
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "El juego se ha acabado. El servidor se reiniciará cuando todos los clientes "
 "se desconecten."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "No se puede terminar la partida: no hay partida en marcha."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s ha concedido la partida y ya no puede ganar."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "No puedes redirte ahora."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "No hay suficientes jugadores, no se puede empezar la partida."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "No hay suficientes jugadores, no se puede empezar la partida."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "No hay suficientes jugadores, no se puede empezar la partida."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Todos los jugadorres están preparados; comenzando la partida."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "No se puede empezar la partida: el juego está esperando que todos los "
 "clientes se desconecten."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "No se puede empezar la partida: ya está en marcha."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Cortando la conexión %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6621,123 +6670,123 @@ msgstr ""
 "  save   - para salvar la partida actual\n"
 "  quit   - para salir"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Comando:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Resumen: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Nivel: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Puedes usar los siguientes comandos del servidor:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "El tema de ayuda '%s' es ambiguo."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "No hay ningún tema de ayuda llamado '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Parámetro inválido para list: '%s'.  Prueba con '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Lista de jugadores:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<no hay jugadores>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "usuario %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Muerto"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", nivel de dificultad %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", preparado"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", no preparado"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d conexión:"
 msgstr[1] " %d conexiones:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s de %s (nivel de acceso a comandos %s), bufsize=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (modo observador)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Lista de equipos:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : '%s' : %d jugador"
 msgstr[1] "%2d : '%s' : %d jugadores"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%d : '%s' : 1 jugador : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Equipo vacío: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Lista de conexiones del servidor:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<no hay conexiones>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Lista de escenarios disponibles:"
 
@@ -6809,17 +6858,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "La meta tecnológica es %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Has robado %s a los %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "¡Los %s te han robado %s!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "Los %s han robado %s a los %s."
@@ -7347,20 +7396,20 @@ msgstr "Fall
 msgid "Your %s has invalid orders."
 msgstr "Tu %s tiene órdenes inválidas."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Gran cantidad de masa terrestre - esto podría llevar unos segundos."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Recurriendo al generador %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "El generador 3 no ha podido colocar todas las islas grandes."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "El generador 3 ha dejado %li masas terrestres sin colocar."
@@ -7453,120 +7502,121 @@ msgstr "Quiz
 msgid "Cannot find audio file %s"
 msgstr "No encuentro el fichero de sonido %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "XXX/XXX XXX turnos"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d monedas de oro por turno"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d turno"
 msgstr[1] "%3d turnos"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "nunca"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/turno"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d turno"
 msgstr[1] "%s (%d) %d turnos"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Obsoleto"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Construido"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Gran Maravilla"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Pequeña Maravilla"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/turno"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Ciudadanos\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Impuesto de comercio\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : Ruta comercial con %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : Construyendo diezmos\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : Prima de %s (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Desperdicio\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Disturbios\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Usado\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : Se agrega a\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Superprima total"
@@ -7679,8 +7729,8 @@ msgid "Best defending units"
 msgstr "Mejores unidades defensivas"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7862,8 +7912,8 @@ msgstr "Con"
 msgid "?cma:Governor"
 msgstr "Gobernador"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -8135,19 +8185,19 @@ msgstr ""
 "Autoconectando con el servidor \"%s\", puerto %d, como \"%s\" cada %f segundo"
 "(s) hasta %d intentos"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "novato"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "fácil"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "difícil"
 
@@ -8155,31 +8205,31 @@ msgstr "dif
 msgid "experimental"
 msgstr "experimental"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Empezando la partida..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "No se ha podido empezar el servidor."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Tendrás que empezar uno manualmente. Lo siento..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "No se ha podido conectar con el servidor."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Probablemente no lo hemos podido iniciar desde aquí."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Tenemos el control del servidor (nivel de acceso a comandos 'hack')"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "No hemos obtenido el control del servidor, lo intentamos matar."
 
@@ -8284,27 +8334,27 @@ msgstr ""
 "Requiere un tamaño mínimo de %d.\n"
 "\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Permite %s"
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Permite %s (con %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Ríos"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Lo siento, no se encuentra el tema de ayuda para %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8315,7 +8365,7 @@ msgstr ""
 "Esta página se ha generado automáticamente.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
@@ -8324,80 +8374,80 @@ msgstr ""
 "Requiere la construcción de %s.\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* El descubrimiento de %s dejará obsoleto %s.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 "* Permite a todos los jugadores que conozcan %s construir unidades %s.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Permite %s (con %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Permite %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, fuzzy, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Sólo puede construirse gobernando con %s.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Sólo puede construirse gobernando con %s.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* No se puede construir en ciudades.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Nunca se establece en una ciudad.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Perder esta unidad significa perder la partida!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Cada jugador sólo puede tener una unidad de este tipo.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Requiere %d de población para construirla.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Puede transportar y repostar %d unidad aérea.\n"
 msgstr[1] "* Puede transportar y repostar %d unidades aéreas.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Puede transportar y repostar %d misil.\n"
 msgstr[1] "* Puede transportar y repostar %d misiles.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Puede transportar %d unidad terrestre por el océano.\n"
 msgstr[1] "* Puede transportar %d unidades terrestres por el océano.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8406,135 +8456,135 @@ msgstr ""
 "que tiene que estar cómo mínimo a 9 casillas apartada [la distancia de "
 "Manhattan] desde la ciudad en la cual está establecida).\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr ""
 "* Puede contribuir a la construcción de una maravilla. (añade %d de "
 "producción)\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* No se puede desmontar.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Se puede desmontar en una ciudad para recuperar 50%% del coste de "
 "producción.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Puede construir nuevas ciudades.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Puede añadir %d población a ciudades de población máxima de %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Puede construir carreteras y ferrocarilles.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Puede construir minas en las casillas.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Puede construir irrigación en las casillas.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Puede construir huertas.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Puede construir huertas ( si %s es conocido).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 "* Puede construir huertas (si alguno de los siguientes son conocidos: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Puede construir fortalezas.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Puede construir fortalezas ( si %s es conocido).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 "* Puede construir fortalezas ( si alguno de los siguientes son conocidos: %"
 "s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Puede borrar la polución de las casillas.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Puede limpiar la radioactividad de las casillas.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Puede efectuar transformaciones de las casillas.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Puede construir bases aéreas.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Se puede fortificar, ganando un bonus defensivo del 50%%.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Puede saquear para destruir la infraestructura de las casillas.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Puede realizar acciones diplomáticas, y tiene habilidades especiales de "
 "espionaje.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Puede realizar acciones diplomáticas.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr ""
 "* Nunca perderá un combate de un diplomático contra otro diplomático.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* No se puede sobornar.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Puede atacar a unidades aéreas enemigas.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* Es invisible excepto cuando está junto a una ciudad o unidad enemiga.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 "* Sólo puede atacar a unidades en casillas de océano (no ataca a tierra).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
@@ -8542,40 +8592,40 @@ msgstr ""
 "* Puede atacar desde a bordo de unidades marítimas: a ciudades enemigas y "
 "casillas de tierra.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Se puede tirar en paracaídas desde una ciudad amiga (Alcance: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Tiene el doble de defensa contra unidades que sean 'a caballo'.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Es una unidad 'a caballo' (eso importa contra ciertos defensores).\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Es una unidad de misil: se destruye al efectuar un ataque.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* El turno de esta unidad se termina si ataca.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* ¡El ataque de esta unidad causa una explosión nuclear!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Obtiene el doble de poder de tiro cuando ataca a ciudades.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignora el efecto de las murallas.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8584,39 +8634,39 @@ msgstr ""
 "* Hace ataques de bombardeo /%d por turno).  Estos ataques sólo dañarán "
 "(nunca matarán) al defensor pero sin riesgo para el atacante.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Tiene cinco veces más defensa contra misiles y aviones.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 "* Ignora el efecto del terreno (actúa como si todas las casillas fueran "
 "caminos).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignora las zonas de control.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* Es una unidad no militar (no ataca y no provoca ley marcial).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 "* Es una unidad de campo: crea un descontento incluso cuando no es "
 "agresiva.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* No puede tener niveles veteranos.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Puede volverse veterano a través de entrenamiento o combate.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8625,12 +8675,12 @@ msgstr ""
 "* Debe acabar el turno en una ciudad o junto a la costa, o tiene un 50%% de "
 "riesgo de desaparecer en el mar.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* El descubrimiento de %s reduce el riesgo al 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s reduce el riesgo al 12%%.\n"
@@ -8639,15 +8689,15 @@ msgstr "* %s reduce el riesgo al 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " o "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr ", "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
@@ -8655,12 +8705,12 @@ msgstr[0] "* La unidad tiene que acabar en una ciudad o un %s cada %d turno.\n"
 msgstr[1] ""
 "* La unidad tiene que acabar en una ciudad o un %s cada %d turnos.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Si empezáramos ahora con %s necesitaríamos %d bombillas."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8669,89 +8719,89 @@ msgstr ""
 "Para llegar a %s necesitamos antes otros %d avances.  El proyecto entero "
 "empleará %d bombillas."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "No puedes investigar este avance."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr " Este número puede cambiar según lo que investiguen otros jugadores.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* El primer jugador que descubra %s obtiene un avance inmediatamente.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Reduce el riesgo de perder transportes en el oceano al 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Reduce el riesgo de perder transportes en el oceano al 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Aumenta la contaminación generada por la población.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Permite que los %s construyan caminos en casillas de río.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Permite que los %s construyan fortalezas.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Permite que los %s construyan bases aéreas.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Permite que los %s mejoren las caminos a vías férreas.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Permite que los %s mejoren los regadíos a huertas.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* No se puede generar polución en este terreno."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* No se pueden construir ciudades en este terreno."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* La costa de este terreno no es segura."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Este terreno no es seguro para que viajen las unidades por él."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Las unidades terrestres no puede viajar en el océano."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Características:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8766,7 +8816,7 @@ msgstr[1] ""
 "* Las unidades militares alejadas y las unidades de campo harán que %d "
 "ciudadanos pasen a descontentos.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8776,23 +8826,23 @@ msgstr ""
 "causado por las unidades.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* Pagas %d veces del %s del sustento normal de tus unidades.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* Pagas %d veces del sustento normal de tus unidades.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, fuzzy, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* Pagas %d veces del %s del sustento normal de tus unidades.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 #, fuzzy
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* Pagas %d veces del sustento normal de tus unidades.\n"
@@ -8800,7 +8850,7 @@ msgstr "* Pagas %d veces del sustento normal de tus unidades.\n"
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
@@ -8809,19 +8859,19 @@ msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 "* Cada una de tus ciudades evitará pagar %d por el sustento de una unidad.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "* La probabilidad de guerra civil es %d%% si pierdes tu capital.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8831,7 +8881,7 @@ msgstr ""
 "civilización, aparecerá cuando tengas %d ciudades.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8840,17 +8890,17 @@ msgstr ""
 "* Después del primer ciudadano descontento, debido al tamaño de la ciudad, "
 "por cada %d ciudades adicionales, aparecerá otro ciudadano descontento.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 "El máximo impuesto que puedes imponer para Ciencia, Oro, o Lujos es %d%%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "Tienes impuestos ilimitados para Ciencia/Oro/Lujos.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, fuzzy, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8865,7 +8915,7 @@ msgstr[1] ""
 "* Tus unidades pueden imponer la Ley Marcial. Cada unidad militar dentro de "
 "una ciudad obligará a %d ciudadanos descontentos a estar contentos.\n"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, fuzzy, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8877,7 +8927,7 @@ msgstr[1] ""
 "Marcial.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8886,15 +8936,15 @@ msgstr ""
 "* Puedes hacer crecer tus ciudades con las celebraciones. Tus ciudades deben "
 "ser, como mínimo, del tamaño %d antes de que puedan crecer de este modo.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Tus unidades no pueden ser sobornadas.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Tus ciudades no pueden ser incitadas.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8902,17 +8952,17 @@ msgstr ""
 "* El Gobierno caerá en la Anarquía si en cada ciudad hay disturbios en más "
 "de dos turnos en una tirada.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Tiene un Senado que puede prevenir la Guerra.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 "* Permite la aparición de partisanos cuando las ciudades son tomadas por el "
 "enemigo.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
@@ -8920,25 +8970,25 @@ msgstr ""
 "* Los edificios que normalmente ofrecen primas contra los descontentos, "
 "ofrecerán oro en su lugar.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* No paga nigún sustento para los fanáticos.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* No tiene ciudadanos descontentos.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* Unidades %s veteranas.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Unidades veteranas.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8948,7 +8998,7 @@ msgstr ""
 "no haya celebraciones.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, fuzzy, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8958,74 +9008,74 @@ msgstr ""
 "cuando haya celebraciones.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, fuzzy, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 "* Cada casilla trabajada con al menos 1 %s producirá %d %s adicionales.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, fuzzy, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* La producción de %s sufrirá un desperdicio masivo.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* La producción de %s sufrirá un desperdicio masivo.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* La producción de %s sufrirá desperdicio.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* La producción de %s sufrirá un poco de desperdicio.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 "* El desperdicio de %s aumenta rápidamente con la distancia a la capital.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* El desperdicio de %s aumentará con la distancia a la capital.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 "* Le desperdicio de %s aumentará lentamente con la distancia a la capital.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Te permite construir %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d descontentos"
@@ -9481,16 +9531,16 @@ msgstr "Cadena de capacidades del servidor: %s"
 msgid "Start of turn %d"
 msgstr "Comienzo del turno %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "El control por ordenador ahora está %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "ACTIVO"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "INACTIVO"
 
@@ -9521,13 +9571,13 @@ msgstr "Nombre:"
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Bandera"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9541,7 +9591,7 @@ msgstr "Frontera"
 msgid "Score"
 msgstr "Puntuació"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Equipo"
 
@@ -9574,36 +9624,36 @@ msgstr "Inactivo"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "No puedes vender instalaciones urbanas."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Se han vendido %d %s por %d monedas de oro."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "No se han podido vender %s."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "No puedes desmantelar unidades."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "No se puede desmantelar a %s."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Se han desarticulado %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "No se pudo desmantelar ningún %s."
@@ -9913,64 +9963,69 @@ msgstr "Oro: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Imp:%d Lujo:%d Cie:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Moviendo: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Moviendo: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Haz click para más info)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s Gente"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Turno: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Oro: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Beneficios netos: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Impuestos: Oro:%d%% Lujo:%d%% Cie:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Investigando %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Probabilidad de calentamiento global: %d%% (%+d%%/turno)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Probabilidad de Invierno Nuclear: %d%% (%+d%%/turno)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Gobierno: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9978,55 +10033,55 @@ msgstr[0] " %d unidad"
 msgstr[1] " %d unidades"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Turnos hasta destino: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Turnos hasta el destino: %d a %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d unidad seleccionada"
 msgstr[1] "%d unidades seleccionadas"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "No hay unidades seleccionadas."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Otros: %d civiles; %d militares"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Otros: %d civiles"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Otros: %d militares"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Ninguna unidad que actualizar."
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Ninguna unidad puede actualizarse."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -10041,72 +10096,72 @@ msgstr[1] ""
 "¿Deseas mejorar %d unidades por %d monedas de oro?\n"
 "En el tesoro tienes %d monedas de oro."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Muestra el progreso en la investigación tecnológica actual."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "no hay un objetivo de investigación."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Muestra el progreso del calentamiento global:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Nivel de contaminación: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Probabilidad de calentamiento catastrófico en cada turno: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Muestra el progreso del Invierno Nuclear:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Cantidad de polvo radiactivo: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Probabilidad de invierno catastrófico en cada turno: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Muestra tu gobierno actual:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Población:      %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Soporte:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energía:            %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -10114,96 +10169,96 @@ msgstr[0] "Masa:            %5d tonelada"
 msgstr[1] "Masa:            %5d toneladas"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Duración del viaje: %5.1f años"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Duración del viaje:     -     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Probab. Éxito:   %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Año de Llegada: %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "inactivo"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "%02dd %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "desbordamiento"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s de los %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Observador: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Instalaciones: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Ninguna. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Maravillas: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Ciudades: %d en total, %d sobre el límite de %d ciudades."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10211,7 +10266,7 @@ msgstr[0] "%d ciudadanos conformes antes de penalizar con "
 msgstr[1] "%d ciudadanos conformes antes de penalizar con "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10219,16 +10274,16 @@ msgstr[0] "%d descontentos adicionales."
 msgstr[1] "%d descontentos adicionales."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Ley marcial en vigor ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "sin límite, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10236,20 +10291,20 @@ msgstr[0] "l
 msgstr[1] "límite de %d unidades, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d por unidad). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Las unidades militares en los alrededores pueden causar descontento. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Las unidades militares no influyen en el descontento. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Lujo: %d en total."
@@ -10299,12 +10354,12 @@ msgid ""
 "have a look."
 msgstr "CMA: Hubo una confusión con %s. Mejor que eches un vistazo."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "ninguno"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "personal"
 
@@ -10358,11 +10413,13 @@ msgid "Ooops..."
 msgstr "Vaya..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "¡No se puede sobornar a este tipo de unidad!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10379,6 +10436,7 @@ msgstr "Sobornar unidad enemiga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10419,6 +10477,7 @@ msgstr "_Avances:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Lo que decida el Espía"
 
@@ -10443,12 +10502,13 @@ msgstr "_Instalaciones:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Producción de la ciudad"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "No puedes incitar una sublevación en %s."
@@ -10460,6 +10520,7 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10476,6 +10537,7 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10485,6 +10547,7 @@ msgstr ""
 "El tesoro tiene %d monedas de oro."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10554,11 +10617,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Sobornar a una unidad enemiga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Señor, el Diplomático está esperando órdenes"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Señor, el Espía está esperando órdenes"
@@ -10659,7 +10724,7 @@ msgstr "Contaminaci
 msgid "_Overview"
 msgstr "_Vista general"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10684,11 +10749,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d turnos"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Comprar"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "Pro_ducción"
@@ -10808,7 +10873,7 @@ msgstr "Unidades mantenidas %d"
 msgid "Present units %d"
 msgstr "Unidades presentes %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Ce_ntrar"
 
@@ -10897,32 +10962,32 @@ msgstr "Renombrar ciudad"
 msgid "What should we rename the city to?"
 msgstr "¿Cuál será el nuevo nombre de la ciudad?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "Cam_biar"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Añadir Primero(_F)"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Añadir Siguiente(_N)"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Añadir Ultimo(_L)"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "_Mostrar"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10932,13 +10997,13 @@ msgstr "_Mostrar"
 msgid "Cities"
 msgstr "Ciudades"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "_Ventana"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10947,85 +11012,90 @@ msgstr "_Ventana"
 msgid "Improvements"
 msgstr "Instalaciones"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Maravillas"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Todas las ciudades"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Ninguna ciudad"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Invertir selección"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Producción de unidades"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Construcción de instalaciones"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Construcción de maravillas"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Producción de unidad"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Construcción de instalación"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Construcción de maravilla"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Ciudades costeras"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "En la misma isla"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Unidades mantenidas"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Unidades presentes"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Instalaciones de la ciudad"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Maravillas de la Ciudad"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Unidades disponibles"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Instalaciones disponibles"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Maravillas disponibles"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Costes totales: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -11090,127 +11160,127 @@ msgstr "
 msgid "Remove this preset?"
 msgstr "¿Quieres borrar esta configuración?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "Ir a _lugar"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "Ventana de _ciudad"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "¿Quieres la revolución?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "¡Revolución!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Qué saquear"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Elige qué deseas saquear:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Unidad"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Nombre"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Selección de Unidad"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_Activar todas"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "_Vigilancia"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Naciones:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "¿Qué nación quieres ser?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Elegir Nación"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Nación al azar"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Elige tu nación"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Líder:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Hembra"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Varón"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "Estilo de las _ciudades:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "L_eyenda"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Debes elegir tu sexo."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Debes elegir el estilo de tus ciudades."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Debes teclear un nombre válido."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "¡Mejorar la unidad!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11469,61 +11539,67 @@ msgstr ""
 msgid "Not _ready"
 msgstr "No _preparado"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Listo"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Comenzar"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Elegir este jugador"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Elegir _Nación"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_Observar"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "No _observar"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<Ordenador>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<Ordenador principiante>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<Ordenador fácil>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<Ordenador normal>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<Ordenador difícil>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Aleatorio"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Observador"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Separado"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Seguro que quiere salir?"
 
@@ -12440,218 +12516,218 @@ msgstr "C_onectar con un juego en red"
 msgid "Connect to Gaming _Zone"
 msgstr "Conectar con _Zona de Juegos"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Las contraseñas no coinciden, introduce tu contraseña."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Nombre del servidor"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Puerto"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versión"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Estado"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Jugadores"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Comentario"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Red de _Área Local"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "_Metaservidor de Internet"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Host:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Usuario:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Co_ntraseña:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Conf_irme Contraseña:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Nombre de la conexión: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Nombre del jugador: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Host: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Información de jugad/conex"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "Info. de %s"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Activa/Desact. jugador listo"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Elegir nación"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Observar a este jugador"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Elegir este jugador"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Cerrar la conexión"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "Aitoggle jugador"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Eliminar jugador"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Dar información de acceso"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "Dar acceso de control"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "Poner en %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr ""
 "_Número de jugadores a completar con los controladores por el ordenador:"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "Nivell de los Jugadores Controlados por Ordenador:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "_Ruleset:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Más _Opciones del Juego..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Registro"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Grado"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Listo"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Líder"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Escoja la partida guardada a cargar"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Escoja la partida guardada a _Cargar:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Navegar..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Escoger un Escenario"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Escoger un E_scenario:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Tipo"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Elige una _nación para jugar:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Elige camino para gravar"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Grabar partida"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Partidas _Gravadas:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Grabar a Nombre_Fichero:"
 
@@ -12687,7 +12763,7 @@ msgstr "Nombre"
 msgid "Count"
 msgstr "Número"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12930,28 +13006,28 @@ msgstr "_Listas de tareas:"
 msgid "Edit Global _Worklists"
 msgstr "Editar Lista de _Tareas Global"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Turnos"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "Tareas _originales:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Mostrar objetivos _futuros"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Tareas _resultantes:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "_Añadir lista de tareas global"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Cam_biar producción"
 
@@ -13257,8 +13333,8 @@ msgid "City shrinks: %d %s"
 msgstr "La ciudad decrece : %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13363,11 +13439,11 @@ msgstr "Informe de unidades"
 msgid "Maintenance Report"
 msgstr "Informe de mantenimiento"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "lista de tareas"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13795,21 +13871,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Se usa la salida de video: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Inicializando cliente"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Esperando el inicio de la partida"
 
@@ -15130,7 +15206,7 @@ msgstr "Estilo de Ciudad:"
 msgid "Unit Selection"
 msgstr "Selección de Unidad"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "NINGUNA"
 
diff --git a/po/et.gmo b/po/et.gmo
index addddb2..894fe70 100644
Binary files a/po/et.gmo and b/po/et.gmo differ
diff --git a/po/et.po b/po/et.po
index 16ad974..fdae11a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: et\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2008-04-29 21:32+0300\n"
 "Last-Translator: Elmo Todurov <todurov at gmail.com>\n"
 "Language-Team: eesti\n"
@@ -50,22 +50,22 @@ msgstr "Hüved"
 msgid "Science"
 msgstr "Teadus"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:B"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:ime"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:O"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:B"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:ime"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -484,81 +484,81 @@ msgstr "Ühendumise/lahtiühendumise sõnumid"
 msgid "AI Debug messages"
 msgstr "Tehisintellekti silumissõnumid"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:Genotsiidne"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:Sõjahimuline"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:Vaenulik"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:Ebaabivalmis"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:Murelik"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?attitude:Neutraalne"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:Aupaklik"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:Abivalmis"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:Entusiastlik"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:Imetlev"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:Jumaldav"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Vaherahu"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Sõda"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Peatatud sõjategevus"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Rahu"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Liitlane"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Pole kohtunud"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Tiimikaaslane"
 
@@ -604,13 +604,13 @@ msgstr "%s üksust"
 msgid "Size %d"
 msgstr "Suurus %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Tuleviku tehnoloogia %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -622,65 +622,65 @@ msgstr "Tuleviku tehnoloogia %d"
 msgid "None"
 msgstr "Pole"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Tuleviku tehnoloogia."
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Teadmata)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Tee"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Niisutus"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Raudtee"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Kaevandus"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Saast"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Onn"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Kindlus"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Jõgi"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Põllumaa"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Lennubaas"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Tuumajäätmed"
 
@@ -786,11 +786,11 @@ msgstr "Tuumapomm"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " ja "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?and:, "
 
@@ -948,81 +948,81 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (kokku %d kordus)"
 msgstr[1] " (kokku %d kordust)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Puudu argument võtmele \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Puudu argument võtmele \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d eKr"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "Keskkonnamuutuja FREECIV_PATH on määratud, kuid tühi. Kasutan vaikimisi "
 "andmete asukohta."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Ei suuda lugeda andmekataloogi %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "Andmete asukohta saab määrata keskkonnamuutuja FREECIV_PATH abil."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Praegune andmete asukoht on: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "\"%s\" fail on puudu ... katkestan!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: VIGA: Sa proovid mind käivitada administraatori õigustega!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Kasuta selle asemel mittepriviligeeritud kontot.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "täpne vaste"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "ainus vaste"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "ebaselge"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "tühi"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "liiga pikk"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "mittevastav"
 
@@ -1051,69 +1051,69 @@ msgstr "%s on alustanud %s ehitamist linnas %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s müüb %s (ebavajalik) %d eest."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (AI)* Mitteaktiivses režiimis ei saa AI sellist lepet sõlmida."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (AI)* Esiteks astu %s liidust välja, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (AI)* Lõpetame kõigepealt vaenutsemise, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr "*%s (AI)* Ma tahan praegust vaherahu natuke kauemaks jätta, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (AI)* Ma lihtsalt ei usalda veel astuda sinuga liitu, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (AI)* Ma ei tunne sellist linna."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (AI)* Vabanda, aga sinuga vaate jagamine ei ole ohutu."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (AI)* See lepe pole meile eriti hea, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* Tere tulemast meie liitlaseks %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* Jah, me võime jääda alatiseks ühendatuks, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* Jah, rahu selleks korraks!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)* Nõus, lõpetame vaenutsemise, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1122,22 +1122,22 @@ msgstr ""
 "*%s (AI)* Tervitus, %s! Kas me tohime ette panna sõjategevus peatada kuni "
 "õpime teineteist paremini tundma?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* Kosmos ei saa iial sinu omaks. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr "*%s (AI)* Ma olen sind juba piisavalt kaua kannatanud! Elagu sõda!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (AI)* Rahu ... mõni teine kord."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1146,17 +1146,17 @@ msgstr ""
 "*%s (AI)*Lõpuks ometi sain su kätte. Kas sa tõesti arvasid, et sinu kuritöid "
 "ei panda tähele?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (AI)* Sinu varjatud vaenulikkus tõi sulle selle sõja kaela!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)* Sinu rünnakud %s vastu oli su viimane viga!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1171,7 +1171,7 @@ msgstr[1] ""
 "*%s (AI)* Me alustame meeleheitlikku sõda %s vastu %d käigu pärast, et "
 "takistada teda saatmast välja kosmoselaeva."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1179,7 +1179,7 @@ msgid ""
 msgstr ""
 "*%s (AI)* Me ootame su abi selles asjas. Elagu meie kuulsusrikas liiit!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1198,7 +1198,7 @@ msgstr[1] ""
 "sõjalise jõuga %d käigu pärast ja ootame, et te austaks meie liitu ja teeks "
 "samamoodi!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1213,13 +1213,13 @@ msgstr[1] ""
 "*%s (AI)* Me kavatseme rüüstada %s rikast tsivilisatsioon. Me kuulutame sõja "
 "%d käigu pärast."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr "*%s (AI)* Kui tahad ka rüüstada, löö kaasa!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1234,13 +1234,13 @@ msgstr[1] ""
 "*%s (AI)* Meil on kopp ees %s-idest. Rebime ta haleda tsivilisatsiooni "
 "tükkideks. Me kuulutame sõja %d käigu pärast."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (AI)* Meie kuulsusrikka liidu pärast me ootame teie abi selles sõjas."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1255,7 +1255,7 @@ msgstr[1] ""
 "*%s (AI)* Me austame oma liitu ja kuulutame sõja %s-le %d käigu pärast. "
 "Pidage vastu - me tuleme!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1270,7 +1270,7 @@ msgstr[1] ""
 "*%s (AI)* Me austame oma liitu %s-ga ja kuulutame sõja %s-le %d käigu "
 "pärast. Me ootame, et te samamoodi käituks."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1279,14 +1279,14 @@ msgstr ""
 "*%s (AI)* Teie soov vallutada kosmos ainult endale reedab teie tõelisi "
 "kavatsusi. Meie liit on läbi!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr "*%s (AI)* Teie katse üksi domineerida kosmoses on väga solvav."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1295,12 +1295,12 @@ msgstr ""
 "*%s (AI)* Kui Sa ei lõpeta kosmoselaeva ehitamist, olen ma sunnitud midagi "
 "ette võtma!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr "*%s (AI)* Vabanda, sinuga vaate jagamine ei ole enam ohutu."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1309,7 +1309,7 @@ msgstr ""
 "*%s (AI)* Tervitus, me ustavaim liitlane. Me kutsume teid üles hävitama meie "
 "vaenlast %s."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1318,7 +1318,7 @@ msgstr ""
 "*%s (AI)* Tervist, liitlane! Ma näen, et te pole veel kuulutanud sõda me "
 "vaenlastele %s-le. Miks ma pean teile te lubadusi meelde tuletama?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1328,7 +1328,7 @@ msgstr ""
 "*%s (AI)* Autu, me tegime liidu ja ikkagi on sul rahu meie surmavaenlastega %"
 "s! Me ei lepi sellega, meie liitu pole enam!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1336,13 +1336,13 @@ msgid ""
 msgstr ""
 "*%s (AI)* Tervist, sõber. Kas me tohiks soovitada ühiseid eesmärke ja liitu?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "*%s (AI)* Tervist, sõber. Kas me tohiks soovitada rahumeelsemaid suhteid?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1351,7 +1351,7 @@ msgstr ""
 "*%s (AI)* Me oleme väsinud pidevast verevalamisest. Kas me tohiks soovitada "
 "sõjategevuse peatamist?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1361,64 +1361,69 @@ msgstr ""
 "kuulsat liitu ja su nime ei unustata kunagi!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Kõik seaded"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr " puuub konfifailist (kasutan vaikimisi väärtust)"
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr " (vaikimisi)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr " (konfist)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr " (seatud)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "See nimi pole lubatud."
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Ei leia helifaili %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr "Hoiatus: külalisnimi '%s' on juba võetud, uueks nimeks saab '%s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Siia serverisse pole külalised lubatud. Vabanda."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s-le öeldi ära. Külalisi ei lubata."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr "Viga kasutajabaasi lugemisel, logib sisse külalisena '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1426,39 +1431,39 @@ msgstr ""
 "Kasutajate andmebaasi lugemisel juhtus mingi viga ja külalisi ei lubata "
 "seetõttu sisse. Vabanda"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s-le keelduti: Andmebaasi viga ja külalised pole lubatud."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Sisesta kasutaja %s parool:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Sisesta parool (ja jäta meelde)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Siia serveri on lubatud ainult registreeritud kasutajad."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s-le öeldi ära. Lubatud on ainult registreeritud kasutajad."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Dang, liiga palju vigaseid katseid..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr "%s-le keelduti: Liiga palju uue kasutaja paroolivigu."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1466,30 +1471,30 @@ msgstr ""
 "Hoiatus: Andmebaasi salvestamine ei õnnestunud. Jätkan, kuid su statistikat "
 "ei salvestata."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s-le öeldi ära. Liiga palju katseid parooli sisestamisel."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Parool on vale. Proovi uuesti."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Vabanda, su ühendus aegus..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s-le keelduti: Ãœhendus aegus parooli ootamisel."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "Parool liiga lühike, vähim pikkus on %d. Proovi uuesti."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2270,16 +2275,14 @@ msgid "Cast a vote."
 msgstr "Hääleta."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Mängija, kel on info-taseme juurdepääs alustab juht-taseme käsu andmisel "
 "hääletuse selle käsu kohta.  /vote-käsk, millele järgneb \"yes\" või \"no"
@@ -2290,7 +2293,7 @@ msgstr ""
 "mängijatest hääletab vastu.  Kui üks terve käik läheb mööda ja keegi ei "
 "hääleta vastu, võib hääletus võita."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2298,11 +2301,11 @@ msgstr ""
 "debug [ player <mängija> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<mängija> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Lülita antud isendi tehismõistuse silumine sisse või välja."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2310,23 +2313,23 @@ msgstr ""
 "Näita antud isendi tehismõistuse silumisinfot ja lülita pidev silumisväljund "
 "selle isendi kohta sisse või välja."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <seade nimi> <väärtus>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Määra serveri seaded."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <mängija> [meeskond]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Muuda, lisa või eemalda mängija meeskonda kuuluvust."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2338,15 +2341,15 @@ msgstr ""
 "kes alustavad liitlastena, jagatud vaatega ja saatkondadega ja võitlevad "
 "koos meeskonnavõidu nimel. Punktid jagatakse võrdselt liikmete vahel."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <kataloog>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Vali uus reeglistik või modifikatsioon."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2355,15 +2358,15 @@ msgstr ""
 " ilma argumentideta näitab praegust reeglistikku."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <meta-rida>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Määra metaserveri info-rida."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2375,19 +2378,19 @@ msgstr ""
 "metasõnumit automaatselt genereeritu asemel, kui see on olemas."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <meta-rida>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Määra metaserveri lapirida."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Kontrolli ühendust metaserveriga."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2398,33 +2401,33 @@ msgstr ""
 "'metaconnection up' ehk 'metac up' ühendub metaserverisse."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <aadress>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Määrab aadressi (URL), millele metaserver raporti saadab."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <mängija nimi>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Lülitab mängija AI-oleku."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [ühenduse-nimi] <mängija-nimi>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Võta mängija positsioon mängus endale."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2438,15 +2441,15 @@ msgstr ""
 "juba mängijat, luuakse uus mängija ja antakse tollele ühendusele."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [ühenduse-nimi] [mängija-nimi]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Piilu mängijat või tervet mängu."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2460,15 +2463,15 @@ msgstr ""
 "argumente, siis ühendus pannakse globaalse vaatleja külge."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <ühenduse-nimi>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "ühendub mängijast lahti."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2477,20 +2480,20 @@ msgstr ""
 "ühendusi ühenduma lahti mängijast."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <mängija nimi>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Loob selle nimega AI-mängija."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "'create' käsk on kasutatav ainult enne mängu algust."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2498,16 +2501,16 @@ msgstr ""
 "eemal\n"
 "eemal"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Paneb su eemalolekurežiimi. Tehisintellekt hoolitseb su eest seni."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "Tehisintellekt võtab valitsuse üle, aga teeb minimaalselt muudatusi."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2515,11 +2518,11 @@ msgstr ""
 "novice\n"
 "novice <mängija-nimi>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Märgib ühe või kõik tehismõistuse mängijatest algajaks."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2530,7 +2533,7 @@ msgstr ""
 "selle mängija taseme."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2538,11 +2541,11 @@ msgstr ""
 "easy\n"
 "easy <mängija nimi>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Märgib ühe või kõik tehismõistuse mängijatest lihtsateks."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2553,7 +2556,7 @@ msgstr ""
 "selle mängija taseme."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2561,11 +2564,11 @@ msgstr ""
 "normal\n"
 "normal <mängija-nimi>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Märgib ühe või kõik AI mängijatest normaalseteks."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2576,7 +2579,7 @@ msgstr ""
 "selle mängija taseme."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2584,11 +2587,11 @@ msgstr ""
 "hard\n"
 "hard <mängija-nimi>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Märgib ühe või kõik tehismõistuse mängijatest rasketeks."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2599,7 +2602,7 @@ msgstr ""
 "selle mängija taseme."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2607,11 +2610,11 @@ msgstr ""
 "experimental\n"
 "experimental <mängija-nimi>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Märgib ühe või kõik AI mängijatest eksperimentaalseks."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2624,7 +2627,7 @@ msgstr ""
 "TESTIMISEKS! Tavalistel serveritel ei tähenda see seade midagi."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2638,11 +2641,11 @@ msgstr ""
 "cmdlevel <tase> first\n"
 "cmdlevel <tase> <ühenduse-nimi>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Päri või määra käsutaseme ligipääsu."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2681,20 +2684,20 @@ msgstr ""
 "ühenduda privilegeeritud mängijaga sama nimega.  Pane tähele, see käsk võtab "
 "nüüd argumendiks ühenduste, mitte mängijate nimesid."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "Kui sellist ei leidu, hakka suuremate õigustega mängujuhiks."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <käik> <käiguinkrement> <väärtus> <kordaja>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Vaata \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2705,24 +2708,24 @@ msgstr ""
 "käsku koos \"timeout\" seadega. Vaikimisi väärtused on 0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "mängu lõpuosa"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Lõpeta mäng kohe viigiga."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "alistu"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Anna alla."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2731,15 +2734,15 @@ msgstr ""
 "andnud, mäng lõpeb."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <mängija nimi>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Korista mängija täielikult mängust ära."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2748,7 +2751,7 @@ msgstr ""
 "Kasuta ettevaatlikult!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2756,11 +2759,11 @@ msgstr ""
 "save\n"
 "save <failinimi>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Salvesta mäng faili."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2776,17 +2779,17 @@ msgstr ""
 "ja lase käima käsk 'start', kui mängijad on ühendunud."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
 msgstr "load <failinimi>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Lae mäng failist."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2795,28 +2798,28 @@ msgstr ""
 "reeglistikud ja serveri seaded on kaovad.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <failinimi>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Loe serveri käsud failist."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <failinimi>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Salvesta praegused seaded serveri käskudena faili."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Lülita serveri väljund 'RFC-stiil'ilt tavalise stiilile või vastupidi."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Lihtsalt annab serveri ID."
 
@@ -3328,27 +3331,36 @@ msgstr "Sa põhjustasid intsidendi, kui üritasid revolutsiooni süüdata %s-s."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s põhjustasid intsidendi, kui üritasid revolutsiooni süüdata %s-s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr "Merel sõitvad algüksused ei ole veel toetatud. Keegi ei saanud %s-t."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Aasta: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Käigu ajalimiit läks üle maksimaalse lubatud väärtuse. Fikseerin ta "
 "maksimumile."
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Käigu tegemise aeg on nullist väiksem, sean nulliks."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Ainult GGZ klient saab kutsuda välja civclienti ggz-režiimis!\n"
 
@@ -3391,27 +3403,27 @@ msgstr "Ei leidu ühendust nimega %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Ei leidu mängijat ega ühendust nimega %s"
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Globaalne soojenemine!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 "Rannaalad on üleujutatud ja tohutul hulgal rohumaid on muutunud kõrbeks."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Tuumatalv!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Mäng Märgalad on kuivanud ja tohutul hulgal rohumaad on muutunud tundraks."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3420,7 +3432,7 @@ msgstr ""
 "Uus lootus levis kulutulena läbi riigi, kui teatati raudtee leiutamisest.\n"
 "      Töötajad kogunevad spontaanselt ja uuendavad kõik linnad raudteedega."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3429,12 +3441,12 @@ msgstr ""
 "äng: Rahval on heameel kuulda, et teadlased lõpuks teavad midagi raudteest.\n"
 "      Töötajad kogunevad spontaanselt ja uuendavad kõiki linnu raudteedega."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Su %s nihutati, kuna maastik muutus."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Su %s lasti lahti, kuna maastik muutus."
@@ -3497,27 +3509,27 @@ msgstr "Revolutsioon: langesime uuesti anarhiasse."
 msgid "You should choose a new government from the government menu."
 msgstr "Sa peaks valima uue valitsusvormi valitsuse menüüst."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Maksumäär ületas %s maksimummäära; kohandati."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Teaduse määr ületas %s maksimummäära; kohandati."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Hüvede määr ületas %s maksimummäära; kohandati."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s ei anna enam meile jagatud vaatevälja!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3526,13 +3538,13 @@ msgstr ""
 "Senat ei luba sul murda lepet %s-dega.  Sa pead kas senati laiali saatma või "
 "ootama paremat aega."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "Senat nõustub su ettepanekuga, kuna %s käib pidevalt närvidele."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3541,25 +3553,25 @@ msgstr ""
 "Senat keeldub murdmast lepet %s-dega, kuid ega uue senati leidmine polegi "
 "nii raske.."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr " %s ja %s diplomaatiline suhe on nüüd %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr " %s lõpetasid leppe! %s ja %s diplomaatiline suhe on nüüd %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr "%s ründasid su liitlast %s! Sa lõpetad oma liidu agressoriga."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3568,54 +3580,54 @@ msgstr ""
 "Su meeskonnakaaslane %s kuulutas sõja %s-le. Sa oled kohustatud lõpetama "
 "liidu %s-ga."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Eemaldan mängija %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Sind eemaldati mängust!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s eemaldati mängust."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Lõid kontakti rahvusega %s, valitseja %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr "%s ja %s kohtuvad ja hakkavad kohe sõdima. Sa lõpetad liidu mõlemaga."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Ei saanud %s kodusõtta ajada - liiga palju mängijaid"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Ei saanud %s kodusõtta ajada - liiga palju mängijaid"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr "Su rahvus on kodusõjas, %s kuulutati ülestõusnute juhiks."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s vannub truudust %s'le."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3852,19 +3864,19 @@ msgstr "."
 msgid "th"
 msgstr "."
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr "Demograafia stringis on imelikud tähed. Proovi \"help demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Demograafiline Raport:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Vabandame, Demograafiline raport pole kättesaadav."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%s rahvusel %s (%s)"
@@ -3875,13 +3887,13 @@ msgstr "%s rahvusel %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Ei suutnud leida loetavat \"%s.%s\" reeglistiku faili."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 "Reeglistikus pole ühtki barbari rahvust, vähemalt üks barbari rahvus on "
 "kohustuslik!"
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Laen reeglistikke"
 
@@ -3895,7 +3907,7 @@ msgstr ""
 "Mängu salvestises on kaart mittetäielik.  See saab juhtuda vanade "
 "salvestatud mängudega või on salvestis lihtsalt vigane.  Jätka omal riisikol."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Salvestatud mäng on liiga vana, vaja on vähemalt versiooni 1.9.0."
 
@@ -3917,13 +3929,13 @@ msgstr ""
 "toetatud. Kasutan '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr "%s sattus vigase rahva juhiks. Annan talle rahva %s."
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3960,7 +3972,7 @@ msgstr "Sisene"
 msgid "Networking"
 msgstr "Võrgundus"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Kõik"
@@ -3981,7 +3993,7 @@ msgstr "Haruldane"
 msgid "Changed"
 msgstr "Muudetud"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -3989,7 +4001,7 @@ msgstr ""
 "\"Allowed take string\"is on keelatud\n"
 "märgid.  Vaata \"help startunits\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -3997,7 +4009,7 @@ msgstr ""
 "Algüksuste stringis on keelatud\n"
 "märgid.  Vaata \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4007,15 +4019,15 @@ msgstr ""
 "ühte linnaasutajat.  Vaata\n"
 "\"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr "Ei saa seada lõpuaastat varasemaks praegusest aastast."
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "Pole võimalik muuta maxplayers'i GGZ-režiimis."
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
@@ -4023,11 +4035,16 @@ msgstr ""
 "Mängijate arv on suurem kui küsitud väärtus.\n"
 " Jätan vana väärtuse."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Sa ei tohi seda seadet muuta."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Kaardi suurus (tuhandetes ruutudes)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4037,12 +4054,12 @@ msgstr ""
 "  size = 4 on tavaline kaart 4000 ruuduga (vaikimisi)\n"
 "  size = 20 on hiiglaslik kaart 20 000 ruuduga"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Kaardi topoloogia indeks"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4111,11 +4128,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Kaardi tekitamise meetod"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4135,11 +4152,11 @@ msgstr ""
 "väärtusi. Kui startpos'i väärtuseks on vaikimisi seade, siis määrab "
 "algasukoha generaator. Vaata ka \"startpos\" seadet."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Algasukohtade valimise meetod"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4161,37 +4178,37 @@ msgstr ""
 "NB: generaatorid püüavad teha õige arvu kontinente vastavalt startpos "
 "väärtusele ja mängijate arvule."
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "1x1 saarte olemasolu"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = pole 1x1 saari, 1 = mõned 1x1 saared"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Kas poolused on eraldi kontinendid"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = kontinendid võivad pooluste külge ühenduda, 1 = poolused on tavaliselt "
 "eraldi"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Kogu kaart on mõõduka kliimaga"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = tavaline Maa-moodi planeet, 1 = kogu planeet on mõõduka kliimaga"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Planeedi keskmine temperatuur"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4223,21 +4240,21 @@ msgstr ""
 "\n"
 "0 tähendab väga külma planeeti suurte polaaraladega, kus pole troopikat."
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Maismaa protsent kaardist"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr "See seade määrab umbkaudu maismaa osa kaardil."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Mägede ja küngaste hulk"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4245,11 +4262,11 @@ msgstr ""
 "Väike väärtus tekitab tasase kaardi, suurem annab järsema kaardi rohkemate "
 "küngaste ja mägedega."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Vee hulk kontinentidel"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4257,11 +4274,11 @@ msgstr ""
 "Väikesed väärtused tähendavad paljut kuiva, kõrbe moodi maad. Kõrgemad "
 "väärtused annavad niiskema maa rohkemate soode, džunglite ja jõgedega."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Kaardi loomisel kasutatav suvaline 11-kohaline algarv (või mõni muu)"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4271,11 +4288,11 @@ msgstr ""
 "arv olenevalt kellaajast, et tekiks juhuslik kaart. Seda seadet kasutatakse "
 "tavaliselt ainult silumisel."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Mängu juhuslikkuse seeme"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4283,11 +4300,11 @@ msgstr ""
 "Nulli (vaikimisi) korral valitakse seeme kellaaja järgi. Seda seadet "
 "kasutatakse tavaliselt ainult mängu silumisel"
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "\"Spetsiaalsete\" resurssidega ruutude arv"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4295,11 +4312,11 @@ msgstr ""
 "Spetsiaalsed resurssid parendavad pinnatüüpi, millel nad on. Serveri muutuja "
 "skaala ühik on tükki tuhande kohta."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Onnide (pärismaalaste külade) arv"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4307,23 +4324,24 @@ msgstr ""
 "See säting annab täpse onnide arvu, mis kogu kaardile pannakse. Onnid on "
 "väikesed hõimude külad, mida üksused võivad uurida."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Minimaalne mängijate arv"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Mängu alustamiseks peab olema vähemalt nii palju mängijaid (kas siis "
 "ühendunud inimesi või tehismõistusi)."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Maksimaalne mängijate arv"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4333,11 +4351,11 @@ msgstr ""
 "mängijat on ühendunud mängueelses seisus, ei anta edaspidi uutele "
 "üritajatele võimalust ühenduda."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Mängijate koguarv (koos tehismõistustega)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4345,11 +4363,11 @@ msgstr ""
 "Kui seatud positiivsele väärtusele, luuakse või eemaldatakse tehismõistusi "
 "parajasti nii palju, et mängijate koguarv oleks see väärtus."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Mängija algüksuste nimekiri"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4376,27 +4394,27 @@ msgstr ""
 "    a   = Kiire ründaja (nt. Ratsanikud)\n"
 "    A   = Tugev ründaja (nt. Katapult)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Ala, millel esialgsed üksused paiknevad"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "See on raadius, mille piires hajutatakse algüksused."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Kuld mängu alguses"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Mängu alguses antakse igale mängijale nii palju raha."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Algteaduste arv mängija kohta"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4408,11 +4426,11 @@ msgstr ""
 "väärtusest reeglistikus võib suur techlevel'i väärtus muuta järgmise "
 "tehnoloogia saamise väga kalliks."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Tehnoloogia hinna kordaja protsent"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4423,11 +4441,11 @@ msgstr ""
 "protsendiga). Tehnoloogiate baashinnad määratakse reeglistikuga või muude "
 "mänguseadetega."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Protsendiline trahv tehnoloogia muutmise eest"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4437,11 +4455,11 @@ msgstr ""
 "teaduspunkte, kaotad selle protsendi neist. See ei kehti, kui oled sellel "
 "käigul just avastanud uue tehnoloogia."
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Trahv lepingust tehnoloogia saamise eest"
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4453,11 +4471,11 @@ msgstr ""
 "see väärtus ei ole null, võid omada negatiivseid teaduspunkte. See seade "
 "muudab samuti kulla ülekandeid diplomaatilistes lepetes."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Protsendiline trahv tehnoloogia saamisel vallutusest"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4467,11 +4485,11 @@ msgstr ""
 "teaduspunkte nõnda palju kui on see protsent korda uue leiutise hind.  Kui "
 "see väärtus ei ole null, võid omada negatiivseid teaduspunkte."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Protsendiline trahv tehnoloogia tasuta saamise eest"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4484,11 +4502,11 @@ msgstr ""
 "saadud), kaotad teaduspunkte see protsent korda uue leiutise hind. Kui see "
 "väärtus ei ole null, võid omada negatiivseid teaduspunkte."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Linna kasvuks vajaliku toidu hulk"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4498,11 +4516,11 @@ msgstr ""
 "korrutatakse läbi teise teguriga, mis tuleb reeglistikust ja sõltub linna "
 "suurusest."
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr "Toidu kaotus protsentides, kui puudub vajalik ehitis"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4512,11 +4530,11 @@ msgstr ""
 "siis kaotab ta nii mitu protsenti oma toiduvarust. Kui linnal on viljaait, "
 "kaotab ta poole sellest arvust."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Tootmiskulude kordaja-protsent"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4524,11 +4542,11 @@ msgstr ""
 "See mõjutab üksuste ja ehitiste valmistamise kiirust.  Alushinda "
 "korrutatakse selle väärtusega (kui protsendiga)."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Linna miinimumsuurus täieliku kaubanduse saamiseks"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4540,11 +4558,11 @@ msgstr ""
 "sujuvalt 0%-ni (pole trahvi välja arvatud tavaline korruptsioon) suuruse "
 "fulltradesize korral. Vaata ka notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Kaubanduseta linna maksimaalne suurus"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4555,11 +4573,11 @@ msgstr ""
 "kui 'fulltradesize', on toodetud kaubanduspunktide hulk kusagil 0 ja "
 "maksimumi vahel. Vaata ka 'fulltradesize'."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Linna suurus enne rahvas õnnetuks muutumist"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4567,11 +4585,11 @@ msgstr ""
 "Enne muid muudatusi on esimesed 'unhappysize' elanikud linnas rahul, "
 "järgmised on õnnetud. Vaata ka 'cityfactor'."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Rohkemate õnnetutega linnade arv"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4583,11 +4601,11 @@ msgstr ""
 "demokraatiat - teiste riigikordadega avaldub see fenomen väiksema arvu "
 "linnade korral."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Minimaalne linnadevaheline kaugus"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4600,11 +4618,11 @@ msgstr ""
 "vähemalt 2 tühja ruutu igas suunas olema. Kui see väärtus on 0 (vaikimisi), "
 "kasutatakse reeglistiku väärtust."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Käikude arv joovastuse efekti vahel"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4612,11 +4630,11 @@ msgstr ""
 "Määra käikude arv, mis jääb linna joovastusest tuleneva kasvu vahele. Kui "
 "seatud n-iks, siis joovastuses linn kasvab iga n+1 käigu tagant."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Võimalus vallutatud ehitise hävitamisele"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4624,11 +4642,11 @@ msgstr ""
 "Kui mängija vallutab linna on igal linna ehitisel nii mitu protsenti šanssi "
 "saada hävitatud."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Võimalus peale rünnakut ruutu liikumisele"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4641,11 +4659,11 @@ msgstr ""
 "lahingu (ruutu ei jää ühtegi vastase üksust). Kui arv on 0 ja 100 vahel, "
 "näitab see protsendilist võimalust territooriumi \"hõivamiseks\"."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Lülita serveripoolne automaatne ründamine sisse/välja"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4653,11 +4671,11 @@ msgstr ""
 "Kui see on sisse lülitatud, kaaluvad üksused, mil on ülejäänud käike "
 "automaatselt, kas rünnata vaenlase üksusi, mis nende kõrval liiguvad."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Linna rahvaarvu vähenemine peale rünnakut"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4673,11 +4691,11 @@ msgstr ""
 "  4 = heli\n"
 "  8 = air"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Riigipiiride raadius"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4687,11 +4705,11 @@ msgstr ""
 "linnast, on linna rahvuse omad. Ookeani kaardiruutude ja kaardiruutude, mis "
 "on rohkem kui ühe rahvuse linna mõjusfääris, kohta käivad eraldi reeglid."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Territooriumil asuvad üksused ei põhjusta rahulolematust."
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4699,11 +4717,11 @@ msgstr ""
 "Kui see on seatud, ei põhjusta kodumaa territooriumil asuvad üksused "
 "rahulolematust."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Võime diplomaatiat teha teiste mängijatega"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4717,11 +4735,11 @@ msgstr ""
 "3 = diplomaatia on piiratud meeskondadega.\n"
 "4 = diplomaatia on välja lülitatud."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Lubatud linnanimed"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4746,11 +4764,11 @@ msgstr ""
 "3 = Nagu valik 2, ainult mängijad ei tohi valida võõra rahvuse vaikimisi "
 "linnanime, kui see ei ole samas ka nende enda vaikimisi linnanimi."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Barbarite ilmumise sagedus"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4764,19 +4782,19 @@ msgstr ""
 "3 - sagedased barbarite ülestõusud4 - märatsevad barbarite hordid, palju-"
 "palju"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Barbarite tuleku aasta"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbarid ei ilmu enne seda aastat."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Revolutsiooni pikkus käikudes"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4784,11 +4802,11 @@ msgstr ""
 "Valitsust vahetades on nii mitu käiku kestev anarhia. Seade 0 tähendab, et "
 "valitakse juhuslik arv 1 ja 6 vahel."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Kas kasutada 'sõja udu'"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4798,11 +4816,11 @@ msgstr ""
 "üksuste nägemispiirkonnas. Sa ei näe uusi linnu või territooriumi muutusi "
 "ruutudes, mis ei ole nägemispiirkonnas."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Diplomaatide ja spioonide edu baasšanss"
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4811,19 +4829,19 @@ msgstr ""
 "Tõenäosus, et spioon jõuab edukalt missioonilt tagasi ja diplomaatide ja "
 "spioonide edu baasšanss."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Kas lubada võidujooksu kosmosesse"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Kui see seade on 1, saavad mängijad ehitada kosmoselaevu."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Minimaalne linnade arv kodusõja puhkemiseks"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4832,11 +4850,11 @@ msgstr ""
 "Kodusõda läheb lahti kui mängijal on vähemalt niipalju linnu ja pealinn "
 "vallutatakse.  Kui see seade on maksimumis siis ei toimu üldse kodusõdu."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Käikude arv, kuni mängija ühendus loetakse katkenuks"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4846,11 +4864,11 @@ msgstr ""
 "viimast kohtumist - isegi, kui neil saatkonda pole. Kui seade on 0, siis "
 "mängijad ei saa kohtuda, kui neil pole saatkonda."
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Ehita palee uuesti, kui pealinn vallutatakse"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4861,21 +4879,21 @@ msgstr ""
 "palee juhuslikult valitud linnas. See on oluline, kuna nii ignoreeritakse "
 "palee tehnoloogilisi nõudmisi."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Kas kasutada loomulikke linnanimesid"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr "Kui sees, määratakse vaikimisi linnanimed ümbritseva maastiku järgi."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Mängijad ,mida kasutajad võivad võtta"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4938,11 +4956,11 @@ msgstr ""
 "4 = No controller allowed, observers allowed;\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Kas AI-staatus muutub ühendusega"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -4950,24 +4968,27 @@ msgstr ""
 "Kui see on1, AI-d ei kasutata, kui mängija ühendub ja kasutatakse kui "
 "mängija lahkub."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Mängu lõppemise aasta"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Mäng lõpeb sellel aastal."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Maksimaalne käigu aeg"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Kui kõik mängijad pole vajutanud \"Käik sooritatud\" enne kui see aeg saab "
 "otsa, siis käik lõpeb automaatselt. Null tähendab ajalimiidi puudumist. "
@@ -4975,11 +4996,11 @@ msgstr ""
 "automaatse mängu testrežiimi sisse lülitamist. Kasuta seda seadet koostöös "
 "käsuga \"timeoutincrease\", et saada dünaamiline taimer."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "Vähemalt n sekundit ajalimiiti kui vaenlane käis"
 
-#: server/settings.c:896
+#: server/settings.c:889
 #, fuzzy
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
@@ -4988,11 +5009,11 @@ msgstr ""
 "Iga kord, kui nähtav vaenlane liigub, seatakse taimer selle väärtuse peale, "
 "kui taimer oli allpool seda."
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Kas lubada mängijate samaaegsed käigud"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5000,11 +5021,11 @@ msgstr ""
 "Kui lubatud, kõigi mängijate käigud toimuvad korraga. Kui mitte, siis "
 "mängijad käivad järjestikku."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Sekundite arv, kui kaua võib kliendi võrguühendus blokeerida"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5014,11 +5035,11 @@ msgstr ""
 "suletakse. Null tähendab, et ajalimiiti pole, kuid ühendused suletakse "
 "niikuinii varem või hiljem automaatselt."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Maksimaalne sekundite arv võrgu puhvrite tühjenemiseks"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5027,31 +5048,31 @@ msgstr ""
 "Server ootab nii mitu sekundit kõigi klientide võrguühenduste puhvrite "
 "tühjenemiseks. Null tähenab, et server ei oota üldse."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Sekundite arv pingide vahel"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr "civserver saadab klientidele PING-päringuid iga selle aja järel."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Aeg kliendi lahtiühendamiseks"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Kui klient ei vasta pingile selle aja jooksul, katkestatakse ta ühendus."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Blokeeriva käiguga mängu režiim"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5059,11 +5080,11 @@ msgstr ""
 "Kui see on 1 ei lõpe käik enne, kui kõik mängijad on oma käigu lõpetanud, "
 "kaasaarvatud lahti ühendatud mängijad."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Määratud pikkusega käigud"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5072,11 +5093,11 @@ msgstr ""
 "Kui see on 1, ei lõpe mängu käik enne, kui käik on kestnud kindla aja, "
 "isegi, kui kõik mängijad on vajutanud \"Käik käidud\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Mida näidata Demograafilises rapordis"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5117,11 +5138,11 @@ msgstr ""
 "    b = näita \"parim\"-tulpa\n"
 "Tähtede järekord ei ole oluline, aga suur- ja väiketähed on."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Käike automaatse salvestuse kohta"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5129,11 +5150,11 @@ msgstr ""
 "Mäng salvestatakse automaatselt iga selle arvu käikude järel. Null tähendab, "
 "et automaatselt ei salvestata."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Salvestatud mängu kokkupakkimise tase"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5143,11 +5164,11 @@ msgstr ""
 "formaati). Suuremad väärtuseda annavad väiksema faili, kuid võtavad kauema "
 "aega. Kui maksimum on null, ei kompileeritud serverit zlib toega."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Automaatselt salvestatud mängu nime prefix"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5155,11 +5176,11 @@ msgstr ""
 "Automaatselt salvestatud mängude nimeks tuleb \"<prefix><year>.sav\". See "
 "seade määrab <prefix>i."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Kas logida mängijate statistika"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5172,7 +5193,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Server ei suuda standardsisendit lugeda. Ignoreerin sisendit."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Server: halb aadress: [%s:%d]."
@@ -5303,87 +5324,87 @@ msgstr "Ei suutnud salvestada mängu faili %s"
 msgid "Game saved as %s"
 msgstr "Mäng salvestati faili %s."
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Mäng juba käib."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr "%s kaotas käsutaseme mängu alguses.  Edaspidi peab hääletama."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Alustame mänguga."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "küsiti tundmatut raportit (tüüp %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Hoiatus: ei luba sisse vana klienti %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Sain paketi tüübiga %d surnud mängijalt või vaatlejalt"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Palun vali mittetühi nimi."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "See rahvus on juba kasutusel."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "Nimi '%s' on juba kasutusel. Palun vali mõni teine nimi."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Palun vali nimi, mis sisaldab ainult ASCII märke."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "Rahvus %s ei ole saadaval selles stsenaariumis."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "Rahvus %s on juba kasutuses."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s on rahvuse %s valitseja %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Ootan mängu alustamist: %d %d-st mängijast on juba valmis alustama."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s liideti kui %s arvuti juhitud mängijana."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Mängija %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s on %s valitseja."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
@@ -5391,16 +5412,16 @@ msgstr ""
 "See civserver'i programm toetab mängijate autentimist, kuid see pole hetkel "
 "kasutuses."
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Saadan infot metaserverile [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Mäng on läbi..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Ootan klientprogrammide ühendusi."
 
@@ -5422,7 +5443,7 @@ msgstr "(mitmetähenduslik)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5598,7 +5619,7 @@ msgstr "Mängijaid ei saa eemaldada kui mäng juba käib."
 msgid "Removed player %s from the game."
 msgstr "Mängija %s eemaldati mängust."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Nime \"%s\" ei lubata turvapõhjustel."
@@ -5671,201 +5692,201 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr "Ei saa tõsta käsutaset '%s' peale, sul on endal ainult '%s'."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Käsutase seatud '%s'-iks ühendusel %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "Ei saanud seada käsutaset '%s'-iks ühendusele %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Käsutase seatud '%s'-iks uutele mängijatele."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "Käsutase seatud '%s' esimesele mängijale, kes selle võtab."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "Käsk 'first' on mõttetu serveri käsureal."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Sul on juba käsutase '%s' või parem."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Keegi teine on juba mängujuht."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "Ühendus %s on vabatahtlik mängujuhiks saama."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Vigane argument %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 "Kasutamine: timeoutincrease <käik> <käigulisand> <väärtus> <väärtusetegur>"
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Dünaamiline ajapiirang seatud %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Seade:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Kirjeldus:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Staatus: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "muudetav"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fikseeritud"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Väärtus: %d, miinimum: 0, vaikimisi: %d, maksimum: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Väärtus: %d, miinimum: %d, vaikimisi %d, maksimum: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Väärtus: \"%s\", vaikimisi \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Selgitused on saadaval järgnevatele serveri seadetele:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Sellele ei ole veel selgitust."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Mitmesti mõistetav seade nimi."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Serveri operaator: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Mängijal '%s' on nüüd tehismõistuse mänguoskus '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s ei ole tehismõistuse juhitud."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Tehismõistuse vaikimisi mänguoskus '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "See käsk on ainult kliendile."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Kasutus: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Ainult mängijad võivad away-käsku käivitada."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s seatud eemalolekurežiimi."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s taasühines mänguga."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Vabanda, sul ei ole ligipääsu seade '%s' nägemiseks."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Tundmatu seade '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Kõik seaded mitte-vaikimisi väärtustega"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Kõik seaded"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Eluliselt tähtsad seaded"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Mõnikord kasutatavad seaded"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Harva kasutatavad seaded"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ tähendab, et sa võid muuta seda seadet"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= tähendab, et see seade on vaikimisi väärtusega"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s väärtus   (min,max)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Seade"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "kirjeldus"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -5873,37 +5894,37 @@ msgstr ""
 "Proovi 'show situational' või 'show rare', näitamaks muid valikuid.\n"
 "Proovi 'show changed', näitamaks muudetud seadeid."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Ei saa muuta meeskondi peale mängu algust."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Defineerimata argument.  Kasutus: team <mängija> <meeskond>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr "Pole meeskonda %s.  Palun anna kobe meeskonna nimi või number."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Ei saa võtta meeskonda barbarit."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Mängija %s liidetud meeskonda %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Defineerimata argumendid. Kasutus: vote yes|no [hääletuse nr]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Vaatlejad ei saa hääletada."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -5911,39 +5932,39 @@ msgstr ""
 "Hääletada saab ainult käimas olevas mängus.  Kasuta käsku 'first' saamaks "
 "mängujuhiks, kui hetkel pole mängujuhti."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Hääletus %d \"%s\": %d poolt, %d vastu"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Hetkel pole ühtegi hääletust."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Pole kobedat viimast hääletust."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Väärtus peab olema täisarv."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Pole sellist hääletust (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Sa hääletasid \"%s\" kasuks"
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Sa hääletasid \"%s\" vastu."
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -5951,427 +5972,454 @@ msgstr ""
 "Defineerimata argumendid. Kasutus: debug <diplomaatia <mängija> | city <x> "
 "<y> | units <x> <y> | unit <id> | tech <mängija> | timing | info>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Seda käsku saab kasutada ainult pärast mängu algust."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "%s diplomaatiat ei debugita enam"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "%s diplomaatiat debugitakse"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "%s teadust ei debugita enam"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "%s teadust debugitakse"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Väärtus 2 & 3 peab olema täisarv"
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Vigased kaardi koordinaadid."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Pole linna neil koordinaatidel."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s ei debugita enam."
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "Rahva %s %s'i ei debugita enam."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "Rahva %s %s'i debugitakse."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Väärtus 2 peab olema täisarv."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Ãœksus %d ei eksisteeri."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Defineerimata argument.  Kasutus: set <seade> <väärtus>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Sa ei tohi seda seadet muuta."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Seda seadet ei saa muuta pärast mängu algust."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Väärtus peab olema täisarv."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr "Parameeter %s võib sisaldada ainult numbreid 0-1."
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Väärtus lubatud vahemikust väljas (miinimum: 0, maksimum: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Seade: %s seati %d-ks."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr "Parameeter %s peaks sisaldama ainult märke +- ja 0-9."
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Väärtus lubatud vahemikust väljas (miinimum: %d, maksimum: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Stringi väärtus on liiga pikk.  Kasutus: set <seade> <väärtus>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Seade: %s seati \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Vabanda, selles mängus ei saa olla globaalne vaatleja."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 "Vabanda, selles mängus ei saa võtta globaalset vaatlejat. Vaatle hoopis seda."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Vabanda, selles mängus ei saa hakata inimmängijaks."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Vabanda, selles mängus ei saa vaadelda barbareid."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Vabanda, selles mängus ei saa hakata barbariks."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Vabanda, selles mängus ei saa vaadelda surnud mängijaid."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Vabanda, selles mängus ei saa hakata surnud mängijaks."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Vabanda, selles mängus ei saa vaadelda tehismõistusi."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Vabanda, selles mängijas ei saa hakata tehismõistuseks."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Vabanda, selles mängus ei saa vaadelda inimmängijaid."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "Vabanda, selles mängus ei saa hakata inimmängijaks."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Vabanda, seda mängu ei saa vaadelda."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Vabanda, selles mängus ei saa mängijaks hakata."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 "Vabanda, selles mängus ei saa hakata mängijateks, kes on juba ühendunud "
 "mängu."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Kasutus: observe [ühenduse nimi [mängija nimi]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Kasutus: observe [mängija nimi]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s juba juhib %s. 'observe' kasutamine eemaldaks %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s juba vaatleb %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s juba vaatleb."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s vaatleb nüüd %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s on nüüd pealtvaataja"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Kasutamine: take <ühenduse-nimi> <mängija-nimi>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Kasutamine: take <mängija nimi>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Kasutus: take [ühenduse nimi] <mängija nimi>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s juba juhib %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
 msgstr "Mängijale %s pole vaba mängijakohta."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "ühendub lahti %s-st"
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr " %s juhib nüüd %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbar"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "Tehisintellekt"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "inimene"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Elus"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Surnud"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s ei ole ühendatud ühegi mängija külge."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Kasutus: detach <ühenduse nimi>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Sa ei saa teisi kasutajaid lahti ühendada."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s ei ole ühendatud ühegi mängija külge."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s ühendub lahti %s-st"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s ei jälgi enam."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "ühendun lahti %s-st."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Kasutamine: load <mängu nimi>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "Mängu ei saa laadida, teine juba käib."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "Ei leia salvestust või stsenaariumi nimega \"%s\"."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "Ei suuda laadida salvestatud faili: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Praegune reeglistike kataloog on \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Reeglistike kataloogi \"%s\" ei leitud"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Reeglistike kataloog on juba \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Reeglistiku kataloog seatud väärtusele \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Head aega."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Vabanda, sa ei tohi serveri käske käivitada."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Hoiatus: '%s' interpreteeriti kui '%s', kuid see on mitmesti mõistetav.  "
 "Vaata '%shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Tundmatu käsk.  Vaata '%shelp'"
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Sinu uus hääletus anulleeris su eelmise hääletuse."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Uus hääletus (number %d) mängijalt %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr "Su uus hääletus (\"%s\") oli segane."
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Sul pole lubatud seda käsku kasutada."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(serveri käsurida)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Mäng lõppes viigiga."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Lõpetame mängu. Server taaskäivitub peale kõigi klientide lahtiühendumist."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Mängu ei saa lõpetada, mäng ei käi."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s andis alla ega saa enam võita."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Sa ei saa praegu alla anda."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
+msgstr "Pole piisavalt mängijaid, mäng ei alga."
+
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
 msgstr "Pole piisavalt mängijaid, mäng ei alga."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Pole piisavalt mängijaid, mäng ei alga."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Kõik mängijad on valmis. Mäng algab."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr "Ei saa mängu alustada: mäng ootab kõigi klientide lahtiühendumist."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Mängu ei saa alustada, see juba käib."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Lõikas %s ühenduse."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6409,123 +6457,123 @@ msgstr ""
 "  save   -  praeguse mängu salvestamiseks\n"
 "  quit   -  väljumiseks"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Käsk:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Kokkuvõte:"
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Tase: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Järgmised serveri käsud on saadaval:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Abi argument '%s' on mitmesti mõistetav."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Pole vasteid abi argumendile '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Halb listi argument: '%s'.  Vaata '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Mängijate nimekiri:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<mängijaid ei ole>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "kasutajanimi %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Surnud"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", raskusaste %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", valmis"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", pole valmis"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d ühendus:"
 msgstr[1] " %d ühendust:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr " %s %s-ist (käsutase %s), puhver=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (vaatlejarežiim)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Meeskondade nimekiri:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : '%s' : %d mängija"
 msgstr[1] "%2d : '%s' : %d mängijat"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 mängija : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Tühi meeskond: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Nimekiri ühendustest serverisse:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<ühendusi ei ole>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Nimekiri saadaolevatest stsenaariumidest:"
 
@@ -6597,17 +6645,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Tehnoloogiline eesmärk on %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Varastad %s %s-telt."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%s varastasid sult %s!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%s varastasid tehnoloogia %s rahvuselt %s."
@@ -7116,20 +7164,20 @@ msgstr "Katse ehitada ilmaime linna %s ei õnnestunud."
 msgid "Your %s has invalid orders."
 msgstr "Su üksusel %s on vigased käsud."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Massiivne maa - see võib võtta mõni sekund."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Kasutan ikkagi generaatorit %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Generaator 3 ei paigutanud kõiki suuri saari."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Generaator 3 jättis %li maad paigutamata."
@@ -7219,120 +7267,121 @@ msgstr "Võibolla on asi vigastes seadetes või valedes pääsuõigustes"
 msgid "Cannot find audio file %s"
 msgstr "Ei leia helifaili %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX käiku"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d raha käigus"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d käik"
 msgstr[1] "%3d käiku"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "mitte iialgi"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/käik"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d/käik"
 msgstr[1] "%s (%d) %d/käiku"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Aegunud"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Ehitatud"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Ilmaime"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Väike ilmaime"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/käik"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Kodanikud\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Maksud kaubandusest\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : Kaubatee linnaga %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr ""
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Saast\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Rahutused\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Kasutatud\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "====: Kokku\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Kogu ülejääk"
@@ -7445,8 +7494,8 @@ msgid "Best defending units"
 msgstr "Parimad kaitseüksused"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7618,8 +7667,8 @@ msgstr "?pollution [short]:Sst"
 msgid "?cma:Governor"
 msgstr "?cma:Linnapea"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7884,19 +7933,19 @@ msgstr ""
 "Automaatselt ühendun serveri \"%s\" porti %d mängijana \"%s\" iga %f sekundi "
 "takka %d korda"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "algaja"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "kerge"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "tavaline"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "raske"
 
@@ -7904,31 +7953,31 @@ msgstr "raske"
 msgid "experimental"
 msgstr "eksperimentaalne"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Käivitan serverit..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Ei suutnud käivitada serverit."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Vabanda, aga sa pead ühe käsitsi käivitama."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Ei suutnud serverisse ühenduda."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr ""
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Meil on täielik võim serveri üle (käsutase 'hack')"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "Me ei saa serveri üle võimu, üritan maha tappa."
 
@@ -8029,27 +8078,27 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr "Vajab vähemalt suurust %d.\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Võimaldab ehitada teadust %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Võimaldab ehitada %s (kui on olemas %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr "  Jõed"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Kahjuks pole lisainfot teemal %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8060,7 +8109,7 @@ msgstr ""
 "See leht on automaatselt loodud.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
@@ -8069,79 +8118,79 @@ msgstr ""
 "Vajab ehitist %s.\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Teaduse %s avastamine muudab iganenuks teaduse %s.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* Võimaldab mängijal, kes omab teadust %s, ehitada %s.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Võimaldab %s (kui on %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Võimaldab %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Saab ehitada, kui linnas on olemas %s.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Saab ehitada, kui valitsuseks on %s.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Ei saa ehitada linnadesse.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Ei oma kodulinna.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Selle üksuse kaotamisel kaotad kogu mängu!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Seda tüüpi üksusi võib igal mängijal olla vaid üks.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Vajab ehitamiseks rahvaarvu %d.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Saab kanda ja tankida %d õhuüksust.\n"
 msgstr[1] "* Saab kanda ja tankida %d õhuüksust.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Suudab kanda ja tankida %d raketi.\n"
 msgstr[1] "* Suudab kanda ja tankida %d raketti.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Saab kanda %d üksuse üle vee.\n"
 msgstr[1] "* Saab kanda %d üksuse üle vee.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8149,164 +8198,164 @@ msgstr ""
 "* Saab luua kaubateid (selleks peab rändama mõnda linna, mis asub üksuse "
 "kodulinnast vähemalt 9 ruudukese kaugusel.\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr ""
 "* Saab aidata kaasa ilmaimede ehitamisele (lisab toodangusse %d ühikut).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Ei saa laiali saata.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr "* Linnas laiali saates annab tagasi 50%% toodangukuludest.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Saab ehitada uusi linnu.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Võib lisada %d rahvaarvule linnades, mille suurus on ülimalt %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Saab ehitada teid ja raudteid.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Saab ehitada kaevandusi.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Saab ehitada niisutust.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Saab ehitada põllumaad.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Saab ehitada põllumaad (kui on teada %s).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Saab ehitada põllumaad (kui on teada üks järgnevaist: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Saab ehitada kindlusi.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Saab ehitada kindlusi (kui on olemas %s).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Saab ehitada kindlusi (kui üks järgnevatest on olemas: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Võib ruutudelt eemaldada reostust.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Võib puhastada kaardiruute tuumajäätmetest.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Võib muuta kaardiruute.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Võib ehitada lennubaase.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Võib ehitada kindlustusi, lisades 50%% kaitseboonust.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Võib ruudukesi infrastruktuuri hävitamiseks rüüstada.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* Oskab lisaks diplomaatilistele tegevustele ka spiooni tegevusi.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Saab diplomaatilisi tegevusi teha.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Ei kaota kunagi diplomaat-vs-diplomaat võitlust.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Ei saa ära osta.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Saab rünnata vaenlase õhuüksusi.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* Nähtamatu (välja arvatud vaenlase üksuse või linna kõrval).\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 "* Saab rünnata ainult meres asuvaid üksusi (ei saa rünnata maismaaüksusi).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr "* Saab rünnata laevade pealt linnu ja maaüksusi.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Võib langevarjutada sõbralikust linnast (Raadius: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Kahekordne kaitsejõud ratsaüksuste vastu kaitstes.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Arvestatakse teatud üksuste ründamisel ratsaüksuseks.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Rakett: ründamisel ei saa uuesti kasutada.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Ründamine lõpetab selle üksuse käigu.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Selle üksuse rünnak põhjustab tuumaplahvatuse!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Topelt tulejõud linnade ründamisel.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Linnamüüride mõju ei lähe arvesse.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8315,36 +8364,36 @@ msgstr ""
 "* Teeb pommitusrünnakuid (%d rünnakut käigus). Need rünnakud kahjustavad "
 "(kuid ei tapa kunagi) kaitsjat, kuid ei ole ründajale ohtlikud.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Neljakordselt tugev kaitse õhurünnakute vastu.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Maastik ei mõjuta seda üksust (kõik ruudukesed käituvad teedena).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ei tee välja kontrolltsoonidest.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* Tsiviilüksus (ei saa rünnata ega sõjaseisukorda kehtestada).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Ei saavuta kunagi veterani staatust.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
 "* Võib treenimise või võitluste tulemusena saavutada veterani staatuse.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8353,12 +8402,12 @@ msgstr ""
 "* Peab käigu lõpetama linna või maismaa lähedal, muidu on 50%% võimalus "
 "põhjaminekuks.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* %s avastamine vähendab riski 25%%-ni.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s vähendab riski 12%%-ni.\n"
@@ -8367,27 +8416,27 @@ msgstr "* %s vähendab riski 12%%-ni.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr "või"
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:,"
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* Peab olema linnas või ehitises %s %d käigu järel.\n"
 msgstr[1] "* Peab olema linnas või ehitises %s %d käigu järel.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Kui me nüüd hakkaks pihta teadusega %s, oleks meil tarvis %d pirni."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8396,90 +8445,90 @@ msgstr ""
 "Et jõuda tehnoloogiani %s, peame me enne %d muud tehnoloogiat saama. Kogu "
 "selle projekti peale läheb %d pirni."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Seda teadust sa ei saa uurida."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 "See number võib erineda, sõltuvalt sellest, millist tehnoloogiat teised "
 "mängijad uurivad.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr "* Esimene mängija, kes avastab %s, saab kohe ühe tehnoloogia lisaks.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Vähendab laevade põhjamineku tõenäosust 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Vähendab laevade põhjamineku tõenäosust 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Suurendab rahvastiku poolt tekitatavat reostuse hulka.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Võimaldab üksusel %s ehitada teid jõgedele.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Võimaldab üksusel %s ehitada kindluseid.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Võimaldab üksusel %s ehitada lennuvälju.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Võimaldab üksusel %s uuendada teed raudteedeks.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Võimaldab üksusel %s uuendada niisutuse põllumaaks.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Sellel pinnasel ei saa tekitada reostust."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Sa ei saa sellele maastikule linnu ehitada."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Selle piirkonna rannikuala on ebaturvaline."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* See maastik on üksustele liikumiseks ohtlik."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Maaüksused ei saa liikuda mere aladel."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Omadused:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8490,7 +8539,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8499,49 +8548,49 @@ msgstr ""
 "* Igas su linnas muutub %d kodanikku vähem sõjaväeüksuste tõttu õnnetuks.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* Maksad %d korda tavalisest kõrgemat %s ülalpidamiskulu.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 "* Maksad tavalisest %d korda kõrgemaid ülalpidamiskulusid oma üksuste eest.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* Ei maksa %s tüüpi ülalpidamiskulu oma üksuste eest.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* Üksuste eest ei pea ülalpidamiskulu maksma.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "* Tõenäosus kodusõjaks pealinna kaotamisel on %d%%.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8551,23 +8600,23 @@ msgstr ""
 "sul on %d linna.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr "Maksimaalne teaduse, maksude või hüvede määr on  %d%%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "Piiramata suurusega teaduse/maksude/hüvede määr.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8578,7 +8627,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8586,7 +8635,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8595,15 +8644,15 @@ msgstr ""
 "* Kasvada saab ka pidustuste korraldamise abil. Su linna suurus peab olema "
 "vähemalt %d, et sel viisil kasvada.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Su üksusi ei saa ära osta.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Su linnu ei saa mässule õhutada.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8611,15 +8660,15 @@ msgstr ""
 "* Valitsus langeb anarhiasse, kui mõnes linnas on rahutused kauem, kui kaks "
 "käiku järjest.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Omab senatit, mis võib ära hoida sõja kuulutamise.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr "* Lubab partisanidel tegutsema hakata, kui linnad vallutatakse.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
@@ -8627,25 +8676,25 @@ msgstr ""
 "* Ehitised, mis muidu annaks boonuseid õnnetu meeleolu vastu, toodavad "
 "hoopis raha.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* Ei maksa fanaatikute ülalpidamiskulusid.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* Pole õnnetuid kodanikke.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* Veteran-%s üksused.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Veteranid.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8653,7 +8702,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8661,37 +8710,37 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, fuzzy, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* %s tootmisel läheb väga suur osa toodangust raisku.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* %s tootmisel läheb väga suur osa toodangust raisku.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* %s tootmisel läheb veidike toodangust raisku.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* %s tootmisel läheb väike kogus toodangust raisku.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, fuzzy, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
@@ -8699,38 +8748,38 @@ msgstr ""
 "pealinnast.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 "* %s tootmisel kasvab raisku minev hulk võrreldes kaugusega pealinnast.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 "* %s tootmisel kasvab raisku minev hulk aeglaselt võrreldes kaugusega "
 "pealinnast.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Võimaldab ehitada ehitise %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d õnnetus"
@@ -9155,16 +9204,16 @@ msgstr "Serveri oskused: %s"
 msgid "Start of turn %d"
 msgstr "Käigu %d algus"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "Tehisintellekti režiim on nüüd %s"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "SEES"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "VÄLJAS"
 
@@ -9195,13 +9244,13 @@ msgstr "?Player:Nimi"
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Lipp"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9215,7 +9264,7 @@ msgstr "Piir"
 msgid "Score"
 msgstr "Skoor"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Meeskond"
 
@@ -9248,36 +9297,36 @@ msgstr "?Player_dlg:Jõudeolekus"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Sa ei saa müüa ehitisi."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Müüsid %d %s %d raha eest."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Ühtegi %s ei saanud müüa"
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Sa ei saa üksusi laiali saata."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s-t ei saa laiali saata.."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Saadeti laiali %d üksust %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Ãœhtegi %s ei saanud lahti lasta."
@@ -9586,64 +9635,69 @@ msgstr "Kulda: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Maksud:%d Hüved:%d Teadus:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Liigub: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Liigub: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Klõpsa rohkema nägemiseks)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s kodanikku"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Käik: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Kulda: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Kogusissetulek: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Maksumäärad: Kuld:%d%% Hüved:%d%% Teadus:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Uuritakse %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Tõenäosus globaalseks soojenemiseks: %d%% (%+d%%/käik)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Tõenäosus tuumatalveks: %d%% (%+d%%/käik)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Riigikord: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9651,55 +9705,55 @@ msgstr[0] "%d üksus"
 msgstr[1] "%d üksust"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Käike sihtmärgini: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Käike sihtmärgini: %d kuni %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d üksus valitud"
 msgstr[1] "%d üksust valitud"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Ühtegi üksust pole valitud."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Pole ühtki uuendamist vajavat üksust!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Neid üksusi ei saa uuendada."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9714,72 +9768,72 @@ msgstr[1] ""
 "Kas uuendada %d üksust %d raha eest?\n"
 "Meil on hetkel %d raha."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Näitab tehnoloogia avastamise hetkeseisu."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr ""
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Näitab globaalse soojenemise arengut:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Reostuse määr: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Tõenäosus katastroofiliseks soojenemiseks igal käigul: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Näitab tuumatalve arengut:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Tuumajäätmete määr: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Tõenäosus katastroofiliseks talveks igal käigul: %d"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Näitab su praegust valitsus:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Rahvaarv:      %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9787,96 +9841,96 @@ msgstr[0] "Mass:            %5d tonn"
 msgstr[1] "Mass:            %5d tonni"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Reisu aeg:     %5.1f aastat"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Reisu aeg:     Ei tea    "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Edu võimalus: %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Saabumise aasta %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:väljas"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "%02dd %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr ""
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s %s-te hulgast"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Pealtvaataja: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Ehitised: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Puudub."
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Ilmaimed: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr ""
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9884,7 +9938,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9892,16 +9946,16 @@ msgstr[0] "%d uut õnnetut kodanikku."
 msgstr[1] "%d uut õnnetut kodanikku."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Kehtib sõjaolukord ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "maksimumi pole, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9909,20 +9963,20 @@ msgstr[0] "%d üksust maks, "
 msgstr[1] "%d üksust maks, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d üksuse kohta). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr ""
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Sõjaväeüksusi ei mõjuta meeleolu."
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Hüved: kokku %d."
@@ -9968,12 +10022,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr ""
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr ""
 
@@ -10027,11 +10081,13 @@ msgid "Ooops..."
 msgstr "Oih..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Sellele üksusele ei saa pistist anda!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10048,6 +10104,7 @@ msgstr "Paku vaenlasele pistist"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10088,6 +10145,7 @@ msgstr "_Leiutised:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr ""
 
@@ -10112,12 +10170,13 @@ msgstr "_Ehitised:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Linna toodang"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Sa ei saa algatada ülestõusu linnas %s."
@@ -10129,6 +10188,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10145,6 +10205,7 @@ msgstr "Alusta mäss!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10154,6 +10215,7 @@ msgstr ""
 "Meil on %d raha."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10223,10 +10285,12 @@ msgid "Subvert Enemy Unit"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr "Diplomaat ootab sinu käsklusi"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr "Spioon ootab sinu käsklusi"
 
@@ -10326,7 +10390,7 @@ msgstr "Reostus:"
 msgid "_Overview"
 msgstr "_Linna ülevaade"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10351,11 +10415,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d käiku"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Osta"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr "_Toodang"
 
@@ -10474,7 +10538,7 @@ msgstr "Toetatud väed %d"
 msgid "Present units %d"
 msgstr "Kohaleolevad väed %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Keskele"
 
@@ -10563,31 +10627,31 @@ msgstr "Muuda linna nimi"
 msgid "What should we rename the city to?"
 msgstr "Millise nime peaksime linnale panema ?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "Vaheta"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Vali"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr "_Näita"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10597,12 +10661,12 @@ msgstr "_Näita"
 msgid "Cities"
 msgstr "Linnad"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr "_Vaata"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10611,85 +10675,90 @@ msgstr "_Vaata"
 msgid "Improvements"
 msgstr "Ehitised"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Ilmaimed"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Kõik linnad"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Linnu pole"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Ehitavad üksusi"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Ehitavad ehitisi"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Ehitavad imesid"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Ehitavad seda üksust"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Ehitavad seda ehitist"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Ehitavad seda imet"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Rannikulinnad"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Samal saarel"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Toetatud üksused"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Kohalolevad väed"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Ehitised Linnas"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Ilmaimed linnas"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Saadaolevad väed"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Saadaolevad ehitised"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Saadaolevad ilmaimed"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Kulud kokku: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10754,123 +10823,123 @@ msgstr "Milline oleks sobiv nimi uuele mallile?"
 msgid "Remove this preset?"
 msgstr "Eemalda see mall?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "_Mine sinna"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr "Vaata _linna"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Ãœtlesid, et tahad revolutsiooni?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revolutsioon!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Mida lõhkuda"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Vali mille maha lõhkuda:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Ãœksus"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Nimi"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Ãœksuse valimine"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "Pane kõik valmis"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Rahvused:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Mis rahvusest sa oled?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Vali rahvus"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
 msgstr "_Juhuslik rahvus"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Vali rahvus"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Omadused"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Juht:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Naine"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Mees"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
 msgstr "Linnade _stiil:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "L_egend"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Sa pead valima endale soo"
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Sa pead valima linnade stiili"
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Sa pead sisestama korraliku nime."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Uuenda üksust!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11121,60 +11190,66 @@ msgstr ""
 msgid "Not _ready"
 msgstr "Pole _valmis"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Valmis"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Alusta"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Vali see mängija"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Vali _Rahvus"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_Vaatle"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr "Ära _vaatle"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<tehismõistus>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<Algaja tehismõistus>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<Kerge tehismõistus>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<Normaalne tehismõistus>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<Raske tehismõistus>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Juhuslik"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Vaatleja"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Lahti ühenduund"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Ära välju veel, kogu maailm polegi sinu ideoloogiat täis."
 
@@ -12085,214 +12160,214 @@ msgstr "Ühendu _võrgumängu"
 msgid "Connect to Gaming _Zone"
 msgstr "Ãœhendu Gaming _Zone'sse"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Paroolid ei kattu, sisesta parool."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Serveri nimi"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versioon"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Staatus"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Mängijaid"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Kommentaar"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "_Kohtvõrk"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Interneti _metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Host:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Port:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "K_asutajanimi:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "_Parool:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Kinnita _parool:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "_Ãœhendu"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Ãœhenduse nimi: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Mängija nimi: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Masin: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Mängija/ühenduse info"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s info"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Lülita mängija valmidust"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Vali rahvus"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Vaatle seda mängijat"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Vali see mängija"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Katkesta ühendus"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "Lülita tehismõistusele"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Eemalda mängija"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Anna käsutase info "
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "Anna käsutase ctrl"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "Lisa %s hulka"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr "_Mängijate arv (tehismõistus kaasa arvatud):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr "_Tehisintellekti tase:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
 msgstr "_Reeglistiku versioon:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Rohkem mängu_seadeid..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Salvesta"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Reiting"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Valmis"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Juht"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Vali salvestatud mäng laadimiseks"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Vali salvestatud mäng _laadimiseks:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "Lehitse..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Vali stsenaarium"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Vali _stsenaarium:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Tüüp"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Vali _rahvus, mida mängida:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Vali koht salvestamiseks"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Salvesta mäng"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "_Salvestatud mängud:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Salvestise _failinimi:"
 
@@ -12327,7 +12402,7 @@ msgstr "?Building: Nimi"
 msgid "Count"
 msgstr "Arv"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12567,28 +12642,28 @@ msgstr "Tööde nimekirjad"
 msgid "Edit Global _Worklists"
 msgstr "_Muuda üldiseid tööde nimekirju"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Käike"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "_Võimalikud tööd:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Näita _tuleviku sihtmärke:"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "_Tööde nimekiri:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "_Lisa tööde nimekiri"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "_Muuda tootmist"
 
@@ -12882,8 +12957,8 @@ msgid "City shrinks: %d %s"
 msgstr "Linn kahaneb: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12985,11 +13060,11 @@ msgstr "Garnisoni raport"
 msgid "Maintenance Report"
 msgstr "Hooldusraport"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "tööde nimekiri"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -13410,21 +13485,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr "  -t,  --theme TEEMA\tKasuta kasutajaliidese teemat TEEMA\n"
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr "Teen ekraanipildi fc_%05d.bmp"
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Kasutan videoväljundit %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Initsialiseerin klienti"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Ootan mängu algust"
 
@@ -14721,7 +14796,7 @@ msgstr "Linna stiil"
 msgid "Unit Selection"
 msgstr "Ãœksuse valik"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "POLE"
 
diff --git a/po/fa.gmo b/po/fa.gmo
index 947615c..5a49c35 100644
Binary files a/po/fa.gmo and b/po/fa.gmo differ
diff --git a/po/fa.po b/po/fa.po
index f47237e..d1d0d16 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-08-11 02:17+0300\n"
 "Last-Translator: Arman Ordookhani <arman_o71 at Yahoo.com>\n"
 "Language-Team: Farsi(Persian)\n"
@@ -50,22 +50,22 @@ msgstr "رفاه"
 msgid "Science"
 msgstr "علم"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "س"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "Ø´"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "Ù…"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "س"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "Ø´"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -485,81 +485,81 @@ msgstr "پیام‌های اتصال/قطع اتصال"
 msgid "AI Debug messages"
 msgstr "پیام‌های اشکال‌زدایی هوش‌مصنوعی"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "قاتل"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "در حال جنگ"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "دشمن"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "بدون سود"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "مضطرب"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "طبیعی"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "احترام گذار"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "سودمند"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "مجذوب"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "تحسین برانگیز"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "محترم"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr ""
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "جنگ"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "آتش بس"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "صلح"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "اتحاد"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "ملاقات نشده"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "تیم"
 
@@ -605,13 +605,13 @@ msgstr "%s مهره"
 msgid "Size %d"
 msgstr "اندازه %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "تکنولوژی آینده %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -623,65 +623,65 @@ msgstr "تکنولوژی آینده %d"
 msgid "None"
 msgstr "هیچ"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "تکنولوژی آینده."
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(ناشناس)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "جاده"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "آبیاری"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "راه‌آهن"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "معدن"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "آلودگی"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "کلبه"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "دژ"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "رود"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "مزرعه"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "پایگاه هوایی"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "غبار اتمی"
 
@@ -791,11 +791,11 @@ msgstr "بمب اتم"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " Ùˆ "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "، "
 
@@ -949,79 +949,79 @@ msgid_plural " (total %d repeats)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr ""
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr ""
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d ق‌م"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d ب‌م"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr ""
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr ""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr ""
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr ""
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr ""
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr ""
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr ""
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "خالی"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr ""
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr ""
 
@@ -1050,108 +1050,108 @@ msgstr "%s ساخت %s در %s را شروع کردند."
 msgid "%s is selling %s (not needed) for %d."
 msgstr ""
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (ه‌م)* %s ابتدا اتحاد با %s، را برهم زنید."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (ه‌م)* %s اجازه بده ابتدا دشمنی را کنار بگذاریم."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr ""
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (ه‌م)* %s به اتحاد ما خوش آمدید!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (ه‌م)* بله، %s شاید همیشه متحد بمانیم."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (ه‌م)* بله، اکنون صلح می‌کنیم!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (ه‌م)* موافقم %s. دشمنی نداریم"
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr ""
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (ه‌م)* در وقتی... دیگر صلح کنید"
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
 "away with your crimes?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1162,14 +1162,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1182,7 +1182,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1193,13 +1193,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1210,12 +1210,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1226,7 +1226,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1237,47 +1237,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
 "intentions, and I will have no more of our alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr ""
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr "*%s (ه‌م)* شرمنده، دید مشترک با شما دیگر بی‌خطر نیست."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
 "our enemy, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
 "s. Why do I need to remind you of your promises?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1285,26 +1285,26 @@ msgid ""
 "more!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
 "cessation of hostilities?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1312,131 +1312,136 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "همه تنظیمات"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr ""
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr ""
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr ""
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr ""
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr ""
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr ""
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr ""
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr ""
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr ""
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr ""
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr ""
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
 msgstr ""
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr ""
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr ""
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr ""
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2153,44 +2158,42 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr ""
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr ""
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr ""
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr ""
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr ""
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2198,30 +2201,30 @@ msgid ""
 "to achieve team victory with averaged individual scores."
 msgstr ""
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr ""
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr ""
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr ""
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr ""
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2230,19 +2233,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr ""
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr ""
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr ""
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2250,33 +2253,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr ""
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr ""
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr ""
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr ""
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr ""
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2286,15 +2289,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr ""
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr ""
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2304,60 +2307,60 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr ""
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr ""
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr ""
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr ""
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
 msgstr ""
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
 msgstr ""
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr ""
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2365,17 +2368,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
 msgstr ""
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr ""
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2383,17 +2386,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
 msgstr ""
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr ""
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2401,17 +2404,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
 msgstr ""
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr ""
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2419,17 +2422,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
 msgstr ""
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr ""
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2438,7 +2441,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2447,11 +2450,11 @@ msgid ""
 "cmdlevel <level> <connection-name>"
 msgstr ""
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr ""
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2473,20 +2476,20 @@ msgid ""
 "now takes connection names, not player names."
 msgstr ""
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr ""
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr ""
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2494,56 +2497,56 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "پایان بازی"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr ""
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr ""
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr ""
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr ""
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
 msgstr ""
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr ""
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2554,45 +2557,45 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
 msgstr ""
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr ""
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr ""
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr ""
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr ""
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr ""
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr ""
 
@@ -3097,25 +3100,34 @@ msgstr ""
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr ""
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "سال: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr ""
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3158,44 +3170,44 @@ msgstr ""
 msgid "There is no player nor connection by the name %s."
 msgstr ""
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr ""
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr ""
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr ""
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr ""
@@ -3254,52 +3266,52 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr "شما باید یک حکومت را از منو حکومت انتخاب کنید."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "درجه مالیات از حداکثر حد %s بیشتر شد. تنظیم شد."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "درجه علم از حداکثر حد %s بیشتر شد. تنظیم شد."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "درجه رفاه از حداکثر حد %s بیشتر شد. تنظیم شد."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr ""
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "وضعیت دیپلماتیک بین %s و %s %s است."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3307,67 +3319,67 @@ msgid ""
 msgstr ""
 "%s قرارداد دیپلماتیک را لغو کرد! وضعیت دیپلماتیک بین %s و %s اکنون %s است."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr "%s به متحد شما %s حمله کرد! شما اتحاد خود را با او لغو کردید."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr ""
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "بازیکن %s حذف می‌شود."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "شما از بازی حذف شدید!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s از بازی حذف شد."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "شما با %s که %s بر آن حکومت می‌کند رابطه برقرار کردید."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr ""
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr ""
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr ""
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr ""
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3600,19 +3612,19 @@ msgstr ""
 msgid "th"
 msgstr ""
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr ""
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr ""
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%s %s (%s("
@@ -3623,11 +3635,11 @@ msgstr "%s %s (%s("
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr ""
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr ""
 
@@ -3639,7 +3651,7 @@ msgid ""
 "risk."
 msgstr ""
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
 
@@ -3657,13 +3669,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3698,7 +3710,7 @@ msgstr "داخلی"
 msgid "Networking"
 msgstr "شبکه‌ای"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "همه"
@@ -3719,56 +3731,60 @@ msgstr ""
 msgid "Changed"
 msgstr "تغییرکرد"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
 msgstr ""
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
 msgstr ""
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr ""
 
-#: server/settings.c:236
+#: server/settings.c:181
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr ""
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "اندازه نقشه (در هزار خانه)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
 "  size = 20 is a huge map of 20,000 tiles"
 msgstr ""
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr ""
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -3804,11 +3820,11 @@ msgid ""
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 msgstr ""
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr ""
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -3820,11 +3836,11 @@ msgid ""
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr ""
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr ""
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -3837,35 +3853,35 @@ msgid ""
 "of start pos and to the number of players"
 msgstr ""
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr ""
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr ""
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr ""
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr ""
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr ""
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr ""
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -3883,113 +3899,113 @@ msgid ""
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr ""
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr ""
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr ""
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
 msgstr ""
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr ""
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
 msgstr ""
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr ""
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
 "usually only of interest while debugging the game."
 msgstr ""
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr ""
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr ""
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr ""
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
 msgstr ""
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr ""
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
 msgstr ""
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr ""
 
-#: server/settings.c:419
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr ""
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
 "try to connect will be rejected."
 msgstr ""
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr ""
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
 msgstr ""
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr ""
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4005,27 +4021,27 @@ msgid ""
 "    A   = Strong attack unit (eg., Catapult)\n"
 msgstr ""
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr ""
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr ""
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr ""
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4033,33 +4049,33 @@ msgid ""
 "next techs really expensive."
 msgstr ""
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
 "determined by the ruleset or other game settings."
 msgstr ""
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr ""
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
 "does not apply when you have just gained a technology this turn."
 msgstr ""
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr ""
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4067,22 +4083,22 @@ msgid ""
 "to gold transfers in diplomatic treaties."
 msgstr ""
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr ""
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
 "this is non-zero, you can end up with negative research points."
 msgstr ""
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr ""
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4091,43 +4107,43 @@ msgid ""
 "points."
 msgstr ""
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr ""
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
 "the size of the city."
 msgstr ""
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr ""
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
 "it has a Granary)."
 msgstr ""
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr ""
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4135,32 +4151,32 @@ msgid ""
 "also notradesize."
 msgstr ""
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr ""
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
 "notradesize and smaller than fulltradesize. See also fulltradesize."
 msgstr ""
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr ""
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
 msgstr ""
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr ""
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4168,11 +4184,11 @@ msgid ""
 "numbers of cities."
 msgstr ""
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr ""
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4180,31 +4196,31 @@ msgid ""
 "(default), the ruleset value will be used."
 msgstr ""
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr ""
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
 msgstr ""
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr ""
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr ""
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr ""
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4213,21 +4229,21 @@ msgid ""
 "\"occupying\" territory."
 msgstr ""
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr ""
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4237,32 +4253,32 @@ msgid ""
 "  8 = air"
 msgstr ""
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr ""
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
 "tiles or tiles within range of more than one nation's cities."
 msgstr ""
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr ""
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr ""
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4271,11 +4287,11 @@ msgid ""
 "4 = diplomacy is disabled for everyone."
 msgstr ""
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr ""
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4290,11 +4306,11 @@ msgid ""
 "another nations unless it is a default for their nation also."
 msgstr ""
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr ""
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4303,81 +4319,81 @@ msgid ""
 "4 = raging hordes, lots of barbarians"
 msgstr ""
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr ""
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr ""
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr ""
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
 msgstr ""
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr ""
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
 "cities or terrain changes in tiles not observed."
 msgstr ""
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr ""
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr ""
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr ""
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
 "civil wars are turned off altogether."
 msgstr ""
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr ""
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
 "players cannot meet unless they have an embassy."
 msgstr ""
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr ""
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4385,21 +4401,21 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr ""
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr ""
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr ""
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4433,122 +4449,124 @@ msgid ""
 "\n"
 msgstr ""
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr ""
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
 msgstr ""
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "سال پایان بازی"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr ""
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr ""
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr ""
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr ""
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
 "connections will be automatically disconnected eventually)."
 msgstr ""
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr ""
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
 "not wait at all."
 msgstr ""
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr ""
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr ""
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr ""
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr ""
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
 msgstr ""
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr ""
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
 msgstr ""
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr ""
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -4570,42 +4588,42 @@ msgid ""
 "The order of characters is not significant, but their capitalization is."
 msgstr ""
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "نوبت‌ها تا ذخیره اتوماتیک"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
 msgstr ""
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "میزان فشردگی فایل ذخیره"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
 "this server was not compiled to use zlib."
 msgstr ""
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "پیشوند فایل ذخیره"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
 msgstr ""
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr ""
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -4616,7 +4634,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr ""
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr ""
@@ -4745,102 +4763,102 @@ msgstr ""
 msgid "Game saved as %s"
 msgstr "بازی با نام %s ذخیره شد"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "بازی از قبل اجرا شده است."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "در حال شروع بازی"
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr ""
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr ""
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr ""
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr ""
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr ""
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr ""
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr ""
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr ""
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s حاکم %s، %s است."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr ""
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s به عنوان بازیکن هوش‌مصنوعی سطح %s اضافه شد."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "بازیکن %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s بر %s حکومت می‌کند."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr ""
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "بازی تمام شد..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr ""
 
@@ -4861,7 +4879,7 @@ msgstr ""
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5035,7 +5053,7 @@ msgstr ""
 msgid "Removed player %s from the game."
 msgstr ""
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5107,693 +5125,718 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr ""
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr ""
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr ""
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr ""
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr ""
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "تنظیم:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "توضیح:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "وضعیت: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "قابل تغییر"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "ثابت"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr ""
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr ""
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr ""
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr ""
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr ""
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr ""
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "بازیکن '%s' اکنون سطح هوش '%s' را دارد."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr ""
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "سطح هوش پیشفرض به '%s' تغییر یافت."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "این دستور فقط از Client قابل اجراست."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr ""
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr ""
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr ""
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr ""
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "همه تنظیمات"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr ""
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr ""
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr ""
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr ""
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "تنظیمات"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "توضیح"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr ""
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr ""
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr ""
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr ""
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr ""
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr ""
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr ""
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr ""
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr ""
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr ""
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr ""
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr ""
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr ""
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr ""
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr ""
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr ""
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr ""
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr ""
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "تنظیمات: %s به %d تغییر یافت."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr ""
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr ""
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "شما نمی‌توانید مهره‌ای از این ملت را تطمیع کنید."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr ""
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr ""
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr ""
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr ""
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr ""
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr ""
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s اکنون ناظر است"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
-msgstr ""
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
+msgstr "%s را از %s برداشت!"
 
-#: server/stdinhand.c:2965
+#: server/stdinhand.c:3024
 #, c-format
-msgid "There is no free player slot for %s"
+msgid "There is no free player slot for %s."
 msgstr ""
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr ""
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s اکنون %s را کنترل می‌کند(%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "بیگانه"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "ه‌م"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "انسان"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "زنده"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "مرده"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "شما به هیچ بازیکنی وصل نیستید."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr ""
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr ""
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr ""
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr ""
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr ""
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr ""
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr ""
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr ""
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr ""
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr ""
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr ""
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr ""
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr ""
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr ""
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr ""
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr ""
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr ""
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr ""
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+msgid "Not enough human players, game will not start."
+msgstr ""
+
+#: server/stdinhand.c:3888
+msgid "No players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 msgid "Not enough nations for all players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "همه‌ي بازیکنان آماده هستند؛ بازی را شروع می‌کنیم."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr ""
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr ""
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -5814,123 +5857,123 @@ msgid ""
 "  quit   -  to exit"
 msgstr ""
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr ""
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr ""
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr ""
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr ""
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr ""
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr ""
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr ""
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "لیست بازیکنان:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr ""
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "کاربر %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", مرده"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ""
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ""
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ""
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d اتصال:"
 msgstr[1] " %d اتصال:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr " %s از %s (سطح دسترسی %s)، اندازه بافر=%dکیلوبایت"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (حالت ناظر)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "لیست تیم‌ها:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr ""
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr ""
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr ""
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr ""
 
@@ -5997,17 +6040,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "تکنولوژی هدف %s است."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "شما %s را از %s دزدیدید."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%s %s را از شما دزدیدند!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%s %s را از %s دزدیده بود."
@@ -6514,20 +6557,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr ""
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr ""
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr ""
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr ""
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr ""
@@ -6613,120 +6656,121 @@ msgstr ""
 msgid "Cannot find audio file %s"
 msgstr ""
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "XXX/XXX XXX نوبت"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d طلا در نوبت"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d نوبت"
 msgstr[1] "%3d نوبت"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "هیج وقت"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/نوبت"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d نوبت"
 msgstr[1] "%s (%d) %d نوبت"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "منسوخ"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "ساخته شده"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "شگفتی عظیم"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "شگفتی‌های کوچک"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/نوبت"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr ""
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr ""
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr ""
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -6840,8 +6884,8 @@ msgid "Best defending units"
 msgstr "بهترین مهره برای دفاع"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7023,8 +7067,8 @@ msgstr "آلودگی"
 msgid "?cma:Governor"
 msgstr "حاکم"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7278,19 +7322,19 @@ msgid ""
 "%d times"
 msgstr ""
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "نوآموز"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "آسان"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "متوسط"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "سخت"
 
@@ -7298,31 +7342,31 @@ msgstr "سخت"
 msgid "experimental"
 msgstr "پیشرفته"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "شروع کردن سرور..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "نمی‌توان سورو را آغاز کرد."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr ""
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "نمی‌توان به سرور وصل شد."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr ""
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "ما کنترل سرور را داریم (سطح کنترل هک)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "نمی‌توان کنترل سرور را به دست گرفت، آنرا از بین می‌بریم."
 
@@ -7407,27 +7451,27 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "%s را مجاز می‌کند."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "%s را مجاز می‌کند(با %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " رودها"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr ""
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -7435,283 +7479,283 @@ msgid ""
 "\n"
 msgstr ""
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr ""
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* کشف %s باعث منسوخ شدن %s می‌شود.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* به همه بازیکنان با دانسته %s اجازه می‌دهد تا مهره‌های %s بسازند.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* %s را مجاز می‌کند(با %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* %s را مجاز می‌کند.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* ممکن نیست در شهر‌ها ساخته شود.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* هیچ وقت شهر خانه ندارد.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* از دست دادن این مهره باعث باختن بازی می‌شود!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* هر بازیکن فقط یکی از این نوع مهره دارد.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* برای ساختن نیاز به  %d نفر جمعیت دارد.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* می‌تواند در ساختن شگفتی کمک کند ( %d امتیاز کالا اضافه می‌کند).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* ممکن نیست منحل شود.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr "* می‌تواند منحل شود تا 50%% امتیاز ساخت را برگرداند. \n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* می‌تواند شهر جدید بسازد.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 "* می‌تواند %d جمعیت به شهرهایی که بیشتر از %d جمعیت ندارند، اضافه کند.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* می‌تواند جاده و خط‌آهن بسازد.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* می‌تواند روی زمین معدن بسازد.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* می‌تواند زمین را آبیاری کند.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* می‌تواند مزرعه بسازد.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* می‌تواند مزرعه بسازد (اگر %s را بدانید).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* می‌تواند مزرعه بسازد (اگر این‌ها را بدانید %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* می‌تواند دژ بسازد.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* می‌تواند دژ بسازد.(اگر %s را بدانید)\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* می‌تواند دژ بسازد(اگر این‌ها را بدانید: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* می‌تواند آلودگی را از زمین پاک کند.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* می‌تواند غبار اتمی را از زمین پاک کند\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* می‌تواند نوع خانه‌ها را تغییر دهد.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* می‌تواند پایگاه هوایی بسازد.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* می‌تواند تقویت شود تا 50%% قدرت دفاعش افزایش یابد.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* می‌تواند غارت کند تا زيرساخت خانه‌ها خراب كند.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* می‌تواند کارهای دیپلماتیک بکند به علاوه‌ی کارهای ویژه جاسوسی.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* می‌تواند فعالیت‌های دیپلماتیک انجام دهد.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* هیچ وقت یک جنگ دیپلمات به دیپلمات را نمی‌بازد.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* ممكن نيست تطميع شود.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* می‌تواند به مهره‌های هوایی دشمن حمله کند.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* نامرئی است به جز وقتی که در کنار یک شهر یا مهره دشمن است.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 "* فقط می‌تواند به مهره‌هایی که روی اقیانوس هستند حمله کند (حمله زمینی ندارد).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr ""
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr ""
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr ""
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr ""
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr ""
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* در پایان نوبتش حمله می‌کند.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* حمله این مهره باعث انفجار هسته‌ای می‌شود\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* هنگام حمله به شهر‌ها قدرت آتشش دوبرابر می‌شود.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* دیوار شهر بر آن اثری ندارد.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr ""
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* نوع خانه‌ها بر آن اثری ندارد (همه خانه‌ها مانند جاده است).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* محدوده کنترل بر آن اثری ندارد.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* یک مهره غیر نظامی (نمی‌تواند حمله کند; بدون قانون نظامی).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* هیچ وقت کارآزموده نمی‌شود.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* ممکن است در تمرین یا جنگ کارآزموده شود.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -7720,12 +7764,12 @@ msgstr ""
 "در پایان نوبتش باید در یک شهر یا در کنار زمین باشد وگرنه ریسک 50%% گمشدندر "
 "دریا را دارد.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* کشف %s ریسک را به  25%% کم می‌کند.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s ریسک را به  12%% کم می‌کند.\n"
@@ -7734,27 +7778,27 @@ msgstr "* %s ریسک را به  12%% کم می‌کند.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " یا "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "، "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* مهره باید در یک شهر یا در یک %s بعد از %d نوبت باشد.\n"
 msgstr[1] "* مهره باید در یک شهر یا در یک %s بعد از %d نوبت باشد.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "اگر مایلید  %s را شروع کنید  %d امتیاز نیاز دارید."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -7763,88 +7807,88 @@ msgstr ""
 "برای رسیدن به %s ما نیاز به %d تکنولوژی دیگر داریم. این پروژه %d امتیاز لازم "
 "دارد."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr ""
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr "* اولین بازیکنی که %s را بگیرد آن لحظه یک تکنولوژی می‌گیرد.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* شانس از دست دادن قایق‌ها را در دریای آزاد 25%% کاهش می‌دهد.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* شانس از دست دادن قایق‌ها را در دریای آزاد 12%% کاهش می‌دهد.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* آلودگی حاصل از جمعیت را زیاد می‌کند.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* به %s اجازه ساخت جاده را روی رودخانه می‌دهد.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* به %s اجازه می‌دهد تا دژ بسازد.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* به %s اجازه می‌دهد پایگاه هوایی بسازد.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* به %s اجازه می‌دهد تا جاده‌ها را به خط‌آهن تبدیل کند.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* به %s اجازه می‌دهد تا زمین‌های آبیاری را به مزرعه تبدیل کند.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* در این خانه آلودگی تولید نمی‌شود."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* نمی‌توان روی این خانه شهر ساخت."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr ""
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr ""
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr ""
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -7855,7 +7899,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7863,48 +7907,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -7912,23 +7956,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -7939,7 +7983,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -7947,60 +7991,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr ""
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr ""
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8008,7 +8052,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8016,71 +8060,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr ""
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d ناراحت"
@@ -8472,16 +8516,16 @@ msgstr ""
 msgid "Start of turn %d"
 msgstr "شروع نوبت %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr ""
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "روشن"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "خاموش"
 
@@ -8512,13 +8556,13 @@ msgstr "نام"
 msgid "Username"
 msgstr "نام کاربری"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "پرچم"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -8532,7 +8576,7 @@ msgstr "محدوده"
 msgid "Score"
 msgstr "امتیاز"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "تیم"
 
@@ -8565,36 +8609,36 @@ msgstr ""
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr ""
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr ""
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr ""
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr ""
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr ""
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr ""
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr ""
@@ -8902,64 +8946,69 @@ msgstr "طلا: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "مالیات: %d رفاه: %d علم: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "متحرک: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "متحرک: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(برای اطلاعات بیشتر کلیک کنید)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "جمعیت %s"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "نوبت: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "طلا: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "درآمد خالص: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "درجه‌ها: طلا: %d%% رفاه %d%% علم %d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "پژوهش %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "احتمال گرمای عمومی: %d%% (%+d%%/نوبت)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "احتمال زمستان اتمی: %d%% (%+d%%/نوبت)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "حکومت: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -8967,55 +9016,55 @@ msgstr[0] "%d مهره"
 msgstr[1] "%d مهره"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "%d نوبت تا هدف"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "نوبت تا هدف: %d تا %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d مهره انتخاب شده"
 msgstr[1] "%d مهره انتخاب شده"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "هیچ مهره‌ای انتخاب نشده"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr ""
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr ""
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9030,72 +9079,72 @@ msgstr[1] ""
 "%d مهره با %d طلا ترفیع بشود؟\n"
 "خزانه %d طلا دارد."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "پیشرفت شما را در تکنولوژی حاضر نسان می‌دهد."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "بدون هدف پژوهش."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "جریان گرمای جهانی را نشان می‌دهد:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "درجه آلودگی: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "جریان زمستان اتمی را نشان می‌دهد:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "درجه غبار اتمی: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "حکومت فعلی شما را نشان می‌دهد:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "جمعیت:             %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "پشتیبانی :         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "انرژی :          %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9103,96 +9152,96 @@ msgstr[0] "جرم:           %5d تن"
 msgstr[1] "جرم:           %5d تن"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "زمان مسافرت:     %5.1f سال"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "زمان مسافر ت:      نامشخص"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "سال رسیدن           : %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "خاموش"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "%02d"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "%02dد %02dث"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "%02dس %02dد"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dر %02dس"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "بالاتر از حد"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d م‌ث"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s از %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "ناظر: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "ساختمان‌ها: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "هیچ. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "?clistend:."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "شگفتی‌ها: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "شهرها: مجموع %d، %d شهر بیش از حد %d شهر در آستانه."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9200,7 +9249,7 @@ msgstr[0] "%d قبل از جزا با "
 msgstr[1] "%d قبل از جزا با "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9208,16 +9257,16 @@ msgstr[0] "%d شهر ناراضی اضافه."
 msgstr[1] "%d شهر ناراضی اضافه."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr ""
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr ""
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9225,20 +9274,20 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr ""
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr ""
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr ""
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "رفاه: مجموعا %d."
@@ -9279,12 +9328,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "هیچ"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "سفارشی"
 
@@ -9338,11 +9387,13 @@ msgid "Ooops..."
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "این مهره تطمیع نمی‌شود!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -9359,6 +9410,7 @@ msgstr "تطمیع مهره حریف"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -9399,6 +9451,7 @@ msgstr "تکنولوژی‌ها"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "به صلاحدید جاسوس"
 
@@ -9423,12 +9476,13 @@ msgstr "اصلاحات:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "محصول شهر"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "شما نمی‌توانید در %s انقلاب کرد."
@@ -9440,6 +9494,7 @@ msgstr "شهر نمی‌تواند انقلاب کند!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -9456,6 +9511,7 @@ msgstr "انقلاب کردن!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -9465,6 +9521,7 @@ msgstr ""
 "خزانه %d طلا دارد."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -9534,10 +9591,12 @@ msgid "Subvert Enemy Unit"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr ""
 
@@ -9637,7 +9696,7 @@ msgstr "آلودگی:"
 msgid "_Overview"
 msgstr "نمای‌کلی"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -9662,11 +9721,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d نوبت"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "خرید"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "محصول"
@@ -9786,7 +9845,7 @@ msgstr "پشتیبانی شده %d"
 msgid "Present units %d"
 msgstr "مهره‌های حاضر %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "تمرکز"
 
@@ -9875,32 +9934,32 @@ msgstr "تغییر نام شهر"
 msgid "What should we rename the city to?"
 msgstr "نام شهر را به چه تغییر دهیم؟"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "تغییر"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "در ابتدا اضافه کن"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "برای بعد اضافه کن"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "در آخر اضافه کن"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "انتخاب"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "نشان بده"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -9910,13 +9969,13 @@ msgstr "نشان بده"
 msgid "Cities"
 msgstr "شهرها"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "باز کردن"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -9925,85 +9984,90 @@ msgstr "باز کردن"
 msgid "Improvements"
 msgstr "اصلاحات"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "شگفتی‌ها"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "همه شهرها"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "هیچ شهری"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "انتخاب معکوس"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "ساختمان"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "ساخت اصلاحات"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "ساخت شگفتی"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "ساخت مهره"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "ساخت اصلاحات"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "ساخت شگفتی"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "شهر ساحلی"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "جزیره یکسان"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "مهره‌های پشتیبانی شده"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "مهره‌های حاضر"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "اصلاحات در شهر"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "شگفتی‌ها در شهرها"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "مهره‌های موجود"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "اصلاحات موجود"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "شگفتی‌های موجود"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "قیمت کل: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10065,126 +10129,126 @@ msgstr ""
 msgid "Remove this preset?"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "برو به مکان"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "باز کردن"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "آیا می‌خواهید انقلاب کنید؟"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "انقلاب!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "چه چیز را غارت کند"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "چیزی را که می‌خواهید غارت کنید، انتخاب کنید:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "مهره"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "نام"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "انتخاب مهره"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "آمادگی همه"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "نگهبانی"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "ملیت ها"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "چه ملیتی می‌خواهید باشید؟"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "انتخاب ملیت"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "ملیت تصادفی"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "یک ملیت انتخاب کنید"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "خصوصیات"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "فرمانده:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "مؤنث"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "مذکر"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "سبک شهرها:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "داستان"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "شما باید یک جنسیت را انتخاب کنید."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "شما باید سبک شهرها را انتخاب کنید."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "شما باید یک نام مجاز بنویسید."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "ترفیع مهره!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -10431,61 +10495,67 @@ msgstr ""
 msgid "Not _ready"
 msgstr "نا آماده"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "آماده"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "شروع"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "انتخاب این بازیکن"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "انتخاب ملیت"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "ناظر"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "نا ناظر"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<ه‌م>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<ه‌م نوآموز>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<ه‌م آسان>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<ه‌م متوسط>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<ه‌م سخت>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "تصادفی"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "ناظر"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "جدا شده"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "آیا مطمئنید که می‌خواهید خارج شود؟"
 
@@ -11396,217 +11466,217 @@ msgstr "وصل شدن به بازی شبکه"
 msgid "Connect to Gaming _Zone"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "رمز عبور مطابقت نمی‌کند.رمز را وارد کنید."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "نام سرور"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "پرت"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "نسخه"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "وضعیت"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "بازیکنان"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "توضیح"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "شبکه محلی"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "اینترنت"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "میزبان:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "پرت:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "نام کاربری:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "رمز:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "تکرار رمز:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "اتصال"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "نام اتصال: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "نام بازیکن: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "میزبان: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "اطلاعات بازیکن/اتصال"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "اطلاعات %s"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "تغییر آمادگی بازیکن"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "انتخاب ملیت"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "ناظر کردن این بازیکن"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "انتخاب این بازیکن"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "بریدن اتصال"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "تغییر هوش‌مصنوعی بازیکن"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "برداشتن بازیکن"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "دادن دسترسی اطلاعات"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "دادن دسترسی کنترل"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "گذاشتن به %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "تعداد بازیکنان (با هوش‌مصنوعی)"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "سطح بازی هوش‌مصنوعی:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "مجموعه قوانین"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "تنظیمات دیگر..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "رکورد"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "درجه"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "آماده"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "رهبر"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "بازی ذخیره شده را برای بارگذاری انتخاب کنید"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "بازی ذخیره شده را برای بارگذاری انتخاب کنید"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "گشتن..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "یک سناریو انتخاب کنید"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "یک سناریو انتخاب کنید:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "نوع"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "یک ملت را برای بازی انتخاب کنید:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "محل ذخیره را انتخاب کنید"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "ذخیره بازی"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "بازی‌های ذخیره شده:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "نام فایل ذخیره:"
 
@@ -11642,7 +11712,7 @@ msgstr "نام"
 msgid "Count"
 msgstr "تعداد"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -11885,28 +11955,28 @@ msgstr "لیست کارها:"
 msgid "Edit Global _Worklists"
 msgstr "ویرایش لیست کارهای عمومی"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "نوبت‌ها"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "منبع کارها:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "نشان دادن اهداف آینده"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "لیست کارها:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "اضافه کردن لیست کار عمومی"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "تغییر محصول"
 
@@ -12210,8 +12280,8 @@ msgid "City shrinks: %d %s"
 msgstr "کوچک شدن شهر : %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12315,11 +12385,11 @@ msgstr ""
 msgid "Maintenance Report"
 msgstr ""
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "لیست‌کار"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -12736,21 +12806,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -14024,7 +14094,7 @@ msgstr "سبک شهرها:"
 msgid "Unit Selection"
 msgstr ""
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "هیچ"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index 989fae4..8044da6 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 1e219bf..b345ddc 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,13 +5,15 @@
 # Timo Jyrinki <timo.jyrinki at iki.fi> & helpers.
 # This translation is covered by the GNU General Public License Version 2.
 #
+# Prioritizing stable branch for translations; merge to trunk when feeling
+# like it. On consistency todo list: klikkaa -> napsauta cleanup.
 msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
-"PO-Revision-Date: 2008-04-05 20:58+0300\n"
-"Last-Translator: Timo Jyrinki <timo.jyrinki at iki.fi>\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
+"PO-Revision-Date: 2008-10-29 15:58+0200\n"
+"Last-Translator: Sini Ruohomaa <sini.ruohomaa at iki.fi>\n"
 "Language-Team: Finnish <laatu at lokalisointi.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -50,22 +52,22 @@ msgstr "Luksus"
 msgid "Science"
 msgstr "Tiede"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?rakennettu:R"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?ihme:i"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?vanhentunut:v"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?rakennettu:R"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?ihme:i"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -188,16 +190,15 @@ msgstr "Sivilisaatio: Saastetta"
 
 #: common/events.c:67
 msgid "Civ: Revolt Ended"
-msgstr ""
+msgstr "Sivilisaatio: Vallankumous päättynyt"
 
 #: common/events.c:68
 msgid "Civ: Revolt Started"
-msgstr ""
+msgstr "Sivilisaatio: Vallankumous alkanut"
 
 #: common/events.c:69
-#, fuzzy
 msgid "Civ: Spaceship Events"
-msgstr "Avaruusalus"
+msgstr "Sivilisaatio: Uutisia avaruusaluksesta"
 
 #: common/events.c:70
 msgid "Diplomat Action: Bribe"
@@ -348,136 +349,120 @@ msgid "Hut: Unit Spared by Barbarians"
 msgstr ""
 
 #: common/events.c:107
-#, fuzzy
 msgid "Improvement: Bought"
-msgstr "Rakennushanke"
+msgstr "Rakennushanke: Ostettu"
 
 #: common/events.c:108
-#, fuzzy
 msgid "Improvement: Built"
-msgstr "Rakennushanke"
+msgstr "Rakennushanke: Rakennettu"
 
 #: common/events.c:109
 msgid "Improvement: Forced to Sell"
-msgstr ""
+msgstr "Rakennushanke: Pakkomyyty"
 
 #: common/events.c:110
 msgid "Improvement: New Improvement Selected"
-msgstr ""
+msgstr "Rakennushanke: Uusi rakennushanke valittu"
 
 #: common/events.c:111
-#, fuzzy
 msgid "Improvement: Sold"
-msgstr "Rakennushanke"
+msgstr "Rakennushanke: Myyty"
 
 #: common/events.c:112
 msgid "Tech: Learned From Great Library"
-msgstr ""
+msgstr "Teknologia: Opittu Aleksandrian kirjastosta"
 
 #: common/events.c:113
 msgid "Tech: Learned New Tech"
-msgstr ""
+msgstr "Teknologia: Uusi teknologia opittu"
 
 #: common/events.c:114
 msgid "Treaty: Alliance"
-msgstr ""
+msgstr "Sopimus: Liittouma"
 
 #: common/events.c:115
 msgid "Treaty: Broken"
-msgstr ""
+msgstr "Sopimus: Rikottu"
 
 #: common/events.c:116
-#, fuzzy
 msgid "Treaty: Cease-fire"
-msgstr "Ihme"
+msgstr "Sopimus: Tulitauko"
 
 #: common/events.c:117
-#, fuzzy
 msgid "Treaty: Peace"
-msgstr "Ihme"
+msgstr "Sopimus: Rauha"
 
 #: common/events.c:118
-#, fuzzy
 msgid "Treaty: Shared Vision"
-msgstr "Jaettu näkymä"
+msgstr "Sopimus: Jaettu näkymä"
 
 #: common/events.c:119
 msgid "Unit: Attack Failed"
-msgstr ""
+msgstr "Yksikkö: Hyökkäys epäonnistui"
 
 #: common/events.c:120
 msgid "Unit: Attack Succeeded"
-msgstr ""
+msgstr "Yksikkö: Hyökkäys onnistui"
 
 #: common/events.c:121
-#, fuzzy
 msgid "Unit: Bought"
-msgstr "Yksiköt: "
+msgstr "Yksikkö: Ostettu"
 
 #: common/events.c:122
-#, fuzzy
 msgid "Unit: Built"
-msgstr "Yksikköluettelo"
+msgstr "Yksikkö: Rakennettu"
 
 #: common/events.c:123
 msgid "Unit: Defender Destroyed"
-msgstr ""
+msgstr "Yksikkö: Puolustaja tuhoutui"
 
 #: common/events.c:124
 msgid "Unit: Defender Survived"
-msgstr ""
+msgstr "Yksikkö: Puolustaja selviytyi"
 
 #: common/events.c:125
 msgid "Unit: Promoted to Veteran"
-msgstr ""
+msgstr "Yksikkö: Korotettu konkariksi"
 
 #: common/events.c:126
-#, fuzzy
 msgid "Unit: Production Upgraded"
-msgstr "Tuotantosivu"
+msgstr "Yksikkö: Tuotanto uudenaikaistettu"
 
 #: common/events.c:127
-#, fuzzy
 msgid "Unit: Relocated"
-msgstr "Valitse yksikkö"
+msgstr "Yksikkö: Uudelleensijoitettu"
 
 #: common/events.c:128
 msgid "Unit: Orders / goto events"
-msgstr ""
+msgstr "Yksikkö: Uutisia ohjeiden seurannasta"
 
 #: common/events.c:129
-#, fuzzy
 msgid "Wonder: Finished"
-msgstr "Kaupungin ihmeet"
+msgstr "Ihme: Valmistunut"
 
 #: common/events.c:130
-#, fuzzy
 msgid "Wonder: Made Obsolete"
-msgstr "Ajanmukaista vanhentuneet yksiköt"
+msgstr "Ihme: Vanhentunut"
 
 #: common/events.c:131
-#, fuzzy
 msgid "Wonder: Started"
-msgstr "Ihmeet: "
+msgstr "Ihme: Valmistelu aloitettu"
 
 #: common/events.c:132
-#, fuzzy
 msgid "Wonder: Stopped"
-msgstr "Ihmeet: "
+msgstr "Ihme: Valmistelu pysäytetty"
 
 #: common/events.c:133
-#, fuzzy
 msgid "Wonder: Will Finish Next Turn"
-msgstr "Tiedoksi: Ihme %s valmistuu ensi vuorolla kaupungissa %s."
+msgstr "Ihme: Valmistuu ensi vuorolla"
 
 #: common/events.c:134
 msgid "Diplomatic Message"
 msgstr "Diplomaattinen viesti"
 
 #: common/events.c:135
-#, fuzzy
 msgid "Treaty: Embassy"
-msgstr "Lähetystö"
+msgstr "Sopimus: Lähetystö"
 
 #: common/events.c:136
 msgid "Error message from bad command"
@@ -503,81 +488,81 @@ msgstr "Yhteydenotto/-katkeamisviestit"
 msgid "AI Debug messages"
 msgstr "AI:n debug-viestit"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "Kansansurmahakuinen"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "Sotaisa"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "Pahantahtoinen"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "Yhteistyökyvytön"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "Rauhaton"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "Neutraali"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "Kunnioittava"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "Avulias"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "Innokas"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "Ihaileva"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "Palvova"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "Aselepo"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Sotatila"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Tulitauko"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Rauha"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Liittouma"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Ei tavattu"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "Joukkuetoveri"
 
@@ -626,13 +611,13 @@ msgstr "%s yksikköä"
 msgid "Size %d"
 msgstr "Koko %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Tulevaisuuden teknologia %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -644,67 +629,67 @@ msgstr "Tulevaisuuden teknologia %d"
 msgid "None"
 msgstr "Ei yhtään"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Tulevaisuuden teknologia"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Tuntematon)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Tie"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Kasteluverkosto"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Rautatie"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Kaivos"
 
 # *** Depends too much on the context, phenomenom pollution & 'substance' pollution
 # aren't the same. ***
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Saastetta"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Maja"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Linnoitus"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Joki"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Viljelysmaa"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Lentotukikohta"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Laskeuma"
 
@@ -813,11 +798,11 @@ msgstr "Ydinohjus"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " ja "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr ", "
 
@@ -901,7 +886,7 @@ msgid ""
 msgstr ""
 "TÄMÄ ON BETA-VERSIO\n"
 "Freeciv %s ilmestyy\n"
-"%sssa %s"
+"%sssa, osoitteessa %s"
 
 # *** free -> liberty ***
 #: common/version.c:103
@@ -979,84 +964,84 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (%d toisto kaikkiaan)"
 msgstr[1] " (%d toistoa kaikkiaan)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "\"%s\": tyhjä argumentti.\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "\"%s\": argumentti puuttuu.\n"
 
 # *** Darn, I forgot 1) if eaa should have a period after it and 2) what jKr
 # is replaced with (question of Christian counting (eKr) vs scientific counting).
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d eKr."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d jKr."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH on asetettu tyhjäksi, käytän oletuspolkua."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Datahakemiston %s lukeminen epäonnistui: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "Data-hakemistopolun voi asettaa FREECIV_PATH-ympäristömuuttujalla."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Tämänhetkinen data-hakemistopolku on: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Tiedosto \"%s\" vaaditaan ... keskeytän!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Vakava virhe: root-käyttäjän ei sovi ajaa minua!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Käytä mieluummin tavallista käyttäjätiliä.\n"
 
 # *** Hmm, where is this used? This ended up sounding more like 'bullseye'. ***
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "täysosuma"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "ainoa osuma"
 
 # *** 'non-clear' ***
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "epäselvä"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "tyhjä"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "liian pitkä"
 
 # *** Urmh. ***
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "huti"
 
@@ -1086,22 +1071,22 @@ msgid "%s is selling %s (not needed) for %d."
 msgstr "%s: myydään %s (tarpeeton) hintaan %d."
 
 # Ilmeisesti pelaaja menee away-moodissa ai-hallinnoitavaksi?
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (AI)* Toisaalla; AI ei voi allekirjoittaa tällaista sopimusta."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (AI)* Pura ensin liittosi pelaajan %s kanssa, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (AI)* Lopettakaamme ensin vihollisuutemme, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1110,47 +1095,47 @@ msgstr ""
 "*%s (AI)* Haluaisin sinun pitävän nykyisen tulitauon ensin hieman pidempään, "
 "%s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (AI)* En luota sinuun vielä riittävästi liittoutumista varten, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (AI)* En tunne mainitsemaasi kaupunkia."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (AI)* Pahoittelen, näkymän jako kanssasi ei ole turvallista."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (AI)* Tämä sopimus ei ollut erityisen hyvä meidän kannaltamme, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* Tervetuloa liittolaiseksemme, %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* Aivan, kestäköön liittomme ikuisesti, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* Aivan, rauha meidän aikanamme!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)* Olen samaa mieltä. Lopetetaan vihanpito, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1159,22 +1144,22 @@ msgstr ""
 "*%s (AI)* Tervehdys, %s! Voimmeko ehdottaa tulitaukoa jotta ehdimme paremmin "
 "tutustua?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* Avaruus ei tule koskaan kuulumaan teille. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr "*%s (AI)* Olen sietänyt äksyilyänne riittävän pitkään! Tulkoon sota!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (AI)* Rauha... on toisen ajan asia."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1183,17 +1168,17 @@ msgstr ""
 "*%s (AI)* Lopultakin yhytin sinut! Luulitko tosiaan pääseväsi kuin koira "
 "veräjästä?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (AI)* Piilovihanpitonne aiheutti tämän sodan!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)* Liittolaisteni (%s) ahdistelu oli vihonviimeinen erheesi!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1208,7 +1193,7 @@ msgstr[1] ""
 "*%s (AI)* %s saa tuta sotavoimiemme täyden mahdin %d vuoron kuluttua, jotta "
 "avaruusaluksen laukaisu tulee estetyksi."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1217,7 +1202,7 @@ msgstr ""
 "*%s (AI)* Odotamme teidän auttavan tässä asiassa. Kauan eläköön mahtava "
 "liittomme!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1236,7 +1221,7 @@ msgstr[1] ""
 "edukseen. Vastaamme voimakeinoin %d vuoron kuluttua ja odotamme teidän "
 "kunnioittavan liittoumaamme toimimalla samoin!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1251,13 +1236,13 @@ msgstr[1] ""
 "*%s (AI)* %s ui rahassa, joten aiomme ryöstää ja rosvota hänen "
 "kansakuntansa! Sota julistetaan %d vuoron kuluttua."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr "*%s (AI)* Jos haluatte osille ryöstösaaliista, tulkaa mukaan vaan!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1272,14 +1257,14 @@ msgstr[1] ""
 "*%s (AI)* %s käy hermoillemme! Julistamme sodan %d vuoron kuluttua ja "
 "revimme tämän naurettavan kansakunnan silpuksi."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (AI)* Odotamme teidän apuanne tässä sodassa; olettehan mahtavia "
 "liittolaisiamme."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1294,7 +1279,7 @@ msgstr[1] ""
 "*%s (AI)* Kunnioitamme liittoamme, alas %s! Julistamme sodan %d vuoron "
 "kuluttua. Tulossa ollaan!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1311,7 +1296,7 @@ msgstr[1] ""
 "vihollisemme. Julistamme sodan %d vuoron kuluttua! Odotamme teidän toimivan "
 "samoin."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1320,7 +1305,7 @@ msgstr ""
 "*%s (AI)* Yrityksesi valloittaa avaruus yksin itsellesi antaa ilmi "
 "todelliset aikomuksesi, ja liittomme on tästä pitäen ohi!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1328,7 +1313,7 @@ msgid ""
 msgstr ""
 "*%s (AI)* Pyrkimyksesi hallita ulkoavaruutta yksin loukkaa meitä syvästi."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1337,14 +1322,14 @@ msgstr ""
 "*%s (AI)* Jos et lopeta avaruusaluksesi rakentamista, minun pitää varmaankin "
 "tehdä asialle jotakin!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 "*%s (AI)* Pahoittelen, mutta näkymän jakaminen kanssasi ei ole enää "
 "turvallista."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1353,7 +1338,7 @@ msgstr ""
 "*%s (AI)* Tervehdys, oi luotettu liittolaisemme. Pyydämme apuanne - "
 "vihollisemme %s pitää tuhota."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1363,7 +1348,7 @@ msgstr ""
 "vieläkään ole vastaanottanut sodanjulistustasi. Pitääkö minun muistuttaa "
 "teitä tekemistänne lupauksista?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1374,7 +1359,7 @@ msgstr ""
 "vieläkin juonia rauhassa, etkä sinä nosta sormeasikaan! Tällaista en voi "
 "hyväksyä, liittomme olkoon purettu!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1383,13 +1368,13 @@ msgstr ""
 "*%s (AI)* Tervehdys, ystävä, haluaisimme ehdottaa yhteisen edun ajamista "
 "liittoutumalla."
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "*%s (AI)* Tervehdys, naapuri, haluaisimme ehdottaa rauhanomaisempia suhteita."
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1398,7 +1383,7 @@ msgstr ""
 "*%s (AI)* Tämä jatkuva verenvuodatus väsyttää meitä. Voisimmeko haudata "
 "sotakirveen?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1408,57 +1393,62 @@ msgstr ""
 "Kunnioittakaa mahtavaa liittoamme ja nimeänne kunnioitetaan iäti!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, c-format
 msgid "Auth option \"%s\":"
 msgstr ""
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr " (oletus)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr " (asetustiedosto)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr " (asetettu)"
 
-#: server/auth.c:266
-#, fuzzy, c-format
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
+#, c-format
 msgid "Auth config filename \"%s\" not allowed!"
-msgstr "Antamasi nimi ei ole sallittu."
+msgstr "Antamasi asetustiedoston nimi \"%s\" ei ole sallittu."
 
-#: server/auth.c:271
-#, fuzzy, c-format
+#: server/auth.c:286
+#, c-format
 msgid "Cannot load auth config file \"%s\"!"
-msgstr "En löydä äänitiedostoa %s"
+msgstr "Asetustiedoston \"%s\" lataaminen ei onnistu!"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr "Varoitus: vierailijanimi '%s' on varattu, vaihdan käyttäjänimeen '%s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Vierailijoita ei sallita tällä palvelimella, pahoittelen."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s jätetty ulkopuolelle: vierailijoita ei sallita."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1466,7 +1456,7 @@ msgid ""
 msgstr ""
 "Käyttäjätietokannan luku epäonnistui, kirjaudun sisään vierailijana '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1474,42 +1464,42 @@ msgstr ""
 "Käyttäjätietokannan lukeminen epäonnistui, ja vierailijakirjautumisia ei "
 "sallita. Pahoittelen"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 "%s jätettiin ulkopuolelle: Tietokantavirhe, ja vierailijoita ei sallita."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Anna käyttäjän %s salasana:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Anna uusi salasana (ja muista se)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Pahoittelen, palvelin sallii vain ennalta rekisteröityjä käyttäjiä."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr ""
 "%s jätettiin ulkopuolelle: Vain ennalta rekisteröidyt käyttäjät sallittu."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Pahoittelen, liian monta yritystä meni vikaan..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 "%s jätetty ulkopuolelle: Liian monta salasanavahvistusta uudelle käyttäjälle."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1517,30 +1507,30 @@ msgstr ""
 "Varoitus: Virhe tallentaessa tietokantaan. Jatkan, mutta tietosi eivät "
 "tallennu."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s jätetty ulkopuolelle: Liian monta epäonnistunutta salasanayritystä."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Annoit väärän salasanan, yritä uudelleen."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Pahoittelen, yhteytesi aikakatkaistiin..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s jätettiin ulkopuolelle: Yhteyden aikakatkaisu salasanaa odottaessa."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "Salasanasi on liian lyhyt, alaraja on %d merkkiä. Anna uusi salasana."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -1550,9 +1540,10 @@ msgstr ""
 "pituuden on oltava vähintään %d [näkyvää] merkkiä pitkä. Anna uusi salasana."
 
 #: server/barbarian.c:183
-#, fuzzy, c-format
+#, c-format
 msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
-msgstr "%s alkaa johtaa barbaareja. Vaaralliset ajat uhkaavat."
+msgstr ""
+"%s ovat saaneet uuden johtajan, nimeltään %s. Vaaralliset ajat uhkaavat."
 
 #: server/barbarian.c:479
 #, c-format
@@ -1652,9 +1643,9 @@ msgstr "%s siirretty pelaajalta %s pelaajalle %s."
 
 #. TRANS: Polish Destroyer ... German <city>
 #: server/citytools.c:548
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s lost in transfer to %s %s"
-msgstr "%s kaupungista %s menetetty kun %s hyökkäsi yksiköllä %s."
+msgstr "%s %s menetetty siirrettäessä %s kaupunkiin %s."
 
 #: server/citytools.c:631
 #, c-format
@@ -1912,7 +1903,7 @@ msgstr "%s: Projekti %s lykkäytyy jostakin epämääräisestä syystä."
 
 #. TRANS: The <city> worklist ....
 #: server/cityturn.c:870
-#, fuzzy, c-format
+#, c-format
 msgid "The %s worklist is now empty."
 msgstr "%s: työlista rakennettu tyhjäksi."
 
@@ -2060,11 +2051,10 @@ msgstr ""
 "Sallitut valinnat:\n"
 
 #: server/civserver.c:208
-#, fuzzy
 msgid ""
 "  -a  --auth FILE\tEnable server authentication with configuration from "
 "FILE.\n"
-msgstr "  -a  --auth\t\tSalli palvelinautentikaatio.\n"
+msgstr "  -a  --auth TDSTO\tSalli palvelinautentikaatio, asetukset TDSTOsta.\n"
 
 #: server/civserver.c:210
 msgid "  -G  --Guests\t\tAllow guests to login if auth is enabled.\n"
@@ -2156,9 +2146,9 @@ msgstr "  -v, --version\t\tNäytä versionumero.\n"
 #: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:279
 #: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
 #: manual/civmanual.c:384
-#, fuzzy, c-format
+#, c-format
 msgid "Report bugs at %s.\n"
-msgstr "Lähetä virheraportit osoitteeseen <%s>.\n"
+msgstr "Lähetä virheraportteja: %s.\n"
 
 #: server/commands.c:28
 msgid "Start the game, or restart after loading a savegame."
@@ -2223,14 +2213,14 @@ msgid "Show a list of players, teams, connections, or scenarios."
 msgstr "Näytä lista pelaajista, joukkueista, yhteyksistä tai skenaarioista."
 
 #: server/commands.c:64
-#, fuzzy
 msgid ""
 "Show a list of players in the game, teams of players, connections to the "
 "server, or available scenarios.  The argument may be abbreviated, and "
 "defaults to 'players' if absent."
 msgstr ""
-"Näytä lista pelaajista, tai lista yhteyksistä palvelimeen. Parametri voidaan "
-"lyhentää, ja mikäli sitä ei ole, käytetään 'players'iä oletusarvona."
+"Näytä lista pelaajista, pelaajajoukkueista, yhteyksistä palvelimeen tai "
+"saatavilla olevista skenaarioista. Parametri voidaan lyhentää, ja mikäli "
+"sitä ei ole, käytetään 'players'iä oletusarvona."
 
 #: server/commands.c:70
 msgid "Quit the game and shutdown the server."
@@ -2332,16 +2322,14 @@ msgid "Cast a vote."
 msgstr "Anna ääni."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Pelaaja, joka on info-komentotasolla ja ajaa kontrollitason komennon, "
 "aloittaa äänestyksen komennosta. /vote-komento, jonka parametriksi annetaan "
@@ -2353,18 +2341,19 @@ msgstr ""
 "yhden vuoron aikana kukaan ei äänestä vastaan, äänestyksen tulos voi olla "
 "myönteinen."
 
-#: server/commands.c:122
-#, fuzzy
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
-msgstr "debug [ player <pelaaja> | city <x> <y> | units <x> <y> | unit <id> ]"
+msgstr ""
+"debug [ player <pelaaja> | city <x> <y> | units <x> <y> | unit <id> | tech "
+"<pelaaja> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Aseta AI-debuggaus tietylle oliolle päälle tai pois päältä."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2372,23 +2361,23 @@ msgstr ""
 "Tulosta AI-debugtietoa annetusta oliosta ja aseta jatkuva debuggaustuloste "
 "tästä oliosta päälle tai pois päältä."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <asetusparametrin nimi> <arvo>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Muuta palvelimen asetuksia."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <pelaaja> [joukkue]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Muuta pelaajan joukkuetta: liity, vaihda uuteen tai poistu."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2401,16 +2390,15 @@ msgstr ""
 "suurlähetystöin, <ja taistelee rinta rinnan saavuttaakseen joukkuevoiton. "
 "Yksilöiden pistemäärät keskiarvotetaan."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <hakemisto>"
 
-#: server/commands.c:143
-#, fuzzy
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
-msgstr "Tämänhetkinen hakemistopolku sääntökokoelmille on: \"%s\""
+msgstr "Valitse uusi sääntökokoelmahakemisto tai mod-paketti."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2419,15 +2407,15 @@ msgstr ""
 "Jos uutta hakemistoa ei anneta, tämänhetkinen hakemisto näytetään."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <metateksti>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Muuta metapalvelimen infotekstiä."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2436,21 +2424,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
-#, fuzzy
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
-msgstr "metainfo <metateksti>"
+msgstr "metapatch <metarivi>"
 
-#: server/commands.c:160
-#, fuzzy
+#: server/commands.c:159
 msgid "Set metaserver patches line."
-msgstr "Muuta metapalvelimen infotekstiä."
+msgstr "Aseta metapalvelimen aliversiotiedot (\"paikat\")."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Kontrolloi yhteyttä metapalvelimeen."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2461,34 +2447,33 @@ msgstr ""
 "'metaconnection up' tai 'metac u' ottaa yhteyden metapalvelimeen."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <osoite>"
 
-#: server/commands.c:174
-#, fuzzy
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
-msgstr "Aseta osoite johon metapalvelimen tulee raportoida."
+msgstr "Aseta osoite (URL) johon metapalvelimen tulee raportoida."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <pelaajan nimi>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Muuta pelaajan AI-tilaa."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [yhteyden nimi] <pelaajan nimi>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Ota pelaajan paikka pelissä."
 
-#: server/commands.c:185
+#: server/commands.c:184
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2502,16 +2487,15 @@ msgstr ""
 "on sallittu"
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
-#, fuzzy
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
-msgstr "observe [yhteyden nimi] <pelaajan nimi>"
+msgstr "observe [yhteyden nimi] [pelaajan nimi]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Tarkkaile pelaajaa tai koko peliä."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2525,15 +2509,15 @@ msgstr ""
 "parametrejä, yhteys yhdistetään globaaliin tarkkailijaan."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <yhteysnimi>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "irrottaudu pelaajasta."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2543,20 +2527,20 @@ msgstr ""
 "<pelaajanimi> on sallittu"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <pelaajan nimi>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Luo annetunniminen AI-pelaaja."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "Komento on käytettävissä vain ennen pelin alkua."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2564,16 +2548,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Laita itsesi poissa-tilaan. AI vahtii selustaasi."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "AI hallitsee valtiotasi mutta tekee vain minimaalisia muutoksia."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2581,11 +2565,11 @@ msgstr ""
 "novice\n"
 "novice <pelaajan nimi>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Aseta yhden tai kaikkien AI-pelaajien vaikeustasoksi 'aloittelija'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2596,7 +2580,7 @@ msgstr ""
 "Muussa tapauksessa vain kyseisen pelaajan vaikeustasoa muutetaan."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2604,11 +2588,11 @@ msgstr ""
 "easy\n"
 "easy <pelaajan nimi>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Aseta yhden tai kaikkien AI-pelaajien vaikeustasoksi helppo."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2619,7 +2603,7 @@ msgstr ""
 "kyseisen pelaajan vaikeustasoa muutetaan."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2627,11 +2611,11 @@ msgstr ""
 "normal\n"
 "normal <pelaajan nimi>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Aseta yhden tai kaikkien AI-pelaajien vaikeustasoksi tavallinen."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2642,7 +2626,7 @@ msgstr ""
 "tapauksessa vain kyseisen pelaajan vaikeustasoa muutetaan."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2650,11 +2634,11 @@ msgstr ""
 "hard\n"
 "hard <pelaajan nimi>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Aseta yhden tai kaikkien AI-pelaajien vaikeustasoksi vaikea."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2665,7 +2649,7 @@ msgstr ""
 "kyseisen pelaajan vaikeustasoa muutetaan."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2673,11 +2657,11 @@ msgstr ""
 "experimental\n"
 "experimental <pelaajan nimi>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Aseta yhden tai kaikkien AI-pelaajien vaikeustasoksi 'kokeellinen'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2691,7 +2675,7 @@ msgstr ""
 "asetus ei tee mitään."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2705,11 +2689,11 @@ msgstr ""
 "cmdlevel <taso> first\n"
 "cmdlevel <taso> <yhteyden nimi>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Tarkista tai aseta sallittu komentotaso."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2749,20 +2733,20 @@ msgstr ""
 "seuraavalle samannimiselle yhteydelle. Huomaa, että komento ottaa nykyään\n"
 "vastaan yhteysnimiä, ei pelaajanimiä."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "Jos pelaajia ei ole, ryhdy peliorganisoijaksi lisäoikeuksin."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <vuoro> <vuorolisä> <arvo> <arvokerroin>."
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Ks. 'help timeoutincrease'."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2773,24 +2757,24 @@ msgstr ""
 "komentoa yhdessä \"timeout\"-asetuksen kanssa. Oletusarvot ovat 0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Lopeta peli välittömästi tasapeliin."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "surrender"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Luovuta peli."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2799,15 +2783,15 @@ msgstr ""
 "pelaaj a (tai joukkue) ovat luovuttaneet näin, peli päättyy."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <pelaajan nimi>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Poista pelaaja pelistä lopullisesti."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2816,7 +2800,7 @@ msgstr ""
 "kaupungit ja yksiköt jne. Käytä varoen!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2824,11 +2808,11 @@ msgstr ""
 "save\n"
 "save <tiedostonimi>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Tallenna peli annettuun tiedostoon."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2846,7 +2830,7 @@ msgstr ""
 "ja käytä komentoa 'start' kunhan pelaajat ovat taas yhteydessä."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2854,11 +2838,11 @@ msgstr ""
 "load\n"
 "load <tiedosto>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Lataa peli annetusta tiedostosta."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2867,28 +2851,28 @@ msgstr ""
 "ja palvelinasetukset unohdetaan.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <tiedosto>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Suorita palvelinkäskyjä tiedostosta."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <tiedosto>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Tallenna tämänhetkiset palvelinkomentojen asetukset tiedostoon."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Muuta palvelimen tulostus RFC-tyyliseksi tai tavalliseksi."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Palauttaa palvelimen tunnisteen."
 
@@ -2904,9 +2888,9 @@ msgstr "Tervetuloa %s-palvelimelle portissa %d."
 
 #. TRANS: (connection) identifier: ... [network address]
 #: server/connecthand.c:97
-#, fuzzy, c-format
+#, c-format
 msgid "(%d) %s: connected [%s]"
-msgstr "(%d) %s on liittynyt yhteydestä %s."
+msgstr "(%d) %s on liittynyt osoitteesta %s."
 
 #: server/connecthand.c:104
 #, c-format
@@ -2940,20 +2924,19 @@ msgstr "%s ei ole valmis vuoronsa kanssa, peli odottaa..."
 
 #. TRANS: (connection) identifier: ... [network address]
 #: server/connecthand.c:240
-#, fuzzy, c-format
+#, c-format
 msgid "(%d) %s: connection request [%s]"
 msgstr "(%d) %s osoitteesta %s lähettää yhteyspyynnön"
 
 #: server/connecthand.c:266
-#, fuzzy
 msgid "The client is missing a capability that this server needs."
-msgstr "Client-ohjelmasta puuttuu tämän palvelimen vaatima ominaisuus."
+msgstr "Asiakasohjelmasta puuttuu tämän palvelimen vaatima ominaisuus."
 
 # Unliteral translation.
 #: server/connecthand.c:268 server/connecthand.c:279
-#, fuzzy, c-format
+#, c-format
 msgid "(%d) %s rejected: mismatched capabilities!"
-msgstr "(%d) %s jätetty ulkopuolelle: epäyhteensopivat ohjelmistot."
+msgstr "(%d) %s katkaistu: epäyhteensopivat ohjelmistot."
 
 #: server/connecthand.c:277
 #, fuzzy
@@ -2961,9 +2944,8 @@ msgid "This server is missing a capability that the client needs."
 msgstr "Palvelimesta puuttuu client-ohjelman vaatima ominaisuus."
 
 #: server/connecthand.c:290
-#, fuzzy
 msgid "The username is invalid!"
-msgstr "Kelvoton käyttäjätunnus"
+msgstr "Käyttäjätunnus ei kelpaa!"
 
 # Unliteral translation.
 #. TRANS: (connection) identifier: ... [network address]
@@ -3415,26 +3397,35 @@ msgstr "Olet aiheuttanut selkkauksen lietsoessasi kapinaa kaupungissa %s."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s ovat aiheuttaneet selkkauksen lietsoessaan kapinaa kaupungissa %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "Merellä liikkuvia aloitusyksiköitä ei vielä tueta. Kukaan ei saa yksikköä %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Vuosi: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr "Vuoron aikaraja on liian suuri ja palautetaan maksimiarvoon"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Vuoron aikaraja on nollaa pienempi ja muutetaan nollaksi."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Vain GGZ-asiakasohjelman tulee kutsua civclientiä ggz-tilassa!\n"
 
@@ -3478,11 +3469,11 @@ msgstr "En löydä yhteyttä jonka nimi olisi %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "En löydä pelaajaa enkä yhteyttä nimellä %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Maailmanlaajuista lämpenemistä on ilmennyt!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
@@ -3490,17 +3481,17 @@ msgstr ""
 "Rannikkoalueita on joutunut tulvan valtaan ja laajoja ruohikkoalueita on "
 "aavikoitunut."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Ydintalvi on laskeutunut!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Suoalueita on kuivunut ja tundra on levinnyt laajalti entisille "
 "ruohoalueille."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3510,7 +3501,7 @@ msgstr ""
 "myötä.\n"
 "      Työläiset pitävät talkoot ja rakentavat rautatien joka kaupunkiin."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3520,12 +3511,12 @@ msgstr ""
 "rautatiet.\n"
 "      Työläiset pitävät talkoot ja rakentavat rautatien joka kaupunkiin."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Yksikkösi %s on siirretty muuttuneen maaston takia."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Yksikkösi %s on lakkautettu muuttuneen maaston takia."
@@ -3588,52 +3579,52 @@ msgstr "Vallankumous: palataan anarkiaan."
 msgid "You should choose a new government from the government menu."
 msgstr "Valitse uusi hallitusmuoto hallitusmuotovalikosta."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Veron osuus on liian korkea tälle valtiomuodolle (%s); korjattu."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Tutkimuksen osuus on liian korkea tälle valtiomuodolle (%s); korjattu."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Luksuksen osuus on liian korkea tälle valtiomuodolle (%s); korjattu."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s ei enää jaa näkymäänsä kanssamme!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "Senaatti hyväksyy esityksesi - %s ovat provosoineet jo tarpeeksi."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "%s ja %s ovat puhuneet; valtioiden välillä on nyt %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3642,7 +3633,7 @@ msgstr ""
 "%s peruutti diplomaattisen sopimuksen - %s ja %s toteavat, että kansojen "
 "välillä on nyt %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
@@ -3650,7 +3641,7 @@ msgstr ""
 "%s on hyökännyt liittolaisesi (%s) kimppuun! Irtisanoudut liitosta "
 "hyökkääjän kanssa."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3659,26 +3650,26 @@ msgstr ""
 "Joukkuetoverisi %s ja liittolaisesi %s ovat nyt sodassa. Sinulla ei ole "
 "vaihtoehtoa, %s ei voi enää olla liittolaisesi."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Pelaaja %s on poistettu pelistä."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Sinut on poistettu pelistä!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s on poistettu pelistä."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Olet kohdannut %s, joita hallitsee %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3686,19 +3677,19 @@ msgstr ""
 "%s ja %s ovat kohdanneet ja julistaneet välittömästi sodan. Peruutat "
 "liittoutumasi molempien kanssa."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr ""
 "%s kansakunta ei voi vajota sisällissotaan - pelissä on liikaa pelaajia"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr ""
 "%s kansakunta ei voi vajota sisällissotaan - pelissä on liikaa pelaajia"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3706,12 +3697,12 @@ msgid ""
 msgstr ""
 "Sisällissota syttyy, %s nimitetään kapinallisten valtioiden johtajaksi."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, fuzzy, c-format
 msgid "%s declares allegiance to %s."
 msgstr "Peli: %s julistaa, että %s on sen liittolainen."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3951,20 +3942,20 @@ msgstr "."
 msgid "th"
 msgstr "."
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Väestötietomerkkijonossa on sopimattomia merkkejä. Katso \"help demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Väestökatsaus:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Ikävä kyllä väestökatsaus ei ole saatavilla."
 
-#: server/report.c:746
+#: server/report.c:748
 #, fuzzy, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%2$s ja hallintomuotonsa %1$s"
@@ -3975,11 +3966,11 @@ msgstr "%2$s ja hallintomuotonsa %1$s"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "En löytänyt lukukelpoista \"%s\"-sääntökokoelmatiedostoa."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Lataan sääntökokoelmaa"
 
@@ -3995,7 +3986,7 @@ msgstr ""
 "tallennettu peli on vanha, tai tiedosto voi olla viallinen. Jatka omalla "
 "vastuullasi."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Tallennettu peli on liian vanha, tarvitaan vähintään versio 1.9.0."
@@ -4018,13 +4009,13 @@ msgstr ""
 "hakemistoa '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4059,7 +4050,7 @@ msgstr "Sisäiset"
 msgid "Networking"
 msgstr "Verkkoon liittyvät"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Kaikki"
@@ -4083,7 +4074,7 @@ msgstr "Veroasteet"
 msgid "Changed"
 msgstr "Vaihdettu"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4092,7 +4083,7 @@ msgstr ""
 "kelvottomia merkkejä. \n"
 "Ks. \"help allowtake\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 #, fuzzy
 msgid ""
 "Starting units string contains invalid\n"
@@ -4102,7 +4093,7 @@ msgstr ""
 "kelvottomia merkkejä. \n"
 "Ks. \"help allowtake\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4112,26 +4103,31 @@ msgstr ""
 "vähintään yhtä kaupungin perustajaa.\n"
 "Ks. \"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr "Pelaajien lukumäärä on pyydettyä suurempi, pidän vanhan arvon"
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Sinulla ei ole tarvittavia oikeuksia tämän asetuksen muuttamiseen."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Kartan koko (tuhansissa ruuduissa)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4141,12 +4137,12 @@ msgstr ""
 "  koko = 4 on tavallinen 4.000 ruudun kartta (oletus)\n"
 "  koko = 20 on valtava 20.000 ruudun kartta"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Kartan topologiaindeksi"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4216,11 +4212,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/\n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Kartanluontitapa"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4240,12 +4236,12 @@ msgstr ""
 "sijoitukselle. Jos startpos-oletusarvo on käytössä, startpos-asetus valitaan "
 "generaattorin perusteella. Ks. \"startpos\"-asetus."
 
-#: server/settings.c:301
+#: server/settings.c:292
 #, fuzzy
 msgid "Method used to choose start positions"
 msgstr "Kartanluontitapa"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4266,37 +4262,37 @@ msgstr ""
 "Huomaa: generaattorit yrittävät luoda oikean määrän mantereita suhteessa "
 "tähän ja pelaajamäärän asetukseen"
 
-#: server/settings.c:315
+#: server/settings.c:306
 #, fuzzy
 msgid "Presence of 1x1 islands"
 msgstr "Sallitaanko 1x1-saaret"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = ei 1x1-saaria; 1 = 1x1-saaret mahdollisia"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Ovatko navat erillisiä mantereita"
 
-#: server/settings.c:322
+#: server/settings.c:313
 #, fuzzy
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr "0 = muut mantereet voivat ulottua napoihin; 1 = navat ovat erillään"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Koko kartta-alue on lauhaa"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = tavallinen Maan kaltainen planeetta; 1 = täysin lauha planeetta"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Planeetan keskilämpötila"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4329,22 +4325,22 @@ msgstr ""
 "0 vastaa hyvin kylmää planeettaa, jossa on laajat napajääalueet eikä "
 "lainkaan trooppisia alueita"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Maa-alueiden osuus kartasta prosentteina"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 "Tämä arvo asettaa maa-alueiden likimääräisen prosenttiosuuden kartasta."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Kukkuloiden/vuorien määrä"
 
-#: server/settings.c:360
+#: server/settings.c:351
 #, fuzzy
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
@@ -4353,11 +4349,11 @@ msgstr ""
 "Pienet arvot luovat tasaisia karttoja, korkeat arvot lisäävät "
 "epätasaisuuksia."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Veden määrä maa-alueilla"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4365,11 +4361,11 @@ msgstr ""
 "Pienet arvot vastaavat suurta määrää kuivaa, aavikkomaista maastoa; "
 "korkeammat arvot lisäävät karttaan enemmän soita, viidakkoa ja jokia."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Kartanluonnin sattumanvaraisuustekijä ('seed')"
 
-#: server/settings.c:375
+#: server/settings.c:366
 #, fuzzy
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
@@ -4379,36 +4375,35 @@ msgstr ""
 "Sama arvo tuottaa aina saman kartan; valinnalla 0 (oletus) arvo valitaan "
 "kellonajan perusteella sattumanvaraisen kartan luomiseksi."
 
-#: server/settings.c:388
+#: server/settings.c:379
 #, fuzzy
 msgid "Game random seed"
 msgstr "Yleinen sattumanvaraisuustekijä ('seed')"
 
-#: server/settings.c:389
+#: server/settings.c:380
 #, fuzzy
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr "Valinnalla 0 (oletus) tekijä valitaan kellonajan perusteella."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "\"Erityisten\" luonnonvarojen suht. määrä"
 
-#: server/settings.c:397
-#, fuzzy
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
 msgstr ""
 "Erityisluonnonvarat parantavat maa-aluetta jolla ne ovat. Palvelinmuuttujan "
-"suhde on 1 / 1000 (ruutua)."
+"yksikkö on promille (tuhannesosa)."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Majojen (pienten alkuasukaskylien) määrä"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4416,24 +4411,23 @@ msgstr ""
 "Tämä arvo asettaa koko kartalle asetettavien majojen tarkan määrän. Majat "
 "ovat pieniä alkuasukaskyliä, joita yksiköt voivat tutkia."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Pienin sallittu pelaajamäärä"
 
-#: server/settings.c:419
-#, fuzzy
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
-"Peli ei voi alkaa ennen kuin vähintään näin moni (ihmis- tai AI-) pelaaja on "
-"liittynyt."
+"Peli ei voi alkaa ennen kuin vähintään näin moni (yhteydessä oleva ihmis-) "
+"pelaaja on liittynyt."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Suurin sallittu pelaajamäärä"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4442,12 +4436,11 @@ msgstr ""
 "Kun tämä ihmis- ja AI-pelaajien määrä on liittynyt peliin sen "
 "valmisteluvaiheessa, useampia pelaajia ei oteta."
 
-#: server/settings.c:435
-#, fuzzy
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
-msgstr "Lopullinen pelaajamäärä (AI-täydennysten jälkeen)"
+msgstr "Lopullinen pelaajamäärä (AI-pelaajat mukaanlukien)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 #, fuzzy
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
@@ -4456,12 +4449,11 @@ msgstr ""
 "Jos pelaajia on vähemmän kuin tämä arvo, peli luo AI-pelaajia kunnes "
 "pelaajien kokonaismäärä on tämä."
 
-#: server/settings.c:448
-#, fuzzy
+#: server/settings.c:439
 msgid "List of players' initial units"
-msgstr "Luetteloi kaikki yksiköt"
+msgstr "Pelaajien aloitusyksiköiden luettelo"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4489,31 +4481,31 @@ msgstr ""
 "    a   = Nopea hyökkäysyksikkö (esim. Hevosmiehet)\n"
 "    A   = Vahva hyökkäysyksikkö (esim. Katapultti)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Aloitusyksiköiden hajonta-alue"
 
-#: server/settings.c:467
+#: server/settings.c:458
 #, fuzzy
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "Tämän arvon tulisi olla puolet aloitusyksiköiden hajonta-alueen (neliö) "
 "sivun pituudesta  - yksiköt päätyvät tämän neliön sisälle."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Kullan määrä pelaajaa kohti pelin alussa"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Kullekin pelaajalle annetaan arvon mukainen määrä kultaa pelin alussa."
 
-#: server/settings.c:480
+#: server/settings.c:471
 #, fuzzy
 msgid "Number of initial techs per player"
 msgstr "Uudisraivaajien määrä pelaajaa kohti pelin alussa"
 
-#: server/settings.c:481
+#: server/settings.c:472
 #, fuzzy
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
@@ -4522,11 +4514,11 @@ msgid ""
 "next techs really expensive."
 msgstr "Kullekin pelaajalle annetaan arvon mukainen määrä kultaa pelin alussa."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 #, fuzzy
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
@@ -4535,11 +4527,11 @@ msgid ""
 msgstr ""
 "Tämä vaikuttaa nopeuteen jolla pelaajat voivat kehittää uutta teknologiaa."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Prosentuaalinen menetys tutkimuskohdetta muutettaessa"
 
-#: server/settings.c:501
+#: server/settings.c:492
 #, fuzzy
 msgid ""
 "If you change your current research technology, and you have positive "
@@ -4550,12 +4542,12 @@ msgstr ""
 "positiivisia, menetät näin monta prosenttia tutkimuspisteistäsi. Menetystä "
 "ei tapahdu jos olet juuri löytänyt uutta teknologiaa tällä vuorolla."
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Prosentuaalinen menetys diplomatian kautta saadun teknologian takia"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4567,11 +4559,11 @@ msgstr ""
 "kohden menetät näin monta prosenttia uuden edistysaskeleen vaatimista "
 "tutkimuspisteistä - voit siis päätyä pakkasen puolelle tutkimuspisteissäsi."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Prosentuaalinen menetys valloituksen kautta saadun teknologian takia"
 
-#: server/settings.c:522
+#: server/settings.c:513
 #, fuzzy
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
@@ -4582,12 +4574,11 @@ msgstr ""
 "näin monta prosenttia uuden edistysaskeleen vaatimista tutkimuspisteistä - "
 "voit siis päätyä pakkasen puolelle tutkimuspisteissäsi."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Prosentuaalinen menetys ilmaisen teknologian saamisen takia"
 
-#: server/settings.c:533
-#, fuzzy
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4596,15 +4587,16 @@ msgid ""
 "points."
 msgstr ""
 "Jokaista \"ilmaiseksi\" (ei diplomatiasuhteilla eikä valloittamalla, vaan "
-"majojen tai Suuren kirjaston kautta) saamaasi teknologista edistysaskelta "
-"kohden menetät näin monta prosenttia uuden edistysaskeleen vaatimista "
-"tutkimuspisteistä - voit siis päätyä pakkasen puolelle tutkimuspisteissäsi."
+"majojen tai Aleksandrian kirjaston kautta) saamaasi teknologista "
+"edistysaskelta kohden menetät näin monta prosenttia uuden edistysaskeleen "
+"vaatimista tutkimuspisteistä - voit siis päätyä pakkasen puolelle "
+"tutkimuspisteissäsi."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Kaupungin kasvuun tarvittava ruokamäärä"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4613,12 +4605,12 @@ msgstr ""
 "Tämä on kaupungin kasvuun tarvittava perusruokamäärä, joka kerrotaan vielä "
 "sääntökokoelman määräämällä tekijällä, joka riippuu kaupungin koosta."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Prosentuaalinen ruokavarojen menetys kun kaupunki ei voi kasvaa"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4628,11 +4620,11 @@ msgstr ""
 "puutteen takia ei siinä onnistu, se menettää näin monta prosenttia "
 "ruokavaroistaan (tai puolet siitä jos kaupungissa on Viljasiilo)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Tuotantohinnan kerroin"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4641,11 +4633,11 @@ msgstr ""
 "tuottaa. Perushinnat kerrotaan tällä arvolla (tulkittuna "
 "prosenttiyksiköiksi)."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Kaupungin minimikoko kaupan maksimoinniksi"
 
-#: server/settings.c:579
+#: server/settings.c:570
 #, fuzzy
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
@@ -4658,11 +4650,11 @@ msgstr ""
 "kasvaa vähitellen kunnes tässä koossa kohtaa maksiminsa (lukuunottamatta "
 "tavallista korruptiota). Ks. myös 'notradesize'."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Kaupattoman kaupungin maksimikoko"
 
-#: server/settings.c:590
+#: server/settings.c:581
 #, fuzzy
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
@@ -4673,22 +4665,22 @@ msgstr ""
 "lisääntyy vähitellen kunnes 'fulltradesize', maksimikoko, saavutetaan. Ks. "
 "myös 'fulltradesize'."
 
-#: server/settings.c:599
+#: server/settings.c:590
 #, fuzzy
 msgid "City size before people become unhappy"
 msgstr "Kaupungin koko ennen kuin väestöstä tulee tyytymätöntä"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
 msgstr ""
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr ""
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4696,11 +4688,11 @@ msgid ""
 "numbers of cities."
 msgstr ""
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Kaupunkien välinen minimietäisyys"
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4712,11 +4704,11 @@ msgstr ""
 "jokaisen kaupunkiparin välissä joka suunnassa. Jos arvo on 0 (oletus), se "
 "määräytyy pelin alkaessa senhetkisen säännöstökokoelman mukaiseksi."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Vuorojen määrä innostuksen vaikutusten välillä"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4724,11 +4716,11 @@ msgstr ""
 "Asettaa, miten monen vuoron välein juhliva kaupunki kasvaa sen seurauksena. "
 "Jos arvo on n, kaupunki kasvaa juhlittuaan n+1 vuoroa."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Valloitetun rakennuksen tuhoutumisriski"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4736,11 +4728,11 @@ msgstr ""
 "Kun pelaaja valloittaa kaupunkin, jokaisella kaupungin parannuksella on näin "
 "monen prosentin todennäköisyys tuhoutua."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Todennäköisyys ruutuun liikkumiselle hyökkäyksen jälkeen"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4754,11 +4746,11 @@ msgstr ""
 "yksiköitä jäljellä ruudussa). Jos arvo on 0:n ja 100:n välillä, se tulkitaan "
 "maa-alueen \"valtaamisen\" prosentuaaliseksi todennäköisyydeksi."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Aseta palvelinpään automaattihyökkäys päälle/pois päältä"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4767,11 +4759,11 @@ msgstr ""
 "harkitsevat automaattisesti lähistöllä liikkuvien vihollisyksiköiden "
 "kimppuun hyökkäämistä."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Vähennä kaupungin väestöä hyökkäyksen jälkeen"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4788,11 +4780,11 @@ msgstr ""
 "  4 = heli\n"
 "  8 = ilma"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Valtiorajojen säde"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4803,11 +4795,11 @@ msgstr ""
 "ja useamman kuin yhden kansakunnan hallitseman kaupungin alueella olevat "
 "ruudut käsitellään erikoissäännöin."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Sotilasyksiköt rajojen sisäpuolella eivät aiheuta tyytymättömyyttä"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4815,11 +4807,11 @@ msgstr ""
 "Jos tämä arvo on asetettu, yksiköt eivät aiheuta tyytymättömyyttä ollessaan "
 "rajojesi sisäpuolella."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Diplomatian mahdollisuus muiden pelaajien kanssa"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4833,11 +4825,11 @@ msgstr ""
 "3 = diplomatia on rajattu joukkueille.\n"
 "4 = diplomatia on poistettu kaikkien käytöstä."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Sallitut kaupunkien nimet"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4863,11 +4855,11 @@ msgstr ""
 "kaupunkien oletusnimiä ellei se ole myös hänen kansakuntansa "
 "oletusnimistössä."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Barbaarien aktiivisuustaso"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4881,19 +4873,19 @@ msgstr ""
 "3 - barbaarien hyökkäykset yleisiä\n"
 "4 - raivoavia joukkoja, paljon barbaareja"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Barbaarien ilmaantumisvuosi"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbaareja ei ilmaannu ennen tätä vuotta"
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Vallankumouksen kesto vuoroina"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4902,11 +4894,11 @@ msgstr ""
 "asetuksen mukaisen määrän vuoroja. Mikäli asetuksen arvo on 0, anarkia "
 "kestää satunnaisesti 1-6 vuoroa."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Rajoita näkyvyyttä (\"fog of war\")"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4916,31 +4908,31 @@ msgstr ""
 "näkökentässä olevat yksiköt ja kaupungit. Et näe uusia kaupunkeja tai "
 "maaston muutoksia ruuduissa joita et tarkkaile."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Sallitaanko avaruuden kilpajuoksu"
 
-#: server/settings.c:783
+#: server/settings.c:774
 #, fuzzy
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Jos tämä arvo on 1, pelaajat voivat rakentaa avaruusaluksia"
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Pienin määrä kaupunkeja sisällissodan syttymiseen"
 
-#: server/settings.c:790
+#: server/settings.c:781
 #, fuzzy
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
@@ -4951,11 +4943,11 @@ msgstr ""
 "pääkaupunki kaapataan. Jos arvo on suurin mahdollinen, sisällissotia ei syty "
 "lainkaan."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Vuororaja ennen kuin pelaajayhteys menetetään"
 
-#: server/settings.c:800
+#: server/settings.c:791
 #, fuzzy
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
@@ -4966,12 +4958,12 @@ msgstr ""
 "jälkeen kun heidän yksikkönsä ovat viimeksi tavanneet. Aseta tämä arvo "
 "nollaksi poistaaksesi tämän mahdollisuuden kokonaan käytöstä."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Rakenna palatsi uudelleen jos pääkaupunki vallataan"
 
-#: server/settings.c:811
+#: server/settings.c:802
 #, fuzzy
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
@@ -4983,11 +4975,11 @@ msgstr ""
 "ilmaiseksi johonkin toiseen kaupunkiin, riippumatta siitä onko Muuraus "
 "keksitty."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Käytetäänkö luonnollisia kaupunkien nimiä"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -4995,11 +4987,11 @@ msgstr ""
 "Jos tämä on valittu, kaupunkien oletusnimet valitaan niiden ympäristön "
 "perusteella."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Pelaajat joita käyttäjät voivat ottaa haltuunsa"
 
-#: server/settings.c:835
+#: server/settings.c:826
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
@@ -5058,11 +5050,11 @@ msgstr ""
 "kontrolloiman\n"
 "pelaajan käyttöönottamista."
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Muuttuuko AI-tila yhteyden mukaan"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5070,25 +5062,27 @@ msgstr ""
 "Jos tämä arvo on 1, AI-tilasta poistutaan kun pelaaja on yhteydessä, ja "
 "siihen palataan kun pelaaja katkaisee yhteyden."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Pelin päättymisvuosi"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Peli päättyy annetun vuoden lopussa."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Suurin sallittu aika kierrosta kohti (sekunteina)"
 
-#: server/settings.c:885
+#: server/settings.c:876
 #, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Jos kaikki pelaajat eivät ole valinneet \"Vuoro päättyy\" ennen kuin tämä "
 "aika on loppunut, vuoro päättyy automaattisesti. Arvolla 0 aikarajoitusta ei "
@@ -5096,33 +5090,33 @@ msgstr ""
 "testitilaan. Käytä tätä komennon \"timeoutincrease\" kanssa luodaksesi "
 "dynaamisen ajastimen."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "Aikakatkaisu vähintään n sekuntia, kun vihollinen on liikkunut"
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 #, fuzzy
 msgid "Whether to have simultaneous player phases."
 msgstr "Pidetäänkö pelaajatilastoista kirjaa"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 #, fuzzy
 msgid "Seconds to let a client's network connection block"
 msgstr "Aika jonka yhteys saa olla lukossa (block) (s)."
 
-#: server/settings.c:914
+#: server/settings.c:907
 #, fuzzy
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
@@ -5134,12 +5128,12 @@ msgstr ""
 "ellei TCP-protokollan toteutus sitä itse tee."
 
 # At best a half-educated guess..
-#: server/settings.c:923
+#: server/settings.c:916
 #, fuzzy
 msgid "Max seconds for network buffers to drain"
 msgstr "Maksimiaika ennen kuin TCP-puskurit katsotaan tyhjiksi (s)"
 
-#: server/settings.c:924
+#: server/settings.c:917
 #, fuzzy
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
@@ -5150,11 +5144,11 @@ msgstr ""
 "TCP-puskureiden aukeamista (unblock). Jos arvo on nolla, palvelin ei odota "
 "lainkaan."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Tauko PINGausten välillä (s)"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5162,21 +5156,21 @@ msgstr ""
 "Civ-palvelin lähettää PING-pyynnön clienteille joka kerta kun tämä aika on "
 "kulunut."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Aika clientin leikkaamiseen"
 
-#: server/settings.c:941
+#: server/settings.c:934
 #, fuzzy
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr "Jos client-ohjelma ei vastaa PONGiin tässä ajassa, yhteys katkaistaan."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Kierroksen vaihtumisen esto"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
@@ -5185,11 +5179,11 @@ msgstr ""
 "Jos tämä arvo on 1, pelikierros ei vaihdu ennen kuin kaikki pelaajat ovat "
 "päättäneet vuoronsa (mukaanlukien pelaajat joiden yhteys on poikki)."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Tasapitkät kierrokset"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5198,11 +5192,11 @@ msgstr ""
 "Jos tämä arvo on 1, uusi kierros ei ala ennen kuin asetettu kierrosaika on "
 "kulunut, riippumatta siitä ovatko kaikki painaneet \"Vuoro päättyy\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Mitä väestökatsaus sisältää"
 
-#: server/settings.c:964
+#: server/settings.c:957
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
@@ -5238,11 +5232,11 @@ msgstr ""
 "    b = näytä 'paras valtio'\n"
 "(Kirjainten järjestyksellä ei ole merkitystä, mutta niiden koolla (P/p) on.)"
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Vuoroja automaattista tallennusta kohden"
 
-#: server/settings.c:989
+#: server/settings.c:982
 #, fuzzy
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
@@ -5251,11 +5245,11 @@ msgstr ""
 "Peli tallennetaan automaattisesti näin monen vuoron välein. \n"
 "Jos arvo on 0, automaattista tallennusta ei tapahdu."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Tallennetun pelin pakkaustaso"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 #, fuzzy
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
@@ -5268,11 +5262,11 @@ msgstr ""
 "palvelin on käännetty ('compiled') niin että zlibin käyttöä ei "
 "mahdollistettu."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Automaattisen tallennustiedoston nimen alku"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 #, fuzzy
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
@@ -5281,11 +5275,11 @@ msgstr ""
 "Automaattisesti tallennettujen pelien nimeksi tulee \"<alku><vuosi>.sav\".\n"
 "Tässä asetetaan <alku>:n arvo."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Pidetäänkö pelaajatilastoista kirjaa"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 #, fuzzy
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
@@ -5302,7 +5296,7 @@ msgstr ""
 "Palvelin ei saa luettua STDIN:iä. Sen kautta tulevat komennot jätetään "
 "huomiotta."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, fuzzy, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Välipalvelin: epäkelpo osoite: [%s:%d]."
@@ -5440,107 +5434,107 @@ msgstr "Pelin tallennus tiedostoon %s epäonnistui"
 msgid "Game saved as %s"
 msgstr "Peli tallennettu tiedostoon %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Peli on jo käynnissä."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%s menetti control-komentotason pelin alkaessa. Käytä äänestystä tästä "
 "eteenpäin."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Aloitan pelin."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "tuntemattoman raporttityypin pyyntö (tyyppi %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Varoitus: hylättiin vanha asiakasohjelma %s\""
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Kuollut pelaaja tai sivustakatsoja lähetti tyypin %d paketin"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Ole hyvä ja valitse nimi joka ei ole tyhjä."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Valitsemasi kansakunta on jo käytössä."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr ""
 "Samanniminen ('%s') pelaaja on jo liittynyt peliin. Ole hyvä ja valitse "
 "toinen nimi."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Ole hyvä ja valitse nimi jossa on vain ASCII-kirjaimia."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "Kansakunta (%s) ei ole saatavilla tässä skenaariossa."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "Kansakunta (%s) on jo käytössä."
 
 # Johndoe on suomalaisten hallitsija Tarja Halonen.
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s on %s hallitsija %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Odotetaan pelin alkamista: %d / %d pelaajaa valmiina aloittamaan."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s on lisätty vaikeustason %s AI-pelaajaksi."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Pelaaja %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s sai johtaakseen %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Lähetän tietoa metapalvelimelle [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Peli päättyy..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Vastaanotan nyt uusia client-yhteydenottoja."
 
@@ -5563,7 +5557,7 @@ msgstr "(epäselvä)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5739,7 +5733,7 @@ msgstr "Pelaajia ei voi poistaa kun peli on alkanut."
 msgid "Removed player %s from the game."
 msgstr "Pelaaja %s on poistettu pelistä."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Nimi \"%s\" on kielletty tietoturvasyistä."
@@ -5814,202 +5808,202 @@ msgid ""
 msgstr ""
 "Et voi nostaa komentotasoa arvoon '%s'; oma tasosi '%s' ei riitä siihen."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Pelaajan %2$s sallittujen komentojen taso asetettu arvoon '%1$s'."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 "Sallittujen komentojen tasoa ei voitu asettaa arvoon '%s' pelaajalle %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Komentojen taso uusille pelaajille asetettu arvoon '%s'."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "Komentotaso ensimmäiselle ottajalle: %s"
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "Komentoa 'first' ei ole järkevää käyttää palvelimen komentolinjalla."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Sinulla on jo käytettävissäsi vähintään tason '%s' komennot."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Joku muu on jo pelinohjaaja."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Kelvoton argumentti %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Käyttö: timeoutincrease <vuoro> <vuorolisä> <arvo> <arvokerroin>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Dynaaminen vuoron aikaraja asetettu arvoiksi %d %d %d %d."
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Asetus:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "on muutettavissa"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "kiinteä"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Arvo: %d, alaraja: 0, oletus: %d, yläraja: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Arvo: %d, alaraja: %d, oletus: %d, yläraja: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Arvo: \"%s\", oletus: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Seuraavista palvelimen asetuksista on saatavilla seloste:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Tuolle ei ole vielä selostetta."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Asetuksen nimi ei ole yksiselitteinen."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Palvelinoperaattori: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Pelaajan '%s' AI-vaikeustaso on nyt '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s ei ole AI:n ohjauksessa."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "AI:n vaikeustason oletusarvo on nyt '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Tämä komento on vain client-ohjelman käytettävissä."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Käyttö: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s on poissa-tilassa."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s palasi pelin ääreen."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr ""
 "Ikävä kyllä sinulla ei ole tarvittavia oikeuksia asetuksen '%s' näyttämiseen."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Tuntematon asetusparametri '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Asetukset joilla on oletuksesta poikkeava arvo"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Kaikki asetukset"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Keskeiset asetukset"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Tilannekohtaiset asetukset"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Harvinaiset asetukset"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ tarkoittaa että voit muuttaa asetusta"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= tarkoittaa että asetus on oletusarvossaan"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s arvo (min, maks)"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Asetus"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "kuvaus"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -6018,38 +6012,38 @@ msgstr ""
 "asetuksia.\n"
 "Komento 'show changed' näyttää asetukset, joiden arvo eroaa oletuksesta."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Joukkueita ei voi vaihtaa pelin alettua."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Parametriä ei ole määritelty. Käyttö: team <pelaaja> <joukkue>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 "Joukkuetta %s ei ole. Ole hyvä ja anna oikea joukkueen nimi tai numero."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Barbaarit eivät voi kuulua joukkueeseen."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Pelaaja %s on nyt joukkueessa %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Parametrejä ei ole määritelty. Käyttö: vote yes|no [äänestyksen nro]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Tarkkailijat eivät voi äänestää."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -6057,39 +6051,39 @@ msgstr ""
 "Voit äänestää vain käynnissä olevassa pelissä. Käytä 'first'-komentoa "
 "ryhtyäksesi pelinohjaajaksi jos sellaista ei ole."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Äänestys %d \"%s\": %d puolesta, %d vastaan"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Yhtään äänestystä ei ole käynnissä."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Kelvollista viimeisintä äänestystä ei ole."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Arvon pitää olla kokonaisluku."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Äänestystä %d ei ole."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Äänestit ehdotuksen \"%s\" puolesta."
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Äänestit ehdotusta \"%s\" vastaan"
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6097,448 +6091,475 @@ msgstr ""
 "Parametrejä ei ole määritelty. Käyttö: debug <diplomacy <pelaaja> | city <x> "
 "<y> | units <x> <y> | unit <id> | tech <pelaaja> | timing | info>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Komentoa voi käyttää vain pelin alettua."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "Pelaajan %s diplomatiaa ei enää debugata"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "Pelaajan %s diplomatiaa debugataan"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "Pelaajan %s teknologiaa ei enää debugata"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "Pelaajan %s teknologiaa debugataan"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 #, fuzzy
 msgid "Value 2 & 3 must be integer."
 msgstr "Arvon pitää olla kokonaisluku."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Karttakoordinaatit ovat epäkelvot."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Näissä koordinaateissa ei ole kaupunkia."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "Kohdetta %s ei enää debugata"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "Pelaajan %s %s ei ole enää debugattavana."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "Pelaajan %s %s on debugattavana."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Arvon 2 pitää olla kokonaisluku."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Yksikköä %d ei ole olemassa."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Argumenttia ei ole määritelty. Käyttö: set <asetus> <arvo>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Sinulla ei ole tarvittavia oikeuksia tämän asetuksen muuttamiseen."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Tätä asetusta ei voida muuttaa pelin alettua."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Arvon pitää olla kokonaisluku."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Arvon tulee olla välillä 0 - 1."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Asetus: %s on muutettu arvoon %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Virhe: Arvon tulee olla välillä %d - %d."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Merkkijonoarvo on liian pitkä. Käyttö: set <asetus> <arvo>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Asetus: %s on asetettu arvoon \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 #, fuzzy
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Tässä pelissä ei voi tarkkailla."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 #, fuzzy
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr "Tässä pelissä ei kontrolloida kuolleita pelaajia."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Ihmispelaajia ei voi kontrolloida tässä pelissä."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 #, fuzzy
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Pahoittelen, tässä pelissä ei voi seurata barbaareja."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 #, fuzzy
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Pahoittelen, tässä pelissä ei voi kontrolloida barbaareja."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 #, fuzzy
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Tässä pelissä ei seurata kuolleita pelaajia."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 #, fuzzy
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Tässä pelissä ei kontrolloida kuolleita pelaajia."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 #, fuzzy
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "AI-pelaajia ei seurata tässä pelissä."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 #, fuzzy
 msgid "Sorry, one can't take AI players in this game."
 msgstr "AI-pelaajia ei kontrolloida tässä pelissä."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 #, fuzzy
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Ihmispelaajia ei seurata tässä pelissä."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 #, fuzzy
 msgid "Sorry, one can't take human players in this game."
 msgstr "Ihmispelaajia ei voi kontrolloida tässä pelissä."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 #, fuzzy
 msgid "Sorry, one can't observe in this game."
 msgstr "Tässä pelissä ei voi tarkkailla."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 #, fuzzy
 msgid "Sorry, one can't take players in this game."
 msgstr "Tässä pelissä ei voi ottaa pelaajia haltuun."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 #, fuzzy
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "Jo yhdistettyjä pelaajia ei voi ottaa haltuun."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Käyttö: observe [yhteyden nimi] <pelaajan nimi>"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Käyttö: observe <pelaajan nimi>"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 "%s hallitsee jo pelaajaa %s. Jos käytät 'observea', poistat pelaajan %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s tarkkailee jo pelaajaa %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s on jo tarkkailija."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s tarkkailee nyt pelaajaa %s."
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s on nyt tarkkailija"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Käyttö: take <yhteyden nimi> <pelaajan nimi>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Käyttö: take <pelaajan nimi>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Käyttö: take [yhteyden nimi] <pelaajan nimi>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s hallitsee jo pelaajaa %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "En löydä pelaajaa enkä yhteyttä nimellä %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "irroittaudutaan pelaajasta %s."
 
-#: server/stdinhand.c:3076
+#: server/stdinhand.c:3135
 #, fuzzy, c-format
-msgid "%s now controls %s (%s, %s)"
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s hallitsee nyt pelaajaa %s."
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbaari"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "AI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Ihminen"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 #, fuzzy
 msgid "Alive"
 msgstr "Toiminnassa"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 #, fuzzy
 msgid "Dead"
 msgstr ", kuollut"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s ei ole yhteydessä pelaajiin."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Käyttö: detach <yhteysnimi>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Et voi irrottaa muita käyttäjiä."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s ei ole yhteydessä pelaajiin."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s irrottautuu pelaajasta  %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, fuzzy, c-format
 msgid "%s no longer observing."
 msgstr "Kohdetta %s ei enää debugata"
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "irrottaudutaan pelaajasta %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 #, fuzzy
 msgid "Usage: load <game name>"
 msgstr "Käyttö: load <tiedosto>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 #, fuzzy
 msgid "Cannot load a game while another is running."
 msgstr "Peliä ei voi ladata kun toinen peli on käynnissä."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, fuzzy, c-format
 msgid "Could not load savefile: %s"
 msgstr "Tallennetun pelin lataaminen tiedostosta %s ei onnistunut."
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Tämänhetkinen hakemistopolku sääntökokoelmille on: \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Säännöstökokoelmahakemistoa \"%s\" ei löydy"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, fuzzy, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "%s asetettu säännöstökokoelmahakemistoksi"
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "%s asetettu säännöstökokoelmahakemistoksi"
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Näkemiin."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Pahoittelen, sinulla ei ole lupaa käyttää palvelimen komentoja."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Varoitus: Kirjoitit '%s', tulkitsin sinun tarkoittaneen '%s', mutta muitakin "
 "vaihtoehtoja olisi. Ks. '%shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Tuntematon käsky. Ks. '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 #, fuzzy
 msgid "Your new vote canceled your previous vote."
 msgstr "Uusi äänesi peruutti edellisen äänesi."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, fuzzy, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Uuden äänen, nro %d, antoi %s: %s"
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Sinulla ei ole lupaa käyttää tätä komentoa."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(palvelinkehote)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 #, fuzzy
 msgid "Game ended in a draw."
 msgstr "Peli päättyi tasapeliin"
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Päätän pelin. Palvelin käynnistyy uudelleen, kun kaikki asiakasyhteydet on "
 "lopetettu."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "En voi lopettaa peliä: yhtään peliä ei ole käynnissä."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Et voi antautua nyt."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
+msgstr "Pelaajia ei ole tarpeeksi, peliä ei aloiteta."
+
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
 msgstr "Pelaajia ei ole tarpeeksi, peliä ei aloiteta."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Pelaajia ei ole tarpeeksi, peliä ei aloiteta."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Pelaajat ovat valmiina; aloitetaan peli."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "En voi aloittaa peliä: se odottaa kaikkien asiakasohjelmien katkaisevan "
 "yhteyden."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "En voi aloittaa peliä: se on jo käynnissä."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Katkaisen yhteyden %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6578,123 +6599,123 @@ msgstr ""
 "  save   -  tallenna tämänhetkinen peli\n"
 "  quit   -  poistu ohjelmasta"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Komento:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Yhteenveto: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Taso: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Seuraavat palvelinkomennot ovat saatavilla:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Avun argumentti '%s' ei ole yksiselitteinen."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Avun argumentille '%s' ei löytynyt vastinetta."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Kelvoton parametri komennolle 'list': '%s'. Ks. '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Pelaajaluettelo:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<ei pelaajia>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "käyttäjä %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", kuollut"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", vaikeusaste %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", valmis"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", ei valmis"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d yhteys:"
 msgstr[1] " %d yhteyttä:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s, yhteys %s (komentotaso %s), puskurikoko = %d kb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (tarkkailijamoodi)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Joukkueluettelo:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : '%s' : %d pelaaja"
 msgstr[1] "%2d : '%s' : %d pelaajaa"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 pelaaja : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Tyhjä joukkue: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Lista yhteyksistä palvelimeen:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<ei yhteyksiä>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Saatavilla olevat skenaariot:"
 
@@ -6765,17 +6786,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Teknologiatavoitteena on %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Varastat edistysaskeleen %s, kohteena %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%s varastivat edistysaskeleen %s sinulta!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%s varastivat edistysaskeleen %s, kohteena %s."
@@ -7310,20 +7331,20 @@ msgstr "Yritys rakentaa ihme kaupunkiin %s epäonnistui."
 msgid "Your %s has invalid orders."
 msgstr "Yksikkösi %s ohjeet ovat kelvottomat."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Paljon maa-alaa - tässä voi mennä jonkin aikaa."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Palaan generaattoriin %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "3-generaattori ei asettanut kaikkia suuria saaria paikalleen."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Generaattori 3 jätti %li maa-alasta sijoittamatta."
@@ -7417,120 +7438,121 @@ msgstr "Kenties asetuksissa tai käyttöoikeuksissa on vikaa"
 msgid "Cannot find audio file %s"
 msgstr "En löydä äänitiedostoa %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "XXX/XXX XXX vuoroa"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d kultaa joka vuoro"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d vuoro"
 msgstr[1] "%3d vuoroa"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "ei koskaan"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/vuoro"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d vuoro"
 msgstr[1] "%s (%d) %d vuoroa"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Vanhentunut"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Rakennettu"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Suuri ihme"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Pieni ihme"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/vuoro"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Asukkaat\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Verotettu kaupasta\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : Kauppareitti (%s)\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : Rakennuskymmenykset\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : %s-bonus  (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Hukka\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Epäjärjestys\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Käytetty\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : Yhteensä\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Ylijäämä yhteensä"
@@ -7642,8 +7664,8 @@ msgid "Best defending units"
 msgstr "Parhaat puolustusyksiköt"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7815,8 +7837,8 @@ msgstr "Saa"
 msgid "?cma:Governor"
 msgstr "Käskynhaltija"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -8085,19 +8107,19 @@ msgstr ""
 "Automaattinen yhdistäminen palvelimeen \"%s\", portti %d, nimellä \"%s\" %d.%"
 "d sekunnin välein %d kertaa"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "aloittelija"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "helppo"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "tavallinen"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "vaikea"
 
@@ -8105,31 +8127,31 @@ msgstr "vaikea"
 msgid "experimental"
 msgstr "kokeellinen"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Käynnistän palvelimen..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Palvelimen käynnistys epäonnistui."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Sinun pitää käynnistää palvelin käsin. Pahoittelen."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Palvelimeen yhdistäminen epäonnistui."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Sen käynnistäminen täältä käsin ei todennäköisesti onnistunut."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Me hallitsemme palvelinta (komentotaso hack)."
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "Palvelinta ei saada hallintaan, yritetään tappaa prosessi pois."
 
@@ -8216,27 +8238,27 @@ msgstr "Pätee vain yksikköön %s.\n"
 msgid "Requires a minimum size of %d.\n"
 msgstr "Vaatii minimikoon %d.\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "%s edellyttää tätä."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "%s mahdollistuu (lisäksi tarvitaan %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " joet"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "%s: Valitettavasti tälle ei ole ohjetta.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8247,7 +8269,7 @@ msgstr ""
 "Tämä sivu on luotu automaattisesti.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
@@ -8256,79 +8278,79 @@ msgstr ""
 "Edellyttää perusparannuksen %s.\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Kun %s keksitään, %s vanhentuu.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* Sallii pelaajien joilla on %s tuottaa %s-yksiköitä.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* %s mahdollistuu (lisäksi tarvitaan %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Mahdollistaa: %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, fuzzy, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "Et voi tutkia tätä teknologiaa."
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Voidaan rakentaa vain hallitusmuodolla %s.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Ei voida rakentaa kaupungeissa.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Aina kotikaupungiton.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Jos tämä yksikkö on menetetty, häviät pelin!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Kullakin pelaajalla voi olla vain yksi tämäntyyppinen yksikkö.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Tuottaminen vaatii väkiluvun %d.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, fuzzy, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Voi kantaa ja tankata %d ohjuksen.\n"
 msgstr[1] "* Voi kantaa ja tankata %d ohjusta.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Voi kantaa ja tankata %d ohjuksen.\n"
 msgstr[1] "* Voi kantaa ja tankata %d ohjusta.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Voi kuljettaa %d maayksikön veden yli.\n"
 msgstr[1] "* Voi kuljettaa %d maayksikköä veden yli.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8337,127 +8359,127 @@ msgstr ""
 "vähintään 9 ruudun päässä Manhattan-etäisyydellä (ruutujen reunoja, ei "
 "diagonaaleja pitkin laskien) yksikön kotikaupungista.\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Voi auttaa ihmeen valmistelussa (lisää %d tuotantoa).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Ei voida lakkauttaa.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Voidaan lakkauttaa kaupungissa, jolloin 50%% tuotantokuluista saadaan "
 "takaisin.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Voi perustaa uusia kaupunkeja.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Voi lisätä %d asukasta kaupunkiin, joiden koko on korkeintaan %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Voi rakentaa teitä ja rautateitä.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Voi rakentaa kaivoksia ruutuihin.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Voi rakentaa kastelujärjestelmän ruutuihin.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Voi rakentaa viljelysmaata.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Voi rakentaa viljelysmaata (jos %s tunnetaan).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Voi rakentaa peltomaata, jos jokin seuraavista tunnetaan: %s.\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Voi rakentaa linnakkeita.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Voi rakentaa linnakkeita, jos %s tunnetaan.\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Voi rakentaa linnakkeita, jos jokin seuraavista tunnetaan: %s.\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Voi siivota saastetta ruuduista.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Voi puhdistaa ydinlaskeumaa ruuduista.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Voi muuntaa ruutuja.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Voi rakentaa lentotukikohtia.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Voi linnoittautua ja saada täten 50%% bonuksen puolustukseensa.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Voi turmella ruutuja, tuhoten niihin rakennettua infrastruktuuria.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Pystyy normaalien diplomaattitoimien lisäksi erityisiin vakoilutehtäviin.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Voi hoitaa diplomaattisia tehtäviä.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Ei koskaan häviä diplomaattien välisiä taisteluja.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Ei voida lahjoa.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Voi hyökätä vihollisen ilmavoimia vastaan.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* On näkymätön paitsi aivan vihollisen yksikön tai kaupungin vieressä.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Voi hyökätä vain vesillä olevia yksiköitä vastaan (ei rannikolle).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
@@ -8465,43 +8487,43 @@ msgstr ""
 "* Voi hyökätä suoraan alukselta maissa olevaa kohdetta tai kaupunkia "
 "vastaan.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr ""
 "* Voidaan pudottaa laskuvarjolla ystävällismielisestä kaupungista "
 "(toimintasäde: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Kaksinkertaistaa puolustusvoimansa ratsastavia yksiköitä vastaan.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Lasketaan ratsastavaksi yksiköksi tiettyjä puolustajia vastaan.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 #, fuzzy
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "  * Tuhoutuu hyökkäyksessä.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Hyökkäys päättää tämän yksikön vuoron.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Tällä yksiköllä hyökkääminen aiheuttaa ydinräjähdyksen!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Saa kaksinkertaisen tulivoiman kaupunkeja vastaan.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ei piittaa kaupunginmuureista.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8511,38 +8533,38 @@ msgstr ""
 "vain aiheuttaa vahinkoa (eivät ole kuolemaksi) puolustajalle ja ne ovat "
 "hyökkääjän kannalta riskittömiä.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Saa viisinkertaisen puolustustehon kaikkea lentävää vastaan.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* On kotonaan maastossa kuin maastossa (kulkee kuten tiellä).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ei piittaa valvonta-alueista.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* Siviiliyksikkö (ei voi hyökätä; ei 'sotalakeja').\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 "* Hyökkäysase: aiheuttaa tyytymättömyyttä vaikkei olisikaan aggressiivinen.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
-msgstr "* Ei koskaan nouse veteraaniksi.\n"
+msgstr "* Ei koskaan muutu konkariksi.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
-"* Voi oppia veteraaniksi kerättyään kokemusta koulutuksen tai taistelun "
+"* Voi oppia konkariksi kerättyään kokemusta koulutuksen tai taistelun "
 "kautta.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8551,12 +8573,12 @@ msgstr ""
 "* Joutuu päättämään vuoronsa kaupunkiin tai rannikon läheisyyteen, tai "
 "katoaa merelle 50%% todennäköisyydellä.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* Kun %s on tunnettu, riski pienenee 25%%:ksi.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s vähentää riskin 12%%:iin.\n"
@@ -8565,15 +8587,15 @@ msgstr "* %s vähentää riskin 12%%:iin.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " tai "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr ", "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
@@ -8582,12 +8604,12 @@ msgstr[0] ""
 msgstr[1] ""
 "* Yksikön tulee olla kaupungissa (%s riittää myös) %d vuoron jälkeen.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Jos %s otettaisiin kohteeksi nyt, tarvitsisimme %d lamppua."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8596,90 +8618,90 @@ msgstr ""
 "Jotta %s saavutettaisiin, %d muuta teknologiaa pitää keksiä ensin. Koko "
 "projekti vaatii %d lamppua."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Et voi tutkia tätä teknologiaa."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr " Määrä voi vaihdella riippuen siitä mitä muut pelaajat tutkivat.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* Ensimmäinen pelaaja joka saavuttaa edistysaskeleen %s saa välittömästi "
 "ylimääräisen edistysaskeleen.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Pienentää alusten avomerellä menettämisen riskiä 25%%:iin.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Pienentää alusten avomerellä menettämisen riskiä 12%%:iin.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Lisää väestön aiheuttamaa saastumista.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Sallii %s-yksikön rakentaa teitä jokien yli.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Sallii %s-yksiköiden rakentaa linnakkeita.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Sallii %s-yksiköiden rakentaa lentotukikohtia.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Sallii %s-yksiköiden parantaa tiet rautateiksi.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Mahdollistaa %s-yksiköille kastellun maan muuttamisen pelloksi.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Tälle maastotyypille ei voi kehittyä saastetta."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Tälle maastotyypille ei voi rakentaa kaupunkeja."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Tämä maastotyypin rannikko on turvaton."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Yksiköiden ei ole turvallista kulkea tällä maastotyypillä."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Maayksiköt eivät voi kulkea merellisillä maastotyypeillä."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Ominaisuuksia:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8694,7 +8716,7 @@ msgstr[1] ""
 "* Poissa kotoa olevat sotilasyksiköt ja kenttäyksiköt tekevät %d asukasta "
 "tyytymättömäksi.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8704,30 +8726,30 @@ msgstr ""
 "muuten aiheuttaisivat.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* Maksat %d-kertaisesti %s ylläpitohinnan yksiköistäsi.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* Maksat %d-kertaisesti tavallisen ylläpitohinnan yksiköistäsi.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
@@ -8736,18 +8758,18 @@ msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr "* Kukin kaupungeistasi välttyy maksamasta %d yksikköjen ylläpitoon.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "* Sisällissodan todennäköisyys on %d%% jos menetät pääkaupunkisi.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8757,7 +8779,7 @@ msgstr ""
 "kaupunkiin kun sinulla on niitä %d.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, fuzzy, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8766,16 +8788,16 @@ msgstr ""
 "* Kun ensimmäinen kansakunnan koon takia tyytymätön asukas ilmaantuu, %d "
 "lisäkaupunkia aiheuttaa aina uuden tyytymättömän asukkaan.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr "Tieteen, veron ja luksuksen maksimiosuus on %d%%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "Tieteen/veron/luksuksen osuuksia ei ole rajoitettu.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, fuzzy, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8790,7 +8812,7 @@ msgstr[1] ""
 "* Yksikkösi voivat osallistua sotilashallintoon. Kukin sotayksikkö "
 "kaupungissa pakottaa %d tyytymätöntä asukasta tyytyväiseksi.\n"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, fuzzy, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8802,7 +8824,7 @@ msgstr[1] ""
 "kaupungissa.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8811,15 +8833,15 @@ msgstr ""
 "* Voit kasvattaa kaupunkejasi juhlinnalla. Kaupunkiesi koon on oltava "
 "vähintään %d ennen kuin ne voivat kasvaa tällä menetelmällä.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Yksikköjäsi ei voi lahjoa.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Kaupungeissasi ei voi lietsoa kapinaa.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8827,16 +8849,16 @@ msgstr ""
 "* Hallitusmuoto muuttuu anarkiaksi jos mikään kaupunki on rauhaton enemmän "
 "kuin kaksi vuoroa peräkkäin.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Hallitusmuotoon kuuluva edustajisto voi estää sodanjulistuksen.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 "* Mahdollistaa partisaanien vastustuksen kun vihollinen valtaa kaupungin.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
@@ -8844,25 +8866,25 @@ msgstr ""
 "* Rakennukset jotka tavallisesti poistavat tyytymättömyyttä tuottavat sen "
 "sijaan rahaa.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* Fanaatikkojen ylläpito ei maksa mitään.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* Tyytymättömiä asukkaita ei ole.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
-msgstr "* Tekee %s yksiköstä kokeneita.\n"
+msgstr "* Tekee %s yksiköstä konkareita.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
-msgstr "* Tekee yksiköistä kokeneita.\n"
+msgstr "* Tekee yksiköistä konkareita.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8870,7 +8892,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8878,72 +8900,72 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* %stuotanto menee suurelta määrin hukkaan.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* %stuotanto menee osittain hukkaan.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* %stuotanto menee vähäisessä määrin hukkaan.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* %shukka lisääntyy nopeasti etäisyyden pääkaupungista kasvaessa.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* %shukka lisääntyy etäisyyden pääkaupungista kasvaessa.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr "* %shukka lisääntyy hitaasti etäisyyden pääkaupungista kasvaessa.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Mahdollistaa %s-yksikköjen rakentamisen.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 #, fuzzy
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d tyytymätöntä"
@@ -9394,16 +9416,16 @@ msgstr "Palvelimen toimintomuuttuja: %s"
 msgid "Start of turn %d"
 msgstr "Vuoron %d alku"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "AI-moodi on nyt %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "päällä"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "pois päältä"
 
@@ -9434,13 +9456,13 @@ msgstr "Nimi"
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Lippu"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9454,7 +9476,7 @@ msgstr "Raja"
 msgid "Score"
 msgstr "Pisteet"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Joukkue"
 
@@ -9487,36 +9509,36 @@ msgstr "Jouten"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Et voi myydä parannuksia."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Myyty %d x %s, saatu %d kultaa."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "%s ei myytävissä"
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Et voi lakkauttaa yksiköitä."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "Yksikköä %s ei voi lakkauttaa."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Lakkautettiin %d %s-yksikköä."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Yhtään %s-yksikköä ei voitu lakkauttaa."
@@ -9824,64 +9846,69 @@ msgstr "Kultaa: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Vero: %d Luksus:%d Tiede:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Liikkuu: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Liikkuu: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Napsauttamalla lisätietoa)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s kansalaista"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Vuoro: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Kultaa: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Nettotulo: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Verot: Kulta:%d%% Luksus:%d%% Tiede:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Tutkittavana %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Ilmaston lämpenemisen todennäköisyys: %d%% (%+d%%/vuoro)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Ydintalven mahdollisuus: %d%% (%+d%%/vuoro)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Hallitusmuoto: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9889,55 +9916,55 @@ msgstr[0] "%d yksikkö"
 msgstr[1] "%d yksikköä"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr "Saavuttamaton"
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Vuoroja kohteeseen: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Vuoroja kohteeseen: %d - %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d yksikkö valittu"
 msgstr[1] "%d yksikköä valittu"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Ei valittua yksikköä."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Muut: %d siviiliä; %d sotayksikköä"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Muut: %d siviiliä"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Muut: %d sotayksikköä"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Yhtään ajanmukaistettavaa yksikköä ei ole."
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Yhtään yksikköä ei voitu ajanmukaistaa."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9952,72 +9979,72 @@ msgstr[1] ""
 "Ajanmukaista %s yksiköksi %s hintaan %d ?\n"
 "Valtion kassassa on %d."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Näyttää edistyksesi uusimman tutkimuskohteen kanssa."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "ei tutkimuskohdetta."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Näyttää maailmanlaajuisen lämpenemisen etenemisen:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Saastumisaste: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Näyttää ydintalven etenemisen:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Laskeuman määrä: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Katastrofitalven mahdollisuus vuorossa: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Näyttää nykyisen hallitusmuotosi:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Väkiluku:        %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Ylläpito:        %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energia:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -10025,96 +10052,96 @@ msgstr[0] "Massa:            %5d t"
 msgstr[1] "Massa:            %5d t"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Matka-aika:     %5.1f vuotta"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Matka-aika:     ei tiedossa"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Onnistumis-tn.:  %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Saapumisvuosi:   %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:off"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dmin %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dh %02dmin"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dpv %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:ylivuoto"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, fuzzy, c-format
 msgid "%s of the %s"
 msgstr "%2$s ja hallintomuotonsa %1$s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, fuzzy, c-format
 msgid "Observer: %s"
 msgstr " (tarkkailija)"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Rakennukset: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Ei yhtään. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr ". "
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Ihmeet: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Kaupungit: %d kaikkiaan, %d yli %d kaupungin kynnyksen."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10122,7 +10149,7 @@ msgstr[0] "%d rauhallista ennen vähennyksiä: "
 msgstr[1] "%d rauhallista ennen vähennyksiä: "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10130,16 +10157,16 @@ msgstr[0] "%d tyytymätöntä lisää."
 msgstr[1] "%d tyytymätöntä lisää."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Armeija pitää kuria ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "ei maksimia, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10147,20 +10174,20 @@ msgstr[0] "enintään %d yksikkö, "
 msgstr[1] "enintään %d yksikköä"
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d yksikköä kohden). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Sotilasyksiköt poissa kotoa voivat aiheuttaa tyytymättömyyttä. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Sotilasyksiköillä ei ole vaikutusta onnellisuuteen. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luksus: %d kaikkiaan."
@@ -10209,12 +10236,12 @@ msgstr ""
 "Käskynhaltija on hämmentynyt, käsittelyssä %s. Halunnet katsoa mitä on "
 "tekeillä."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "ei mitään"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "oma valinta"
 
@@ -10269,11 +10296,13 @@ msgid "Ooops..."
 msgstr "Hupsista..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Tätä yksikköä ei voi lahjoa!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10290,6 +10319,7 @@ msgstr "Lahjo vihollisen yksikkö"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10330,6 +10360,7 @@ msgstr "_Edistysaskeleet:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Vakoojan mielen mukaan"
 
@@ -10354,12 +10385,13 @@ msgstr "Valmistuneet _rakennushankkeet:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Kaupungin tuotanto"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Et voi lietsoa kapinaa kaupungissa %s."
@@ -10371,6 +10403,7 @@ msgstr "Kaupungissa ei voi lietsoa kapinaa!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10387,6 +10420,7 @@ msgstr "Järjestä kapina!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10396,6 +10430,7 @@ msgstr ""
 "Valtion kassassa on %d."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10465,10 +10500,12 @@ msgid "Subvert Enemy Unit"
 msgstr "Käännytä vihollisyksikkö"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr "Diplomaatti odottaa komentoasi"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr "Vakooja odottaa toimintaohjeita"
 
@@ -10568,7 +10605,7 @@ msgstr "Saasteet:"
 msgid "_Overview"
 msgstr "_Yleiskatsaus"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10593,11 +10630,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d vuoroa"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "O_sta"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr "_Tuotanto"
 
@@ -10716,7 +10753,7 @@ msgstr "Ylläpidettyjä yksiköitä %d"
 msgid "Present units %d"
 msgstr "Paikallaolevia yksiköitä %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Keskitä"
 
@@ -10806,31 +10843,31 @@ msgstr "Nimeä kaupunki uudelleen"
 msgid "What should we rename the city to?"
 msgstr "Mikä annetaan kaupungin uudeksi nimeksi?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "Vai_hda"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Lisää _ensimmäinen"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Lisää _seuraava"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Lisää _viimeinen"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "Va_litse"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr "_Näytä"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10840,12 +10877,12 @@ msgstr "_Näytä"
 msgid "Cities"
 msgstr "Kaupungit"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr "_Tarkasta"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10854,85 +10891,90 @@ msgstr "_Tarkasta"
 msgid "Improvements"
 msgstr "rakennushankkeet"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Ihmeet"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Kaikki kaupungit"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Ei yhtään kaupunkia"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Käänteinen valinta"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Yksiköiden teko"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Rakennushankkeet"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Ihmeiden rakennus"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Tekee yksikköä"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Rakentaa"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Rakentaa ihmettä"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Rannikkokaupungit"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Samalla saarella olevat kaupungit"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Ylläpidetyt yksiköt"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Läsnäolevat yksiköt"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Kaupungissa toteutetut hankkeet"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Kaupungin ihmeet"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Yksiköt saatavilla"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Rakennushankkeet saatavilla"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Ihmeet saatavilla"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Kokonaismenot: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10998,121 +11040,121 @@ msgstr "Minkä niminen tämän mallin tulisi olla?"
 msgid "Remove this preset?"
 msgstr "Poistetaanko tämä malli?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "Mene _kohteeseen"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr "_Tutki kaupunkia"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Haluat siis vallankumouksen?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Vallankumous!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Mitä turmellaan"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Valitse mitä haluat turmella:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Yksikkö"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Nimi"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Valitse yksikkö"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "Aktivoi kaikki"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "Leiriydy odotellessa"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
 msgstr "Kansakunta_ryhmät:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Mitä kansakuntaa haluat johtaa?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Kansakunnan valinta"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
 msgstr "_Satunnainen kansakunta"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Valitse kansakunta"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "Ominaisuudet"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "Johtaja:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "Nainen"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "Mies"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
 msgstr "Kaupunki_tyylit:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Kaikki ovat jotain sukupuolta."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Sinun on valittava kaupunkiesi rakennustyyli."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Kirjoita jokin järkevä nimi."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Ajanmukaista!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11376,60 +11418,66 @@ msgstr ""
 msgid "Not _ready"
 msgstr "_Ei valmis"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Valmis"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Aloita"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Ota tämä pelaaja"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Valitse ka_nsakunta"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_Tarkkaile"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr "Älä _tarkkaile"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<Aloittelija AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<Helppo AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<Tavallinen AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<Vaikea AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Satunnainen"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Tarkkailija"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Irrotettu"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Haluatko todella lopettaa?"
 
@@ -12352,217 +12400,217 @@ msgstr "_Yhdistä verkkopeliin"
 msgid "Connect to Gaming _Zone"
 msgstr "Yhdistä verkkopeliin"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Salasanat eivät täsmää, anna salasana."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Palvelimen nimi"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Portti"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versio"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Tila"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Pelaajat"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Lisätiedot"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Paikallisverkko (_LAN)"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Internet-metapalvelin"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "Palvelin:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "Kirjaudu sisään:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Sala_sana:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Vahv_ista salasana:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "_Yhdistä"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Yhteyden nimi: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Pelaajan nimi: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Palvelin: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Pelaaja/yht-tiedot"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s-tiedot"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Vaihda pelaajan valmiustilaa"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Valitse kansakunta"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Tarkkaile tätä pelaajaa"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Ota tämä pelaaja"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Katkaise yhteys"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 #, fuzzy
 msgid "Aitoggle player"
 msgstr "aitoggle <pelaajan nimi>"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Poista pelaaja"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, fuzzy, c-format
 msgid "Put on %s"
 msgstr "Väkiluku: %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr "AI-pelaajat sisältävät pelaajamäärä"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr "AI:n vaikeus_taso:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
 msgstr "Säännöstön _versio:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "_Lisää peliasetuksia..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 #, fuzzy
 msgid "Record"
 msgstr "Raportti"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 #, fuzzy
 msgid "Rating"
 msgstr "Odottaa"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Valmis"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Johtaja"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Valitse ladattava peli"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Valitse _ladattava peli:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Selaa..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Valitse skenaario"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Valitse _skenaario"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Yksikön tyyppi"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Valitse pelattava _kansakunta:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Valitse sijainti johon tallennetaan"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Tallenna peli"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Tallennetut _pelit:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Tallenna _tiedostoon:"
 
@@ -12597,7 +12645,7 @@ msgstr "Rakennus"
 msgid "Count"
 msgstr "Lukumäärä"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12822,6 +12870,9 @@ msgid ""
 "It might not work with other tilesets.\n"
 "You are currently using tileset %s."
 msgstr ""
+"Mod-paketti ehdottaa maapalagrafiikkasetin %s käyttöä\n"
+"Paketti ei välttämättä toimi muilla grafiikoilla.\n"
+"Käytät tällä hetkellä settiä %s."
 
 #: client/gui-gtk-2.0/wldlg.c:178
 msgid "new"
@@ -12839,28 +12890,28 @@ msgstr "Työ_listat:"
 msgid "Edit Global _Worklists"
 msgstr "Muokkaa maailmanlaajuisia _työlistoja"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Vuoroa"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "Tehtävät lähteestä:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Näytä tulevaisuuden kohteet"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Kohdetyölista"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "Lisää m_aailmanlaajuinen työlista"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Vaihda tuotantoa"
 
@@ -12872,12 +12923,12 @@ msgstr "Karavaanisi on saapunut perille kohteeseen %s"
 #: client/gui-sdl/caravan_dialog.c:157
 #, c-format
 msgid "Establish Traderoute with %s ( %d R&G + %d trade )"
-msgstr ""
+msgstr "Pystytä kauppareitti kohteeseen %s ( %d T&K + %d kauppaa )"
 
 #: client/gui-sdl/caravan_dialog.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "Enter Marketplace ( %d R&G bonus )"
-msgstr "Astu torille"
+msgstr "Astu torille ( %d T&K bonus )"
 
 #: client/gui-sdl/caravan_dialog.c:182 data/Freeciv.in:2263
 msgid "Help build Wonder"
@@ -12912,14 +12963,12 @@ msgid "Total users logged in : %d"
 msgstr "Käyttäjiä kirjautuneena sisään yhteensä : %d"
 
 #: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1094
-#, fuzzy
 msgid "Back"
-msgstr "Pankki"
+msgstr "Palaa"
 
 #: client/gui-sdl/chatline.c:832 data/Freeciv.in:3379
-#, fuzzy
 msgid "Start"
-msgstr "Tila"
+msgstr "Aloita"
 
 #: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
 #: client/gui-win32/connectdlg.c:775
@@ -12988,21 +13037,20 @@ msgstr ""
 "(konkari)"
 
 #: client/gui-sdl/citydlg.c:947
-#, fuzzy
 msgid ""
 "Disband if build\n"
 "settler at size 1"
-msgstr "Hylkää kaupunki jos uudisraivaaja rakennetaan kun koko on 1"
+msgstr ""
+"Hylkää kaupunki jos uudisraivaaja\n"
+"rakennetaan kun koko on 1"
 
 #: client/gui-sdl/citydlg.c:1171
-#, fuzzy
 msgid "Sorry, you have already bought here in this turn."
 msgstr "Olet jo ostanut jotain tällä vuorolla."
 
 #: client/gui-sdl/citydlg.c:1174
-#, fuzzy
 msgid "Sorry, you can't buy here in this turn."
-msgstr "Olet jo ostanut jotain tällä vuorolla."
+msgstr "Et voi ostaa täällä tällä vuorolla."
 
 #: client/gui-sdl/citydlg.c:1178
 msgid "Buy it?"
@@ -13156,8 +13204,8 @@ msgid "City shrinks: %d %s"
 msgstr "Kaupunki kutistuu: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13259,11 +13307,11 @@ msgstr "Varuskuntaraportti"
 msgid "Maintenance Report"
 msgstr "Ylläpitoraportti"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "työlista"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -13421,7 +13469,6 @@ msgid "Ready all"
 msgstr "Aktivoi kaikki"
 
 #: client/gui-sdl/dialogs.c:1483
-#, fuzzy
 msgid "Sentry idle"
 msgstr "Leiriydy odotellessa"
 
@@ -13482,9 +13529,8 @@ msgid "Sea map"
 msgstr "Merikartta"
 
 #: client/gui-sdl/diplodlg.c:563
-#, fuzzy
 msgid "Give embassy"
-msgstr "Lähetystö"
+msgstr "Myönnä lähetystö"
 
 #: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
 #: client/gui-win32/diplodlg.c:666 client/gui-xaw/diplodlg.c:478
@@ -13683,21 +13729,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Alustan asiakasohjelmaa"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Odotan pelin alkamista"
 
@@ -13779,7 +13825,7 @@ msgid "Intelligence Information for the %s Empire"
 msgstr "Tiedusteluraportti %s valtiosta"
 
 #: client/gui-sdl/inteldlg.c:289
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Ruler: %s %s  Government: %s\n"
 "Capital: %s  Gold: %d\n"
@@ -14520,9 +14566,9 @@ msgid "Couldn't find a supported gfx file extension for %s"
 msgstr "Tuettua grafiikkalaajennusta %s:lle ei löytynyt"
 
 #: client/gui-sdl/themespec.c:819
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't load gfx file %s for sprite %s"
-msgstr "Grafiikkalaajennuksen lataaminen tiedostolle %s ei onnistunut"
+msgstr "Grafiikkatiedoston %s lataaminen hahmolle (sprite) %s ei onnistunut"
 
 #: client/gui-sdl/themespec.c:970
 #, c-format
@@ -14548,7 +14594,7 @@ msgstr ""
 "estynyt!"
 
 #: client/gui-sdl/wldlg.c:902 client/gui-sdl/wldlg.c:1077
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "%d %s"
@@ -14990,7 +15036,7 @@ msgstr "Kaupunkien rakennustyyli:"
 msgid "Unit Selection"
 msgstr "Yksikön valinta"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "EI MITÄÄN"
 
@@ -15092,14 +15138,13 @@ msgid "Luxury: %d%%"
 msgstr "Luksus: %d%%"
 
 #: client/gui-win32/inteldlg.c:129 client/gui-xaw/inteldlg.c:242
-#, fuzzy
 msgid "Researching: (Unknown)"
-msgstr "Tutkittavana: %s(%d/%d)"
+msgstr "Tutkittavana: (Ei tiedossa)"
 
 #: client/gui-win32/inteldlg.c:132 client/gui-xaw/inteldlg.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "Researching: Unknown(%d/-)"
-msgstr "Tutkittavana: %s(%d/%d)"
+msgstr "Tutkittavana: Ei tiedossa(%d/-)"
 
 #: client/gui-win32/inteldlg.c:136 client/gui-xaw/inteldlg.c:249
 #, c-format
@@ -15468,13 +15513,13 @@ msgid "Only color displays are supported for now..."
 msgstr "Kyllä nykyään pitäisi jo käyttää värimonitoria..."
 
 #: client/gui-xaw/gui_main.c:375 client/gui-xaw/gui_main.c:396
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open fontset: %s"
 msgstr "Fontin lataaminen ei onnistunut: %s"
 
 #: client/gui-xaw/gui_main.c:378 client/gui-xaw/gui_main.c:399
 msgid "Doing 'xset fp rehash' may temporarily solve a problem."
-msgstr ""
+msgstr "Loitsu 'xset fp rehash' voi ratkaista ongelman väliaikaisesti."
 
 #: client/gui-xaw/gui_main.c:382 client/gui-xaw/gui_main.c:403
 #, c-format
@@ -15656,16 +15701,18 @@ msgid "Totals:                     %9d%9d%9d%9d"
 msgstr "Yhteensä:                     %9d%9d%9d%9d"
 
 #: manual/civmanual.c:120
-#, fuzzy, c-format
+#, c-format
 msgid "Could not write manual file %s."
-msgstr "Juontotiedostoon ('skripti') '%s' kirjoittaminen epäonnistui."
+msgstr "Opastiedoston %s kirjoittaminen epäonnistui."
 
 #: manual/civmanual.c:128
 #, fuzzy, c-format
 msgid ""
 "<h1>Freeciv %s server options</h1>\n"
 "\n"
-msgstr "Freeciv-palvelimen valinta"
+msgstr ""
+"<h1>Freeciv %s -palvelimen asetukset</h1>\n"
+"\n"
 
 #: manual/civmanual.c:144
 #, c-format
@@ -15693,11 +15740,13 @@ msgid "Can <b>not</b> be changed during a game. "
 msgstr "<b>Ei</b> voida muuttaa pelin aikana. "
 
 #: manual/civmanual.c:158
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<p class=\"bounds\">Minimum: 0, Default: %d, Maximum: 1</p>\n"
 "\n"
-msgstr "Arvo: %d, alaraja: 0, oletus: %d, yläraja: 1"
+msgstr ""
+"<p class=\"bounds\">Alaraja: 0, oletus: %d, yläraja: 1</p>\n"
+"\n"
 
 #: manual/civmanual.c:162 manual/civmanual.c:172
 #, c-format
@@ -15711,7 +15760,9 @@ msgstr "<p class=\"changed\">Arvo asetettu %d:ksi</p>\n"
 msgid ""
 "<p class=\"bounds\">Minimum: %d, Default: %d, Maximum: %d</p>\n"
 "\n"
-msgstr "Arvo: %d, alaraja: %d, oletus: %d, yläraja: %d"
+msgstr ""
+"<p class=\"bounds\">Alaraja: %d, oletus: %d, yläraja: %d</p>\n"
+"\n"
 
 #: manual/civmanual.c:177
 #, c-format
@@ -15763,11 +15814,13 @@ msgstr ""
 "\n"
 
 #: manual/civmanual.c:211
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<p>Description:</p>\n"
 "\n"
-msgstr "Kuvaus:"
+msgstr ""
+"<p>Kuvaus:</p>\n"
+"\n"
 
 #: manual/civmanual.c:218
 #, c-format
@@ -15784,43 +15837,36 @@ msgid "Resources"
 msgstr "luonnonvaroja"
 
 #: manual/civmanual.c:222
-#, fuzzy
 msgid "Move cost"
-msgstr "Vaikeakulkuisuus: %ld"
+msgstr "Läpikulku"
 
 #: manual/civmanual.c:222
-#, fuzzy
 msgid "Defense bonus"
-msgstr "Puolustuskyky:"
+msgstr "Puolustusbonus"
 
 #: manual/civmanual.c:224
-#, fuzzy
 msgid "Mining"
-msgstr "Mylly"
+msgstr "Kaivos"
 
 #: manual/civmanual.c:224
-#, fuzzy
 msgid "turns"
-msgstr "Vuoroa"
+msgstr "vuoroa"
 
 #: manual/civmanual.c:226
-#, fuzzy
 msgid "Rail"
-msgstr "Purjelaiva"
+msgstr "Rautatie"
 
 #: manual/civmanual.c:227
-#, fuzzy
 msgid "Clean pollution"
-msgstr "Korjaa ympäristötuhoja"
+msgstr "Poista saasteita"
 
 #: manual/civmanual.c:227
-#, fuzzy
 msgid "Clean fallout"
-msgstr "Korjaa ympäristötuhoja"
+msgstr "Poista laskeumaa"
 
 #: manual/civmanual.c:262 manual/civmanual.c:272
 msgid "impossible"
-msgstr ""
+msgstr "mahdotonta"
 
 #: manual/civmanual.c:295
 #, c-format
@@ -16165,10 +16211,8 @@ msgid "Pregame"
 msgstr "Peli ei ole alkanut"
 
 #: data/Freeciv.in:3350
-#, fuzzy
 msgid "Name              Ready Leader          Nation          "
-msgstr ""
-"Palvelimen nimi                     Portti Versio     Tila    Pelaajia Kuvaus"
+msgstr "Nimi             Valmis Johtaja         Kansakunta      "
 
 #: data/helpdata.txt:38
 msgid ""
@@ -16193,19 +16237,16 @@ msgid "  Present administrators: "
 msgstr "  Nykyiset vastuuhenkilöt: "
 
 #: data/helpdata.txt:55
-#, fuzzy
 msgid ""
 "If you find any bugs, then please send us a bug report.  This is best done "
 "by visiting the Freeciv Bug Tracking System, at:\n"
 "\n"
 "  http://bugs.freeciv.org/"
 msgstr ""
-"Löytäessäsi ohjelmointivirheen ole ystävällinen ja raportoi meillekin. "
-"Parhaiten tämä onnistuu Freecivin palautesivuilla osoitteessa \n"
-"\n"
-"  http://www.freeciv.org/cgi-bin/bugs\n"
+"Jos löydät ohjelmasta vian, raportoi se mieluusti meille. Parhaiten tämä "
+"onnistuu Freecivin buginseurantasivustolla: \n"
 "\n"
-"tai lähettämällä sähköpostia osoitteeseen  bugs at cvs.freeciv.org"
+"  http://bugs.freeciv.org/"
 
 #: data/helpdata.txt:60
 msgid ""
diff --git a/po/fr.gmo b/po/fr.gmo
index 962c038..7d2e706 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 9794fd7..72f8593 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 1.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-08-12 15:06+0300\n"
 "Last-Translator: Frederic Rodrigo <f.rodrigo free.fr>\n"
 "Language-Team: <freeciv-l10n-fr at yahoogroupes.fr>\n"
@@ -55,22 +55,22 @@ msgstr "Biens de luxe"
 msgid "Science"
 msgstr "Recherche"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "F"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "m"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:O"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "F"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "m"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -490,81 +490,81 @@ msgstr "Messages de connexion/d
 msgid "AI Debug messages"
 msgstr "Message de débogage de l'IA"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:Tueur"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:Belliqueux"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:Hostile"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:Pas Commode"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:Équivoque"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?attitude:Neutre"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:Respectueux"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:Coopératif"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:Enthousiaste"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:Admiratif"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:Idolâtre"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Armistice"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Guerre"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Cessez-le-feu"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Paix"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Alliance"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Jamais rencontré"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Partenariat"
 
@@ -614,13 +614,13 @@ msgstr "%s unit
 msgid "Size %d"
 msgstr "Taille %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Techno. Future %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -632,65 +632,65 @@ msgstr "Techno. Future %d"
 msgid "None"
 msgstr "Aucun"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Techno. Future"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Inconnu)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Route"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Irrigation"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Chemin de fer"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Mine"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Pollution"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Hutte"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Forteresse"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Rivière"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Ferme"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Base aérienne"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Retombée"
 
@@ -796,11 +796,11 @@ msgstr "Missile Nucl
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " et "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?and:, "
 
@@ -961,84 +961,84 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (total : %d répétitions)"
 msgstr[1] " (total : %d répétitions)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Argument vide pour \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Argument manquant pour \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d av. J.-C."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "FREECIV_PATH est spécifié mais vide; le chemin par défaut sera utilisé."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Impossible de lire le répertoire de données %s : %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "Le chemin d'accès aux données peut être spécifié par la "
 "variabled'environnement FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Le chemin actuel d'accès aux données est : \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Le fichier \"%s\" est nécessaire ... abandon!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 "%s : Erreur fatale : vous essayez de m'exécuter en tant que "
 "superutilisateur !\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Utilisez plutôt un compte non privilégié.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "correspondance exacte"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "correspondance unique"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "ambigu"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "vide"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "trop long"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "pas de correspondance"
 
@@ -1067,22 +1067,22 @@ msgstr "Les %s ont commenc
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s vend %s (inutile) pour %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (AI)* En mode \"away\" une IA ne peut signer un tel traité."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (IA)* Rompez d'abord votre alliance avec %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (IA)* D'abord, cessons les hostilités, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1090,48 +1090,48 @@ msgid ""
 msgstr ""
 "*%s (IA)* J'espère que vous respecterez durablement le cessez-le-feu, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 "*%s (IA)* Désormais je ne vous ferais plus confiance pour une alliance, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (AI)* Je ne connais pas la ville que vous mentionnez."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (IA)* Désolé, partager la vision avec vous est dangereux."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (IA)* Ce marché n'est pas très avantageux pour nous, %s !"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "%s (IA)* Bienvenue dans notre alliance %s !"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (IA)* Oui, puissions-nous rester unis à jamais, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (IA)* Oui, paix en notre temps !"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (IA)* Soit. Plus d'hostilités, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1140,23 +1140,23 @@ msgstr ""
 "*%s (IA)* Salutations %s ! Pouvons nous suggérer un cessez-le-feu tant que "
 "nous ne nous connaissons pas d'avantage ?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (IA)* L'espace ne sera jamais à vous. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "*%s (IA)* Je ne supporterais pas plus longtemps vos vicissitudes ! Guerre !"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (IA)* Paix ... une autre fois."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1165,18 +1165,18 @@ msgstr ""
 "*%s (IA)* Finalement je vous retrouve ! Pensiez-vous vraiment que vous "
 "pourriez vous en tirer avec vos crimes ?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 "*%s (IA)* Vos attaques sournoises me conduise à vous déclarer la guerre !"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (IA)* Votre agression contre %s sera votre dernière erreur !"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1191,7 +1191,7 @@ msgstr[1] ""
 "*%s (IA)* Nos allons nous engager dans une guerre totale contre %s dans %d "
 "tours pour stopper le lancement du vaisseau spatial."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1200,7 +1200,7 @@ msgstr ""
 "*%s (IA)* Votre aide ce faisait attendre. Longue vie à notre glorieuse "
 "alliance !"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1219,7 +1219,7 @@ msgstr[1] ""
 "allons lui demander des comptes dans %d tours, et nous attendons que vous "
 "honoriez votre traité et en faisant de même !"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1234,7 +1234,7 @@ msgstr[1] ""
 "*%s (IA)* Nous avons l'intention de saccager et piller la richesse de la "
 "civilisation %s. Nous déclarons la guerre dans %d tours."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1242,7 +1242,7 @@ msgstr ""
 "*%s (IA)* Si vous voulez votre part du butin, libre à vous de vous joindre à "
 "notre action !"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1257,14 +1257,14 @@ msgstr[1] ""
 "*%s (IA)*. Nous allons nous faire les %s. Allons mettre en déroute cette "
 "pathétique civilisation. Nous déclarons la guerre dans %d tours."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (IA)* Comme nos glorieux allies, nous comptons sur votre aide lors de "
 "cette guerre."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1279,7 +1279,7 @@ msgstr[1] ""
 "*%s (IA)* Nous allons honorer notre alliance et déclarer la guerre à %s dans "
 "%d tours. Faites place, on arrive !"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1294,7 +1294,7 @@ msgstr[1] ""
 "*%s (IA)* Nous allons honorer notre alliance avec %s et déclarer la guerre à "
 "%s dans %d tours. Nous nous attendons à ce que vous en fassiez de même."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1303,7 +1303,7 @@ msgstr ""
 "*%s (IA)* Votre tentative de conquérir l'espace pour vous seul trahit vos "
 "véritables intentions et je n'ai plus que faire de notre alliance !"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1312,7 +1312,7 @@ msgstr ""
 "*%s (IA)* Votre tentative de dominer l'espace de façon unilatérale est "
 "hautement offensante."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1321,12 +1321,12 @@ msgstr ""
 "*%s (IA)* Si vous ne cessez pas la construction de votre vaisseau spatial, "
 "je serai obligé de prendre des mesures !"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr "*%s (IA)* Désolé, partager la vision avec vous est devenu dangereux."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1335,7 +1335,7 @@ msgstr ""
 "*%s (IA)* Salutations ô notre allié le plus fiable, nous vous appelons à "
 "détruire notre ennemi, %s."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1344,7 +1344,7 @@ msgstr ""
 "*%s (IA)* Salutations allié, je vois que vous n'avez pas encore déclaré la "
 "guerre à notre ennemi, %s. Pourquoi dois-je vous rappeler vos promesses ?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1355,7 +1355,7 @@ msgstr ""
 "vivre en paix avec notre ennemi mortel, %s ! Ceci est inacceptable, notre "
 "alliance n'est plus !"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1364,14 +1364,14 @@ msgstr ""
 "*%s (IA)* Salutations ami, pouvons-nous suggérer de faire cause commune dans "
 "une alliance ?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "*%s (IA)* Salutations voisin, pouvons-nous suggérer des relations plus "
 "pacifiques ?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1380,7 +1380,7 @@ msgstr ""
 "*%s (IA)* Nous nous épuisons tout les deux dans un bain de sang continu. "
 "Pouvons-nous suggérer un arrêt des hostilités ?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1391,62 +1391,67 @@ msgstr ""
 "jamais !"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, c-format
 msgid "Auth option \"%s\":"
 msgstr "Option d'authentification \"%s\" :"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 " manquant dans le fichier de configuration (utilisation de la valeur par "
 "défaut)"
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr " (défaut)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr " (configuré)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr " (positionné)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr ""
 "Nom de fichier de configuration de l'authentification \"%s\" non autorisé !"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr ""
 "Impossible de charger le fichier de configuration de l'authentification \"%s"
 "\" !"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr "Attention: le nom d'invité \"%s\" a été pris, renommage en \"%s\"."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Les invités ne sont pas autorisés sur ce serveur. Désolé."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s a été rejeté : invités non autorisés."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1455,7 +1460,7 @@ msgstr ""
 "Il y a eu une erreur à la lecture de la base données des utilisateurs, "
 "entrée en tant que connexion invité \"%s\"."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1463,44 +1468,44 @@ msgstr ""
 "Il y a eu une erreur à la lecture de la base données des utilisateurs et les "
 "connexions d'invités ne sont pas autorisés. Désolé"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 "%s a été rejeté : problème de base de données et les invités ne sont pas "
 "autorisés."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Entrez le mot de passe pour %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Entrez un nouveau mot de passe (et souvenez-vous en)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Ce serveur n'autorise que les joueurs pré-enregistrés. Désolé."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr ""
 "%s a été rejeté : uniquement les joueurs préenregistrés sont autorisés."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Désolé, trop de mauvaises tentatives..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 "%s a été rejeté : trop de mauvaises tentatives de vérification du mot de "
 "passe pour un nouvel utilisateur."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1508,34 +1513,34 @@ msgstr ""
 "Attention: Il y a eu une erreur à la sauvegarde dans la base de données. On "
 "continue mais vos statistiques ne seront pas sauvegardées."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s a été rejeté : trop de mauvais mots de passe entrés."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Votre mot de passe est incorrect. Essayez encore."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Désolé, votre connexion a expiré ..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 "%s a été rejeté : expiration de la connexion durant l'attente du mot de "
 "passe."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 "Votre mot de passe est trop court, la longueur minimum est %d. Essayez "
 "encore."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2342,16 +2347,14 @@ msgid "Cast a vote."
 msgstr "Voter."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Un joueur avec le niveau info passant une commande de niveau contrôle initie "
 "un nouveau vote pour celle-ci.  La commande /vote suivie par \"yes\" ou \"no"
@@ -2361,7 +2364,7 @@ msgstr ""
 "complet se soit écoulé ou que plus de 50% des voix aient été exprimées pour "
 "ou contre."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2369,11 +2372,11 @@ msgstr ""
 "debug [ player <joueur> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<joueur> [ timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Active/désactive le débogage de l'IA pour l'entité donnée."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2381,23 +2384,23 @@ msgstr ""
 "Montre l'information de débogage IA à propos de l'entité donnée et active/"
 "désactive le débogage permanent pour cette entité."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <option> <valeur>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Règle les options du serveur."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <joueur> [équipe]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Change, ajoute ou supprime l'affiliation d'un joueur à une équipe."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2410,15 +2413,15 @@ msgstr ""
 "partagée et ambassades et qui combattent ensemble pour parvenir à une "
 "victoire d'équipe avec une moyenne des scores individuels."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "<répertoire> du jeu de règles"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Sélectionne un nouveau répertoire de jeu de règles."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2427,15 +2430,15 @@ msgstr ""
 " ou un modpack. Sans argument, montre le jeu de règles utilisé actuellement."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <meta-ligne>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Règle la chaîne d'information du métaserveur."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2448,19 +2451,19 @@ msgstr ""
 "messages générés automatiquement, s'il est disponible."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <meta-ligne>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Règle la chaîne des patches du métaserveur."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Contrôle la connexion au métaserveur."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2473,33 +2476,33 @@ msgstr ""
 "serveur."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <adresse>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Spécifie l'adresse (URL) de rapport du méta-serveur."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <nom-joueur>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Permute entre joueur et IA."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [nom-connexion] <nom-joueur>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Prend la place d'un joueur dans une partie."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2514,15 +2517,15 @@ msgstr ""
 "nouveau joueur est crée et assigné à la connexion."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [nom-connexion] [nom-joueur]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Observer un joueur ou une partie en entier."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2537,15 +2540,15 @@ msgstr ""
 "d'arguments, alors la connexion est attachée à un observateur global."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <nom-connexion>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "détachement d'un joueur."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2554,21 +2557,21 @@ msgstr ""
 "peuvent forcer d'autres connexions à se détacher d'un joueur."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <nom-joueur>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Crée un joueur IA avec le nom spécifié."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 "La commande \"create\" n'est disponible qu'avant le démarrage d'une partie."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2576,16 +2579,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Vous met en mode away. L'IA assurera vos arrières."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "L'IA gouvernera votre nation mais effectuera des changements minimes."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2593,11 +2596,11 @@ msgstr ""
 "novice\n"
 "novice <nom-joueur>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Règle le niveau d'un ou de tous les joueurs IA à \"novice\"."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2608,7 +2611,7 @@ msgstr ""
 "règle le niveau que du joueur IA concerné."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2616,11 +2619,11 @@ msgstr ""
 "easy\n"
 "easy <nom-joueur>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Règle le niveau du ou des joueurs IA à \"facile\"."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2631,7 +2634,7 @@ msgstr ""
 "règle le niveau que du joueur IA concerné."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2639,11 +2642,11 @@ msgstr ""
 "normal\n"
 "normal <nom-joueur>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Règle le niveau du ou des joueurs IA à \"normale\"."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2654,7 +2657,7 @@ msgstr ""
 "règle le niveau que du joueur IA concerné."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2662,11 +2665,11 @@ msgstr ""
 "hard\n"
 "hard <nom-joueur>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Règle le niveau du ou des joueurs IA à \"difficile\"."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2677,7 +2680,7 @@ msgstr ""
 "ne règle le niveau que du joueur IA concerné."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2685,11 +2688,11 @@ msgstr ""
 "experimental\n"
 "experimental <nom-joueur>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Règle un ou tous les joueurs IA à \"experimental\"."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2703,7 +2706,7 @@ msgstr ""
 "option n'a pas d'effet."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2717,11 +2720,11 @@ msgstr ""
 "cmdlevel <niveau> first\n"
 "cmdlevel <niveau> <nom-connexion>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Affiche ou règle le niveau de commande autorisé."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2766,21 +2769,21 @@ msgstr ""
 "connecter reçoit le statut de \"first\". Note : cette commande utilise à "
 "présent les noms de connexion, et plus les noms de joueurs."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 "S'il n'y en a pas déjà un, devient l'organisateur avec des droits augmentés."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <tour> <accr> <valeur> <multiplicateur>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "voir \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2792,24 +2795,24 @@ msgstr ""
 "0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Partie finissant par une égalité."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "se rendre"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "S'avouer vaincu."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2818,15 +2821,15 @@ msgstr ""
 "tous les joueurs (ou équipes) sauf un ont concédé la partie, elle ce termine."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <joueur>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Enlève complètement le joueur de la partie."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2835,7 +2838,7 @@ msgstr ""
 "villes et ses unités. A utiliser avec précaution!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2843,11 +2846,11 @@ msgstr ""
 "save\n"
 "save <nom-fichier>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Sauvegarde la partie dans le fichier."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2864,7 +2867,7 @@ msgstr ""
 "reconnectés."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2872,11 +2875,11 @@ msgstr ""
 "load\n"
 "load <nom-fichier>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Charge une partie depuis un fichier."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2885,31 +2888,31 @@ msgstr ""
 "compris joueurs, jeu de règles et options du serveur sont perdues.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <nom-fichier>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Exécute les commandes du serveur provenant du fichier."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <nom-fichier>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr ""
 "Sauvegarde les réglages actuels en tant que commandes du serveur dans un "
 "fichier."
 
 # AR
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Bascule la sortie du serveur entre \"RFC-STYLE\" et style normal."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Retourne l'identifiant du serveur."
 
@@ -3441,27 +3444,36 @@ msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr ""
 "%s a provoqué un incident diplomatique en fomentant une révolte dans %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "Les unités maritimes au démarrage ne sont pas encore supportées. Personne "
 "n'a de %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Année : %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr "Le timeout a dépassé sa valeur maximale, mis au maximum"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Le timeout est inférieur à zéro, mis à zéro."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Seul le client GGZ peut appeler civclient en mode ggz !\n"
 
@@ -3504,11 +3516,11 @@ msgstr "Il n'y a pas de connexion du nom de %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Il n'y a pas de joueur ou de connexion du nom de %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Un réchauffement de la planète vient d'avoir lieu!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
@@ -3516,17 +3528,17 @@ msgstr ""
 "Les côtes ont été inondées, et de vastes parcelles de prairie sont devenues "
 "désertiques."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Un hiver nucléaire vient d'avoir lieu!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Les marais se sont asséchés et de vastes parcelles de prairie se sont "
 "transformées en toundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3537,7 +3549,7 @@ msgstr ""
 "      Les travailleurs se rassemblent spontanément et modernisent toutes les "
 "villes pour l'utilisation du chemin de fer."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3548,12 +3560,12 @@ msgstr ""
 "      Les travailleurs se sont spontanément rassemblés et ont modernisé "
 "toutes les villes pour l'utilisation du chemin de fer."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Déplacement de %s suite à la transformation du terrain."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Démantèlement de votre %s suite à la transformation du terrain."
@@ -3617,27 +3629,27 @@ msgid "You should choose a new government from the government menu."
 msgstr ""
 "Vous devriez choisir un nouveau gouvernement dans le menu gouvernement."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Le taux d'imposition excède le maximum prévu pour %s; Ajusté."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Le taux de recherche excède le maximum prévu pour %s; Ajusté."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Le taux de luxe excède le maximum prévu pour %s; Ajusté."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s ne partage plus sa vue avec vous !"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3646,7 +3658,7 @@ msgstr ""
 "Le sénat ne vous permet pas de rompre le traité avec les %s. Vous devez "
 "dissoudre le sénat ou attendre un moment plus opportun."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
@@ -3654,7 +3666,7 @@ msgstr ""
 "Le Sénat vote votre proposition de loi en raison des provocations constantes "
 "des %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3663,12 +3675,12 @@ msgstr ""
 "Le sénat refuse de rompre le traité avec les %s, mais vous n'aurez aucun "
 "problème en mettant un nouveau sénat en place."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Les relations diplomatiques entre les %s et les %s sont maintenant %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3677,14 +3689,14 @@ msgstr ""
 " %s a rompu le pacte ! Les relations diplomatiques entre les %s et les %s "
 "sont maintenant %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 "%s a attaqué votre allié %s ! Vous annulez votre alliance avec l'agresseur."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3693,26 +3705,26 @@ msgstr ""
 "Votre coéquipier %s a déclaré la guerre avec %s. Vous êtes obligé d'annuler "
 "votre alliance avec %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Joueur %s retiré."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Vous avez été retiré de la partie !"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s a été retiré de la partie."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Vous avez établi un contact avec les %s, dirigés par %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3720,17 +3732,17 @@ msgstr ""
 "%s et %s se sont rencontrés, et celà a tourné à la guerre ! Vous annulez "
 "votre alliance avec les deux."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Impossible de plonger %s dans une guerre civile - trop de joueurs"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Impossible de plonger %s dans une guerre civile - trop de joueurs"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3739,12 +3751,12 @@ msgstr ""
 "Votre nation plonge dans la guerre civile; %s est déclaré chef des États "
 "rebelles."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s fait allégeance à %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3992,21 +4004,21 @@ msgstr "
 msgid "th"
 msgstr "ème"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "La chaîne \"demography\" contient des caractères invalides. Essayez \"help "
 "demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Bulletin Démographique :"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Désolé, le bulletin démographique n'est pas disponible."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%s des %s (%s)"
@@ -4017,11 +4029,11 @@ msgstr "%s des %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Impossible de trouver un fichier de règles lisible \"%s.%s\"."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr "Aucune nation barbare dans le jeu de règles, il en faut au moins une !"
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Chargement des jeux de règles"
 
@@ -4037,7 +4049,7 @@ msgstr ""
 "peut arriver avec de vieilles parties sauvegardées, ou bien peut indiquer un "
 "fichier de sauvegarde invalide. Continuez à vos risques et périls."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Sauvegarde trop ancienne, la version 1.9.0 ou supérieure est requise."
@@ -4061,13 +4073,13 @@ msgstr ""
 "sont plus supportés. Utilisation de \"%s\"."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4104,7 +4116,7 @@ msgstr "Internes"
 msgid "Networking"
 msgstr "Réseau"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Tout"
@@ -4125,7 +4137,7 @@ msgstr "Rare"
 msgid "Changed"
 msgstr "Changé"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4133,7 +4145,7 @@ msgstr ""
 "Les chaînes take autorisées contiennent des \n"
 "caractères invalides. Essayez \"help allowtake\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4141,7 +4153,7 @@ msgstr ""
 "La chaîne des unités initiales contient des \n"
 "caractères invalides. Essayez \"help startunit\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4151,15 +4163,15 @@ msgstr ""
 "au moins un fondateur de villes.  Essayez \n"
 "\"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr "Vous ne pouvez pas situer l'année de fin avant l'année courante."
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "Impossible de changer maxplayer dans le mode GGZ."
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -4168,11 +4180,16 @@ msgstr ""
 "Le nombre de joueurs est plus grand que la valeur requise; ancienne valeur "
 "conservée."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Vous n'êtes pas autorisé à régler cette option."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Taille de la carte (en milliers de cases)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4182,12 +4199,12 @@ msgstr ""
 "  size = 4 est une carte normale de 4000 cases (défaut)\n"
 "  size = 20 est une carte énorme de 20000 cases"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "L'index topologique de la carte"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4256,11 +4273,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Méthode utilisée pour générer la carte"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4280,11 +4297,11 @@ msgstr ""
 "positions de départ.  Si la valeur par défaut de startpos est utilisée alors "
 "startpos sera choisi en fonction du générateur.  Voir l'option \"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Méthode utilisée pour choisir les positions de démarrage"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4306,37 +4323,37 @@ msgstr ""
 "Note: les générateurs tentent de créer le nombre de continents adéquat en "
 "fonction de startpos et du nombre de joueurs"
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Présence d'îles de taille 1x1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = pas d'île de taille 1x1; 1 = des îles de taille 1x1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Les pôles sont-ils des continents distincts ?"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = les continents peuvent être reliés aux pôles; 1 = les pôles seront "
 "habituellement des continents distincts"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Toute la carte est tempérée"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = planète similaire à la Terre ; 1 = planète tempérée "
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Température moyenne de la planète"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4365,11 +4382,11 @@ msgstr ""
 "0 signifie une planète très froide avec de grandes zones polaires et pas de "
 "tropiques"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Pourcentage de la carte qui est de la terre ferme"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
@@ -4377,11 +4394,11 @@ msgstr ""
 "Ce réglage donne le pourcentage approximatif de la carte qui sera de la "
 "terre ferme."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Quantité de collines/montagnes"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4389,11 +4406,11 @@ msgstr ""
 "De petites valeurs donnent des cartes plates tandis que des valeurs plus "
 "élevées donnent du relief avec plus de collines et montagnes."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Quantité d'eau sur les terres"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4402,11 +4419,11 @@ msgstr ""
 "des valeurs plus grandes donnent des cartes plus humides avec plus de "
 "marécages, jungles et rivières."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Clé de génération aléatoire de la carte"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4416,11 +4433,11 @@ msgstr ""
 "sera choisie en fonction de la date, pour générer une carte aléatoire. Ce "
 "réglage n'est en général intéressant que lors de sessions de débogage."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Clé aléatoire du jeu"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4428,11 +4445,11 @@ msgstr ""
 "Pour zéro (le défaut) une clé sera choisie en fonction de la date. Ce "
 "réglage n'est en général intéressant que lors de sessions de débogage"
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Quantité de ressources \"spéciales\""
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4440,11 +4457,11 @@ msgstr ""
 "Les ressources spéciales améliorent le type de terrain sur lequel elles se "
 "trouvent. La variable représente le nombre pour mille."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Quantité de huttes (tribus mineures)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4453,23 +4470,24 @@ msgstr ""
 "carte. Les huttes sont de petits villages de tribus mineures qui peuvent "
 "être visités par les unités."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Nombre minimum de joueurs"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Il doit y avoir au moins ce nombre de joueurs (joueurs connectés ou IA) pour "
 "que la partie puisse commencer."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Nombre maximum de joueurs"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4480,11 +4498,11 @@ msgstr ""
 "nouveau joueur essayant de se connecter sera rejeté."
 
 # server/settings.c:
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Nombre de joueurs (y compris joueurs IA)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4492,11 +4510,11 @@ msgstr ""
 "Si positif, alors des joueurs IA seront automatiquement créés ou supprimés "
 "afin de garantir le nombre total de joueurs à cette valeur."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Liste des unités initiales des joueurs"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4524,28 +4542,28 @@ msgstr ""
 "    a   = Unité d'attaque rapide (par ex. Cavalier)\n"
 "    A   = Unité d'attaque lourde (par ex. Catapulte)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Aire dans laquelle les unités initiales sont positionnées"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "C'est le rayon à l'intérieur duquel les unités initiales sont dispersées."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Quantité initiale d'or par joueur"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Au début de la partie, cette somme d'or est attribuée à chaque joueur."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Nombre initial de technologies par joueur"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4557,11 +4575,11 @@ msgstr ""
 "la valeur de tech_cost_style dans le jeu de règles, une grande valeur pour "
 "techlevel peut rendre les prochaines technologies vraiment coûteuses."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Pourcentage multiplicateur du coût de la technologie"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4571,11 +4589,11 @@ msgstr ""
 "de technologie sont multipliés par cette valeur (pourcentage). Les valeurs "
 "de base sont déterminées par les règles ou par les réglages de la partie."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Pénalité lors d'un changement de tech"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4585,11 +4603,11 @@ msgstr ""
 "recherche positifs, vous perdez ce pourcentage de points de recherche. Ceci "
 "ne s'applique pas si vous venez d'obtenir une technologie ce tour."
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Pénalité lors de l'obtention d'une tech. ou d'or par un traité"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4602,11 +4620,11 @@ msgstr ""
 "des valeurs différentes de 0, vous pouvez finir avec des points de recherche "
 "négatifs. Aussi applicable aux transferts d'or dans le traités diplomatiques."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Pénalité lors de l'obtention d'une tech. par la conquête"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4617,11 +4635,11 @@ msgstr ""
 "Avec des valeurs différentes de 0, vous pouvez finir avec des points de "
 "recherche négatifs."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Pénalité lors de l'obtention d'une technologie gratuite"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4635,11 +4653,11 @@ msgstr ""
 "nouvelle découverte. Avec des valeurs différentes de 0, vous pouvez finir "
 "avec des points de recherche négatifs."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Nourriture requise pour la croissance d'une ville"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4649,12 +4667,12 @@ msgstr ""
 "grossisse. Cette valeur est multipliée par un autre facteur venant du jeu de "
 "règles et qui dépend de la taille de la ville."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Perte de nourriture (%) si aqueduc manquant"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4664,11 +4682,11 @@ msgstr ""
 "(ou de système d'égout), son stock de nourriture subit ce pourcentage de "
 "perte (ou la moitié si elle a un grenier)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Pourcentage multiplicateur pour le coût des productions"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4677,11 +4695,11 @@ msgstr ""
 "être produit. Les coûts de base sont multipliés par cette valeur "
 "(pourcentage)."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Taille minimum requise pour obtenir la totalité du commerce"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4694,11 +4712,11 @@ msgstr ""
 "de pénalité sauf la corruption normale) pour des tailles égales à "
 "fulltradesize. Voir aussi notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Taille maximum d'une ville sans commerce"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4709,11 +4727,11 @@ msgstr ""
 "graduellement pour les villes plus grandes que notradesize et plus petites "
 "que fulltradesize. Voir aussi fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Taille de la ville avant mécontentement"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4721,11 +4739,11 @@ msgstr ""
 "Avant les autres ajustements, les unhappysize premiers citoyens dans une "
 "ville sont contents et les suivants sont mécontents. Voir aussi cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Nbre de villes avant plus de mécontentement"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4738,11 +4756,11 @@ msgstr ""
 "Démocratie ; pour les autres gouvernements, l'effet se produit pour un plus "
 "petit nombre de villes."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Distance minimale entre les villes"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4756,11 +4774,11 @@ msgstr ""
 "chaque direction. Si la valeur vaut 0 (par défaut), la valeur du jeu de "
 "règles est utilisée."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Nombre de tours avant l'effet d'extase"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4768,11 +4786,11 @@ msgstr ""
 "Positionne le nombre de tours entre les croissance par extase de la ville. "
 "Si positionné à n, une ville grossira après n+1 tours en extase."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Chances de destruction bâtiment conquis"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4780,11 +4798,11 @@ msgstr ""
 "Lorsqu'un joueur conquiert une ville, chaque bâtiment a ce pourcentage de "
 "chances d'être détruit."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Chance d'aller sur la case attaquée"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4799,11 +4817,11 @@ msgstr ""
 "intermédiaire (entre 0 et 100), correspond au pourcentage de chance "
 "\"d'occuper\" le territoire."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Active/désactive l'auto-attaque serveur"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4812,11 +4830,11 @@ msgstr ""
 "automatiquement d'attaquer les unités ennemies qui bougent sur les cases "
 "adjacentes."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Population réduite après une attaque"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4833,11 +4851,11 @@ msgstr ""
 "  4 = hélicoptère\n"
 "  8 = par les airs"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Rayon des frontières nationales"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4848,12 +4866,12 @@ msgstr ""
 "règles spéciales s'appliquent aux cases d'océan ou aux cases dans la portée "
 "des villes de plus d'une nation."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr ""
 "Les unités à l'intérieur des frontières ne causent pas de mécontentement"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4861,12 +4879,12 @@ msgstr ""
 "Si actif, les unités ne causeront pas de mécontentement tant qu'elles "
 "restent à l'intérieur de vos propres frontières."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr ""
 "La capacité d'avoir des relations diplomatiques avec les autres joueurs"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4880,11 +4898,11 @@ msgstr ""
 "3 = la diplomatie est restreinte aux équipes.\n"
 "4 = la diplomatie est impossible pour tout le monde."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Noms de villes autorisés"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4911,11 +4929,11 @@ msgstr ""
 "nom de ville par défaut d'autres nations à moins qu'il soit également,par "
 "défaut pour sa propre nation."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Fréquence d'apparition des barbares"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4929,19 +4947,19 @@ msgstr ""
 "3 = fréquentes apparitions de barbares \n"
 "4 = hordes en furie, nombreux barbares"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Année d'apparition des barbares"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Les barbares n'apparaîtront pas avant cette année."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Longueur en tours d'une révolution"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4950,12 +4968,12 @@ msgstr ""
 "de tours a lieu. Positionner cette valeur à 0, rend cette duré aléatoire "
 "entre 1 et 6 tours."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Autoriser ou non le brouillard de guerre"
 
 # AR
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4966,11 +4984,11 @@ msgstr ""
 "verrez pas les nouvelles villes et transformations de terrain dans les zones "
 "non observées."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Chance de base pour les diplomates et les espions de réussir."
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4979,21 +4997,21 @@ msgstr ""
 "Chance pour un espion de revenir d'une mission réussie, et chance de base "
 "pour le succès des diplomates et des espions."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Autoriser ou non la course à l'espace"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr ""
 "Si cette option est mise à 1, les joueurs peuvent construire des vaisseaux "
 "spatiaux."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Nbre min. de villes pour une guerre civile"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -5003,11 +5021,11 @@ msgstr ""
 "et que sa capitale est capturée. Si cette option est réglée à sa valeur "
 "maximum, aucune guerre civile ne peut se déclencher."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Tours jusqu'à ce que le contact entre joueurs soit perdu"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -5018,12 +5036,12 @@ msgstr ""
 "même s'ils n'ont pas d'ambassade. Si cette option est positionnée à 0 les "
 "joueurs ne peuvent se rencontrer à moins qu'ils aient une ambassade."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Reconstruire le palais si la capitale a été conquise"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -5035,11 +5053,11 @@ msgstr ""
 "hasard. Ceci est significatif car le pré-requis technologique pour "
 "construire un palais est ignoré."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Utiliser ou non les noms de villes naturels"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -5047,11 +5065,11 @@ msgstr ""
 "Si activé, les noms de villes par défaut seront choisis en fonction du "
 "terrain environnant."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Joueurs dont les utilisateurs peuvent prendre la place"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -5120,11 +5138,11 @@ msgstr ""
 "4 = Pas de contrôleur autorisé, observateurs autorisés\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Statut IA automatique à la déconnexion"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5132,24 +5150,27 @@ msgstr ""
 "Si cette option est mise à 1, le statut IA est désactivé à la connexion d'un "
 "joueur et activé lorsqu'un joueur se déconnecte."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Dernière année de la partie"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "La partie se terminera à la fin de l'année donnée."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Nombre maximum de secondes par tour"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Si tous les joueurs n'ont pas pressé \"Fin du tour\" avant cette limite de "
 "temps, alors le tour se termine automatiquement. Zéro = pas de limite. Pour "
@@ -5157,11 +5178,11 @@ msgstr ""
 "sélectionne le mode de jeu automatique. Utilisez ceci avec la commande "
 "\"timeoutincrease\" pour avoir un minuteur dynamique."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "Temps restant au minimum lors d'un déplacement ennemie"
 
-#: server/settings.c:896
+#: server/settings.c:889
 #, fuzzy
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
@@ -5170,11 +5191,11 @@ msgstr ""
 "Chaque fois qu'une unités se déplace dans le champ de vision d'un ennemi, le "
 "temps restant est mis à cette valeur s'il est plus petit."
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Les joueurs jouent ils en même temps ?"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5182,11 +5203,11 @@ msgstr ""
 "À vrai, tous les joueurs ont leur phase de déplacement en même temps; à "
 "faux, les joueurs ont leur phase de jeu de façon alternative."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Nombre de secondes avant de bloquer la connexion d'un client"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5196,11 +5217,11 @@ msgstr ""
 "valeur, alors la connexion est close. Zéro signifie pas de timeout (quoique "
 "les déconnexions pourront éventuellement être faites automatiquement)."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Nombre maximum de secondes avant épuisement des buffers réseau"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5210,11 +5231,11 @@ msgstr ""
 "les buffers réseau des connexions des clients se débloquent. Zéro signifie "
 "que le serveur n'attendra pas du tout."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Nombre de secondes entre les PINGs"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5222,21 +5243,21 @@ msgstr ""
 "Le serveur rassemblera les clients par des requêtes PING après chaque "
 "période écoulée."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Temps pour déconnecter un client"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Si un client ne répond pas à un PING pendant cette durée, il est déconnecté."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Mode de jeu avec blocage de tour"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5244,11 +5265,11 @@ msgstr ""
 "Si cette option est à 1, game.info.turn n'est pas augmenté tant que tous les "
 "joueurs (même déconnectés) n'ont pas fini leur tour."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Durée limitée par tour"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5258,11 +5279,11 @@ msgstr ""
 "imparti au tour n'est pas terminé, même si tous les joueurs ont cliqué \"Fin "
 "du tour\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Contenu du rapport démographique"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5302,11 +5323,11 @@ msgstr ""
 "    b = afficher la colonne \"meilleure nation\"\n"
 "L'ordre de ces caractères n'est pas important, mais leur casse l'est."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Fréquence en tours des sauvegardes auto"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5314,11 +5335,11 @@ msgstr ""
 "La partie sera automatiquement sauvegardée au bout de ce nombre de tours.\n"
 "Zéro signifie pas de sauvegarde automatique."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Niveau de compression des sauvegardes"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5329,11 +5350,11 @@ msgstr ""
 "donnent une meilleure compression mais prennent plus de temps. Si le maximum "
 "est zéro, ce serveur n'a pas été compilé pour utiliser zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Préfixe pour les sauvegardes automatiques"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5341,11 +5362,11 @@ msgstr ""
 "Les sauvegardes automatiques auront le nom \"<préfixe><année>.sav\". Ce "
 "paramètre définit la partie <préfixe>."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Sauvegarde des statistiques des joueurs"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5359,7 +5380,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Le serveur ne peut pas lire l'entrée standard. Entrée ignorée."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Serveur: erreur d'adresse : [%s:%d]."
@@ -5505,91 +5526,91 @@ msgstr "
 msgid "Game saved as %s"
 msgstr "Partie sauvegardée sous %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "La partie est déjà en cours."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%s a perdu le niveau de contrôle cmdlevel suite au début de la partie. "
 "Utilisation du vote dorénavant."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Démarrage du jeu."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "requête d'un rapport inconnu (type %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Attention : rejet d'un ancien client %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr ""
 "Obtention d'un paquet de type %d provenant d'un joueur mort ou d'un "
 "spectateur"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Veuillez choisir un nom non vide."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Cette nation est déjà prise."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "Un autre joueur a déjà le nom \"%s\". Veuillez choisir un autre nom."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Veuillez choisir un nom ne contenant que des caractère ASCII."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "La nation %s n'est pas disponible pour ce scénario."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "La nation %s est déjà prise."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s est le chef %s %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "En attente du démarrage de la partie : %d joueurs sur %d sont prêts."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s a été ajouté en tant que joueur contrôlé par une IA de niveau %s."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Joueur %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s dirige les %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
@@ -5597,16 +5618,16 @@ msgstr ""
 "Ce civserveur a un support d'authentification des joueurs, mais il est "
 "actuellement desactivé."
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Envoi d'information au métaserveur [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "La partie est terminée..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Accepte dorénavant la connexion de nouveaux clients."
 
@@ -5627,7 +5648,7 @@ msgstr "(ambigu)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5807,7 +5828,7 @@ msgstr ""
 msgid "Removed player %s from the game."
 msgstr "Joueur %s retiré de la partie."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Le nom \"%s\" est interdit pour des raisons de sécurité."
@@ -5889,203 +5910,203 @@ msgstr ""
 "Impossible d'incrémenter le niveau de commande à \"%s\" ; vous n'avez vous-"
 "même que \"%s\"."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Niveau d'accès aux commandes à \"%s\" pour la connexion %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 "Le niveau d'accès aux commandes ne peut être à \"%s\" pour la connexion %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Niveau d'accès aux commandes à \"%s\" pour les nouveaux joueurs."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 "Niveau d'accès aux commandes à \"%s\" pour le premier joueur qui le prend."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 "La commande \"first\" n'a pas de sens depuis le ligne de commande du serveur."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Vous avez déjà le niveau d'accès \"%s\" ou plus élevé."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Quelqu'un d'autre est déjà l'organisateur."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "La connexion %s a choisi de devenir l'organisateur."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Argument %d invalide."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Utilisation : timeoutincrease <turn> <turnadd> <value> <valuemult>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Délai de jeu dynamique réglé sur %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Option :"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Description :"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "État : %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "modifiable"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fixe"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Valeur : %d, Minimum : 0, Défaut : %d, Maximum : 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Valeur : %d, Minimum : %d, Défaut : %d, Maximum : %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Valeur : \"%s\", Défaut : \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Explications disponibles pour les options suivantes du serveur :"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Pas encore d'explication pour ceci."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Nom d'option ambigu."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Opérateur du serveur: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Le joueur \"%s\" a maintenant le niveau IA \"%s\"."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s n'est pas contrôlé par l'IA."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Niveau IA par défaut positionné à \"%s\"."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Cette commande ne concerne que le client."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Utilisation : away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Uniquement les joueurs peuvent utiliser la commande away."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s mis en mode away."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s est revenu dans la partie."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Désolé, vous n'avez pas accès à l'option \"%s\"."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Erreur : option \"%s\" inconnue."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Toutes les options qui n'ont pas les valeurs pas défaut"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Toutes les options"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Options vitales"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Options occasionnelles"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Options rarement utilisées"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ signifie que vous pouvez modifier cette option"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= signifie que l'option a sa valeur par défaut"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s valeur  (min,max)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Option"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "description"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -6094,37 +6115,37 @@ msgstr ""
 "Essayez \"show changed\" pour voir les paramètres avec des valeurs autres "
 "que celles par défaut."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Impossible de modifier les équipes après le début de la partie."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Argument non défini. Usage : team <joueur> <équipe>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr "Pas d'équipe %s. Donnez un nom d'équipe ou un nombre valide."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Impossible d'affecter un barbare à une équipe."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Joueur %s assigné à l'équipe %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Arguments non définis. Usage : vote yes|no [n° de vote]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Les observateurs ne peuvent pas voter."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -6132,40 +6153,40 @@ msgstr ""
 "Vous pouvez uniquement voter en cours de partie. Utilisé \"first\" pour "
 "devenir l'organisateur, s'il n'y en a pas déjà un."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Vote %d \"%s\" : %d pour, %d contre"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Il n'y a pas de vote en cours."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Dernier vote illégal."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "La valeur doit être un entier."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Aucun vote %d."
 
 # AR
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Vous avez voté pour \"%s\""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Vous avez voté contre \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6173,438 +6194,467 @@ msgstr ""
 "Arguments indéfinis. Usage : debug <diplomacy <joueur> | city <x> <y> | "
 "units <x> <y> | unit <id>| tech <joueur> | timing | info>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Cette commande ne peut être utilisée qu'après le début de la partie."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "La diplomatie de %s n'est plus déboguée"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "La diplomatie de %s est deboguée"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "La technologie de %s n'est plus déboguée"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "La technologie de %s est deboguée"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Les valeurs 2 & 3 doivent être entières."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Mauvaises coordonnées."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Pas de ville à ces coordonnées."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s n'est plus débogué"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "%2$s de %1$s n'est plus débogué."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "%2$s de %1$s débogué."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "La valeur 2 doit être un entier."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "L'unité %d n'existe pas."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Argument non défini. Usage : set <option> <valeur>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Vous n'êtes pas autorisé à régler cette option."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Ce paramètre ne peut pas être modifié : la partie a commencé."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "La valeur doit être un entier."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr "Le paramètre %s devrait contenir seulement les chiffres 0-1."
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Valeur incorrecte (minimum : 0, maximum : 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Option : %s a été positionnée à %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 "Le paramètre %s devrait contenir seulement les signes +- et les chiffres 0-9."
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Valeur incorrecte (minimum : %d, maximum : %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Chaîne trop longue. Usage : set <option> <valeur>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Option : %s a été positionnée à \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Désolé, on ne peut pas être observateur global de cette partie."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 "Désolé, on ne peut prendre la place d'un observateur global. Observez-le "
 "plutôt."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr ""
+"Désolé, on ne peut pas prendre la place des joueurs humains dans cette "
+"partie."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Désolé, on ne peut pas observer les barbares dans cette partie."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr ""
 "Désolé, on ne peut pas prendre la place des barbares dans cette partie."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Désolé, on ne peut pas observer les joueurs morts dans cette partie."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr ""
 "Désolé, on ne peut prendre la place des joueurs morts dans cette partie."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Désolé, on ne peut pas observer les joueurs IA dans cette partie."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 "Désolé, on ne peut pas prendre la place des joueurs IA dans cette partie."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Désolé, on ne peut pas observer les joueurs humains dans cette partie."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 "Désolé, on ne peut pas prendre la place des joueurs humains dans cette "
 "partie."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Désolé, on ne peut pas observer dans cette partie."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Désolé, on ne peut pas prendre la place d'un joueur dans cette partie."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 "Désolé, on ne peut pas prendre la place des joueurs déjà connectés dans "
 "cette partie."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Utilisation : observe [nom-connexion [nom-joueur]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Utilisation : observe [nom-joueur]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s contrôle déjà %s. Utiliser \"observe\" supprimerait %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s observe déjà %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s est déjà un observateur."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s observe maintenant %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s est maintenant un observateur "
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Utilisation : take <nom-connexion> <nom-joueur>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Utilisation : take <nom-joueur>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Utilisation : take [nom-connexion] <nom-joueur>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s contrôle déjà %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Il n'y a pas de joueur ou de connexion du nom de %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "détachement de %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s contrôle maintenant %s (%s, %s)"
 
 # AR
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbare"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "IA"
 
 # AR
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Humain"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Vivant"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Mort"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s n'est attaché à aucun joueur."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Utilisation : detach <nom-connexion>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Vous ne pouvez pas détacher d'autres utilisateurs."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s n'est attaché à aucun joueur."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s détaché de %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s n'est plus un observateur."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "détachement de %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Utilisation : load <nom de la partie>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "Impossible de charger une partie pendant qu'une autre est active."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "Impossible de trouver la sauvegarde ou le scénario du nom de \"%s\"."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "Impossible de charger le fichier de sauvegarde : %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Le répertoire du jeu de règles actuel est : \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Le répertoire du jeu de règles \"%s\" n'a pas été trouvé"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Le répertoire du jeu de règles est déjà \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Le répertoire du jeu de règles est \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Au revoir."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Désolé, vous n'êtes pas autorisé à utiliser les commandes du serveur."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Attention : \"%s\" interprété comme \"%s\", mais ambigu. Essayez \"%shelp\"."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Commande inconnue. Essayez \"%shelp\"."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Votre nouveau vote a annulé le précédent."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Nouveau vote (numéro %d) par %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Vous n'êtes pas autorisé à utiliser cette commande."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(invite du serveur)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Partie finissant par une égalité."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Fin de la partie. Le serveur redémarrera une fois que tous les clients se "
 "seront déconnectés."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Impossible de terminer la partie : il n'y a pas de partie en cours."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s s'est avoué vaincu et ne peut plus dorénavant gagner la partie."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Vous ne pouvez pas congédier d'unité."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Pas assez de joueurs, partie non lancée."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Pas assez de joueurs, partie non lancée."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Pas assez de joueurs, partie non lancée."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Tous les joueurs sont prêts; la partie peut commencer."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "Impossible de lancer la partie : le jeu attend que tous les client se "
 "déconnectent."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Impossible de lancer la partie : elle est déjà en cours."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Coupure de la connexion %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6643,123 +6693,123 @@ msgstr ""
 "  save  - pour sauver la partie en cours\n"
 "  quit  - pour quitter"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Commande :"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Synopsis : "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Niveau : %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Les commandes suivantes du serveur sont disponibles :"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "L'argument \"%s\" de \"help\" est ambigu."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Pas de correspondance pour l'argument \"%s\" de \"help\"."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Mauvais argument pour \"list\" : \"%s\" . Essayez \"%shelp list\"."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Liste des joueurs :"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<aucun joueur>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "utilisateur %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Mort"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", niveau de difficulté %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", prêt"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", pas prêt"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d connexion :"
 msgstr[1] " %d connexions :"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s depuis %s (niveau de commande %s), taille du tampon=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (mode observateur)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Liste des équipes :"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : \"%s\" : %d joueur"
 msgstr[1] "%2d : \"%s\" : %d joueurs"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : \"%s\" : 1 joueur : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Équipe vide : %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Liste des connexions au serveur :"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<pas de connexions>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Liste des scénarios disponibles :"
 
@@ -6831,17 +6881,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Le but technologique est %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Vous avez volé %s aux %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "Les %s vous ont volé %s!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "Les %s ont volé %s aux %s."
@@ -7375,20 +7425,20 @@ msgstr "La tentative de construction de merveille 
 msgid "Your %s has invalid orders."
 msgstr "Votre %s a des ordres invalides."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Beaucoup de terres - cela risque de prendre quelques secondes."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Utilisation du générateur %d à la place."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Le générateur 3 n'a pas placé toutes les grandes îles."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Le générateur 3 a laissé %li terres non placées."
@@ -7479,120 +7529,121 @@ msgstr ""
 msgid "Cannot find audio file %s"
 msgstr "Impossible de trouver le fichier audio %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX tours"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d or par tour"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d tour"
 msgstr[1] "%3d tours"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "jamais"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d : %s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/tour"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d tour"
 msgstr[1] "%s (%d) %d tours"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Obsolète"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Construit"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Grande Merveille"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Petite Merveille"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/tour"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Habitants\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Provenant du commerce\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : Routes commerciales avec %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : Bonus des bâtiments\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : Bonus de %s (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Gaspillage\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Désordre\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Utilisé\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : Donnant un total de\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Surplus total"
@@ -7704,8 +7755,8 @@ msgid "Best defending units"
 msgstr "Meilleures unités défensives"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7875,8 +7926,8 @@ msgstr "?Pollution:Pol"
 msgid "?cma:Governor"
 msgstr "Gouverneur"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -8147,19 +8198,19 @@ msgstr ""
 "Autoconnexion au server \"%s\" port %d en tant que \"%s\" chaque %f secondes "
 "pendant %d essais"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "novice"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "facile"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "difficile"
 
@@ -8167,31 +8218,31 @@ msgstr "difficile"
 msgid "experimental"
 msgstr "expérimental"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Démarrage du serveur..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Impossible de démarrer le serveur."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Vous devez en démarrer un manuellement. Désolé..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Impossible de se connecter au serveur."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Il n'a probablement pas pu être démarré d'ici."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Nous avons le contrôle du serveur (niveau de commande hack)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 "Impossible de prendre le contrôle sur le serveur, tentative de le terminer."
@@ -8280,27 +8331,27 @@ msgid "Requires a minimum size of %d.\n"
 msgstr "Nécessite une taille minimum de %d.\n"
 
 # AR
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Autorise %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Autorise %s (avec %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Rivières"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Désolé, il n'y a pas de rubrique d'aide pour %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8311,86 +8362,86 @@ msgstr ""
 "Cette page est générée automatiquement.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr "Nécessite : rien\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* La découverte de %s va rendre %s obsolète.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* Permet à tous les joueurs connaissant %s de construire des %s.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Autorise %s (avec %s).\n"
 
 # AR
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Autorise %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Ne peut être construit qu'en présence de %s dans la ville.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Ne peut être construit que sous le gouvernement %s.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Ne peut pas être construit dans les villes.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* N'a jamais de ville de rattachement.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Perdre cette unité vous fera perdre la partie !\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Chaque joueur ne peut avoir qu'une seule unité de ce type.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Requiert une population de %d pour pouvoir être construit.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Peut transporter et ravitailler %d unités aériennes.\n"
 msgstr[1] "* Peut transporter et ravitailler jusqu'à %d unités aériennes.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Peut transporter et ravitailler %d missile.\n"
 msgstr[1] "* Peut transporter et ravitailler jusqu'à %d missiles.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Peut transporter %d unité terreste sur la mer.\n"
 msgstr[1] "* Peut transporter jusqu'à %d unités terrestres sur la mer.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8399,133 +8450,133 @@ msgstr ""
 "doit être à au moins 9 cases, en distance Manhattan, de la ville de "
 "support).\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr ""
 "* Peut aider à la construction de merveilles (ajoute %d de production).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Ne peut pas être congédié.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Peut être congédié dans une ville pour récupérer 50%% de son coût de "
 "production.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Peut fonder des villes.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 "* Peut ajouter %d de population aux villes en dessous de la taille %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Peut construire des routes et chemins de fer.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Peut construire des mines sur les cases.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Peut construire des irrigations sur les cases.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Peut construire une ferme.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Peut construire une ferme (si connaissance de %s).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 "* Peut construire des fermes (si connaissance de 1 au moins parmi %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Peut construire des forteresses.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Peut construire des fortresses (si connaissance de %s).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 "* Peut construire des forteresses (si connaissance de 1 au moins parmi %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Peut nettoyer la pollution des cases.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Peut nettoyer les retombées nucléaires.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Peut transformer les cases.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Peut construire des bases aériennes.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Peut se retrancher, obtenant un bonus défensif de 50%%.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Peut piller pour détruire les infrastructures des cases.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Peut effectuer le travail d'un diplomate, avec les compétences spéciales "
 "d'un espion.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Peut effectuer le travail d'un diplomate.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Ne perdra jamais un combat diplomate contre diplomate.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Ne peut pas être soudoyée.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Peut attaquer les unités aériennes.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* Est invisible sauf si adjacent à une unité ou ville ennemie.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 "* Ne peut attaquer que les unités sur des cases de mer (pas d'attaque sur "
 "terre).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
@@ -8533,40 +8584,40 @@ msgstr ""
 "* Peut attaquer directement depuis un navire : contre des villes ennemies et "
 "les cases terrestres.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Peut être parachuté depuis une ville amie (portée : %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Double les points de défense contre les unités dites \"montées\".\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Compte comme une unité \"montée\" contre certains défenseurs.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "  * Unité de type missile : est perdu lorsqu'il attaque.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Cette unité termine son tour lorsqu'elle attaque.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Attaquer avec cette unité engendre une explosion nucléaire!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Bénéficie d'une puissance de feu doublée en attaquant les villes.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignore les effets des remparts.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8576,40 +8627,40 @@ msgstr ""
 "qu'endommager (jamais tuer) le défenseur mais sont sans risque pour "
 "l'attaquant.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Quintuple ses points de défense contre les missiles et les avions.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 "* Ignore les différences entre types de terrain (traite toutes les cases "
 "comme des routes).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignore les zones de contrôle.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* Unité non militaire (ne peut attaquer ; pas de loi martiale).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 "* Une unité de campagne : crée du mécontentement, même si elle n'est pas "
 "agressive.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* N'obtiendra jamais le statut de vétéran.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Peut devenir vétéran par voie d'entraînement ou du combat.\n"
 
 # AR
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8618,12 +8669,12 @@ msgstr ""
 "* Doit terminer son tour dans une ville ou près des terres, ou bien a 50%% "
 "de chances de disparaître en mer.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* La découverte de %s réduit le risque à 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s réduit le risque à 12%%.\n"
@@ -8632,28 +8683,28 @@ msgstr "* %s r
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " ou "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?ou:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* L'unité doit être dans une ville ou %s après %d tour.\n"
 msgstr[1] "* L'unité doit être dans une ville ou %s après %d tours.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr ""
 "Si nous commencions maintenant avec %s nous aurions besoin de %d ampoules."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8662,91 +8713,91 @@ msgstr ""
 "Afin d'obtenir %s nous devons auparavant obtenir %d autre(s) technologie(s). "
 "La completion de l'ensemble du projet requiert %d ampoule(s)."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Vous ne pouvez pas rechercher cette technologie."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 " Ce nombre peut varier selon les recherches faites par les autres joueurs.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* Le premier joueur qui découvre %s obtient immédiatement une découverte.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Ramène la chance de perdre des bateaux en haute mer à 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Ramène la chance de perdre des bateaux en haute mer à 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Accroît la pollution générée par la population.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Permet aux %s de construire des routes sur les rivières.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Permet aux %s de construire des forteresses.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Permet aux %s de construire des bases aériennes.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Permet aux %s de transformer les routes en chemin de fer.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Permet aux %s de transformer les zones irriguées en champs.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Aucune pollution ne peut apparaître sur ce terrain."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Vous ne pouvez pas construire de ville sur ce terrain."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Les lignes côtières de ce terrain sont dangereuses."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Ce terrain est dangereux pour les unités qui s'y déplacent."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr ""
 "* Les unités terrestres ne peuvent se déplacer sur les terrains océaniques."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Caractéristiques :\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr " vide "
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8761,7 +8812,7 @@ msgstr[1] ""
 "* Les unités militaires loin de leur base et les unités de campagne "
 "causeront %d citoyens mécontentements.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8771,30 +8822,30 @@ msgstr ""
 "par les unités.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* Vous payez %d fois l'entretien normal en %s pour vos unités.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* Vous payez %d fois l'entretien normal pour vos unités.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* Vous ne payez pas %s pour l'entretien de vos unités.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* Vous ne payez pas l'entretien de vos unités.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
@@ -8803,12 +8854,12 @@ msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr "* Chaque ville devra payer %d pour l'entretien des unités.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
@@ -8816,7 +8867,7 @@ msgstr ""
 "capitale.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8826,7 +8877,7 @@ msgstr ""
 "civilisation apparaît quand vous avez %d villes.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8835,18 +8886,18 @@ msgstr ""
 "* Après le premier citoyen mécontent dû à la taille de la ville, pour chaque "
 "%d villes supplémentaires, un autre citoyen mécontent apparaîtra.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 "Le taux maximum que vous pouvez affecter à la science, l'or ou le luxe est %d"
 "%%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "Pas de limite pour les taux de science/or/luxe.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, fuzzy, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8861,7 +8912,7 @@ msgstr[1] ""
 "* Vous unités peuvent imposer la loi martiale. Chaque unité militaire à "
 "l'intérieur d'une ville forcera %d citoyens mécontents à devenir content.\n"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, fuzzy, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8873,7 +8924,7 @@ msgstr[1] ""
 "martiale.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8882,15 +8933,15 @@ msgstr ""
 "* Vous pouvez faire grossir vos villes par l'extase.  Elles doivent être au "
 "moins de taille %d avant de pouvoir grossir de cette manière.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Vos unités ne peuvent pas être soudoyées.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Vos villes ne peuvent pas être incitées à la révolte.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8898,16 +8949,16 @@ msgstr ""
 "* Le gouvernement tombera en anarchie si une ville reste en désordre civil "
 "plus de deux tours d'affilée.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Avoir un sénat peut empêcher de déclarer la guerre.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 "* Des partisans sont créés quand les villes sont prises par l'ennemi.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
@@ -8915,25 +8966,25 @@ msgstr ""
 "* Les bâtiments qui habituellement confèrent un bonus contre le "
 "mécontentement produiront de l'or à la place.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* Ne paye pas d'entretien pour les fanatiques.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* N'a pas de citoyen mécontent.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* %s unités vétérantes.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Unité vétérante.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8943,7 +8994,7 @@ msgstr ""
 "quand la ville n'est pas en extase.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8953,74 +9004,74 @@ msgstr ""
 "quand la ville est en extase.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 "* Chaque case travaillée avec au moins 1 %s en rendra %d supplémentaires.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* La production de %s est augmenté de %d%%.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* La production de %s sera grandement sujette au gaspillage.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* La production de %s sera sujette au gaspillage.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* La production de %s sera un petit peu sujette au gaspillage.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 "* Le gaspillage de %s augmentera rapidement avec la distance à la capitale.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* Le gaspillage de %s augmentera avec la distance à la capitale.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 "* Le gaspillage de %s augmentera peu suivant la distance à la capitale.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Vous permet de construire %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d mécontents"
@@ -9476,16 +9527,16 @@ msgstr "Cha
 msgid "Start of turn %d"
 msgstr "Début du tour %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "L'IA est maintenant %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "activée"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "désactivée"
 
@@ -9516,13 +9567,13 @@ msgstr "?joueur:Nom"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Drapeau"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9537,7 +9588,7 @@ msgid "Score"
 msgstr "Score"
 
 # AR
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Équipe"
 
@@ -9570,36 +9621,36 @@ msgstr "?dialogue_joueurs:Inactif"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Vous ne pouvez pas vendre de bâtiment."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Vente de %d %s pour %d lingots."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Aucun %s n'a pu être vendu."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Vous ne pouvez pas congédier d'unité."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s ne peut pas être congédié."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Congédié %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Aucun %s n'a pu être congédié."
@@ -9910,64 +9961,69 @@ msgstr "Or : %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Tax : %d Lux : %d Sci : %d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Déplacement : %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Déplacement : %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Cliquez pour plus d'info)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s Personnes"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Tour: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Or: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Revenu brut : %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Taxes : Or:%d%% Luxe:%d%% Science:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Recherche %s : %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Chance de réchauffement de la planète : %d%% (%+d%%/tour)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Chance d'un hiver nucléaire : %d%% (%+d%%/tour)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Gouvernement: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9975,55 +10031,55 @@ msgstr[0] "%d unit
 msgstr[1] "%d unités"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr "Inatteignable"
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Tours jusqu'à la cible : %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Tours jusqu'à la cible : %d à %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d unité sélectionnée"
 msgstr[1] "%d unités sélectionnées"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Pas d'unité sélectionnée."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Autres : %d civil ; %d militaire"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Autres : %d civil"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Autres : %d militaire"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Aucune unité à mettre à jour !"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Aucune de ces unités ne peut être mise à jour."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -10038,72 +10094,72 @@ msgstr[1] ""
 "Transformer %d unités pour %d lingots ?\n"
 "Les finances sont à %d lingots."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Montre l'avancement dans la recherche de la technologie courante."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "pas d'objectif de recherche."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s : %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Montre la progression du réchauffement planétaire :"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Taux de pollution : %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Probabilité d'un réchauffement catastrophique à chaque tour :  %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Montre la progression de l'hiver nucléaire :"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Taux de retombées : %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Probabilité d'un hiver catastrophique à chaque tour :  %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Montre votre gouvernement actuel :"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Population :    %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Support :       %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Énergie :        %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -10111,97 +10167,97 @@ msgstr[0] "Masse :            %5d tonne"
 msgstr[1] "Masse :            %5d tonnes"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Durée voyage :    %5.1f années"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Durée du voyage :   ND     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Prob. de succès : %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Année d'arrivée :  %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:off"
 
 # AR : contexte
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?jrs/hrs:%02dj %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:débordement"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s des %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Observateur : %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Constructions : "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Aucun. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Merveilles : "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Villes : %d au total, %d au-dessus du seuil de %d villes."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10209,7 +10265,7 @@ msgstr[0] "%d heureux avant une p
 msgstr[1] "%d heureux avant une pénalité de "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10217,16 +10273,16 @@ msgstr[0] "%d citoyens m
 msgstr[1] "%d citoyens mécontents supplémentaires."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Loi martiale effective ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "pas de maximum, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10234,20 +10290,20 @@ msgstr[0] "%d unit
 msgstr[1] "%d unités au maximum, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d par unité). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Les unités militaires en campagne peuvent causer du mécontentent. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "La présence d'unités militaires n'a pas d'effet sur le bonheur. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luxe : %d au total."
@@ -10296,12 +10352,12 @@ msgid ""
 "have a look."
 msgstr "Le gouverneur s'est embrouillé en gérant %s. Vous devriez intervenir."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "Aucun"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "Réglable"
 
@@ -10355,11 +10411,13 @@ msgid "Ooops..."
 msgstr "Oups..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Cette unité ne peut pas être soudoyée !"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10376,6 +10434,7 @@ msgstr "Corrompre l'unit
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10416,6 +10475,7 @@ msgstr "_D
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Au choix de l'espion"
 
@@ -10440,12 +10500,13 @@ msgstr "B
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Production de la ville"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Vous ne pouvez pas inciter une révolte dans %s."
@@ -10457,6 +10518,7 @@ msgstr "Vous ne pouvez pas inciter une r
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10473,6 +10535,7 @@ msgstr "Inciter 
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10482,6 +10545,7 @@ msgstr ""
 "Les finances sont à %d lingots."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10551,11 +10615,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Corrompre une unité ennemie"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Monsieur, le diplomate attend vos ordres"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Monsieur, l'espion attend vos ordres"
@@ -10656,7 +10722,7 @@ msgstr "Pollution :"
 msgid "_Overview"
 msgstr "Aperçu gl_obal"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10681,11 +10747,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d tours"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "A_cheter"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "Pro_duction"
@@ -10805,7 +10871,7 @@ msgstr "Unit
 msgid "Present units %d"
 msgstr "Unités présentes %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "C_entrer"
 
@@ -10894,32 +10960,32 @@ msgstr "Renommer la ville"
 msgid "What should we rename the city to?"
 msgstr "Quel nom doit porter cette ville ?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "C_hanger"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Ajouter en _premier"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Ajouter à la s_uite"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Ajouter en der_nier"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Sélectionner"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "_Montrer"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10929,13 +10995,13 @@ msgstr "_Montrer"
 msgid "Cities"
 msgstr "Villes"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "_Fenêtre"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10944,87 +11010,92 @@ msgstr "_Fen
 msgid "Improvements"
 msgstr "Améliorations"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Merveilles"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Toutes les villes"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Pas de Villes"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Inverser la sélection"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Unités en construction"
 
 # AR
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Bâtiments en construction"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Merveilles en construction"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Unités en construction"
 
 # AR
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Bâtiments en construction"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Merveilles en construction"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Villes côtières"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Même île"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Unités supportées"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Unités présentes"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Bâtiments dans la ville"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Merveilles présentes"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Unités disponibles"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Bâtiments disponibles"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Merveilles disponibles"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Coût total : "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -11091,127 +11162,127 @@ msgstr "Quel nom doit porter le pr
 msgid "Remove this preset?"
 msgstr "Supprimer ce pré-réglage ?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "A_ller vers"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "Fenêtre _ville"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Vous voulez faire la révolution ?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Révolution !"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Quoi piller"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Choisissez ce que vous voulez piller :"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Unité"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Nom"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Choix de l'unité"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "P_réparer tous"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "Veiller les unité_s inactives"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Nations :"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Quelle nation voulez-vous être ?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Prendre un nation"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Nation aléatoire"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Choisissez une nation"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Propriétés"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Chef :"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Femme"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "Ho_mme"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "Styles des _villes:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "Lég_ende"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Vous devez choisir entre homme ou femme."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Vous devez choisir le style de vos villes."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Vous devez taper un nom valide."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Mettre à jour l'unité !"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11473,60 +11544,66 @@ msgstr ""
 msgid "Not _ready"
 msgstr "Pas p_rêt"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "P_rêt"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Démarrage"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Prendre ce joueur"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Prendre une _nation"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_Observateur"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr "Ne pas _observer"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<IA>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<IA novice>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<IA facile>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<IA normal>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<IA difficile>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Aléatoire"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Observateur"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Détaché"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Voulez-vous vraiment quitter?"
 
@@ -12444,217 +12521,217 @@ msgstr "Se c_onnecter 
 msgid "Connect to Gaming _Zone"
 msgstr "Se connecter à Gaming _Zone"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Les mots de passe ne correspondent pas, entrez le mot de passe."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Nom du serveur"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Version"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Statut"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Joueurs"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Commentaire"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Réseau loc_al"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "_Métaserveur internet"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Port :"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Login :"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Mot de passe (_w):"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Conf_irmer le mot de passe:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "C_onnexion"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Nom de connexion : %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Nom du joueur : %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Hôte : %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Info joueur/connect"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s info"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Permuter joueur prêt"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Prendre une nation"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Observer ce joueur"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Prendre ce joueur"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Couper la connexion"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "Permuter entre IA et jouer"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Retirer le Joueur"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Donner le niveau d'accès info"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "Donner le niveau d'accès ctrl"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "Ajouté dans %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "Nombre de _joueurs (y compris IA) :"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "Niveau de l'I_A :"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "Jeu de _règles :"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Plus d'_options..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Enregistré"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Classement"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Prêt"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Chef"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Choisissez la partie à charger"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Choisissez _la partie à charger :"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Parcourir..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Choisissez un scénario"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Choisissez un _scénario :"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Type"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Choisissez une _nation à diriger :"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Choisissez l'endroit où sauvegarder"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Sauvegarder la partie"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Parties sauve_gardées :"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Sauvegarder le _fichier :"
 
@@ -12689,7 +12766,7 @@ msgstr "Nom"
 msgid "Count"
 msgstr "Nombre"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12935,28 +13012,28 @@ msgstr "Listes de _travail :"
 msgid "Edit Global _Worklists"
 msgstr "_Modifier les listes de travail globales"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Tours"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "_Tâches possibles :"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "_Montrer les objectifs futurs"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Liste de travail envisagée (_W) :"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "A_jouter une liste de travail globale"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Changer la _production"
 
@@ -13251,8 +13328,8 @@ msgid "City shrinks: %d %s"
 msgstr "Réduction de la ville : %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13354,11 +13431,11 @@ msgstr "Rapport de garnison"
 msgid "Maintenance Report"
 msgstr "Rapport de maintenance"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "liste de travail"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -13782,21 +13859,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr "  -t,  --theme THEME\tUtilise le thème GUI THEME\n"
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr "Créée la copie d'écran fc_%05d.bmp"
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Utilisation de la sortie vidéo : %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Initialisation du client"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "En attente du début de la partie"
 
@@ -15106,7 +15183,7 @@ msgstr "Styles des villes :"
 msgid "Unit Selection"
 msgstr "Choix de l'unité"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "RIEN"
 
diff --git a/po/freeciv.pot b/po/freeciv.pot
index c30fe27..a190380 100644
--- a/po/freeciv.pot
+++ b/po/freeciv.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\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"
@@ -48,20 +48,20 @@ msgstr ""
 msgid "Science"
 msgstr ""
 
-#: common/city.c:352
-msgid "?obsolete:O"
+#: common/city.c:350
+msgid "?built:B"
 msgstr ""
 
-#: common/city.c:355
-msgid "?redundant:*"
+#: common/city.c:352
+msgid "?wonder:w"
 msgstr ""
 
-#: common/city.c:360
-msgid "?built:B"
+#: common/city.c:359
+msgid "?obsolete:O"
 msgstr ""
 
 #: common/city.c:362
-msgid "?wonder:w"
+msgid "?redundant:*"
 msgstr ""
 
 #: common/connection.c:515
@@ -482,81 +482,81 @@ msgstr ""
 msgid "AI Debug messages"
 msgstr ""
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr ""
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr ""
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr ""
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr ""
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr ""
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr ""
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr ""
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr ""
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr ""
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr ""
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr ""
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr ""
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr ""
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr ""
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr ""
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr ""
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr ""
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr ""
 
@@ -602,13 +602,13 @@ msgstr ""
 msgid "Size %d"
 msgstr ""
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr ""
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -620,65 +620,65 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr ""
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr ""
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr ""
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr ""
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr ""
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr ""
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr ""
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr ""
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr ""
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr ""
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr ""
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr ""
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr ""
 
@@ -780,11 +780,11 @@ msgstr ""
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr ""
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr ""
 
@@ -935,79 +935,79 @@ msgid_plural " (total %d repeats)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr ""
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr ""
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr ""
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr ""
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr ""
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr ""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr ""
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr ""
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr ""
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr ""
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr ""
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr ""
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr ""
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr ""
 
@@ -1036,108 +1036,108 @@ msgstr ""
 msgid "%s is selling %s (not needed) for %d."
 msgstr ""
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr ""
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr ""
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr ""
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr ""
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
 "away with your crimes?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1148,14 +1148,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1168,7 +1168,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1179,13 +1179,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1196,12 +1196,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1212,7 +1212,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1223,47 +1223,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
 "intentions, and I will have no more of our alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr ""
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
 "our enemy, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
 "s. Why do I need to remind you of your promises?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1271,26 +1271,26 @@ msgid ""
 "more!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
 "cessation of hostilities?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1298,131 +1298,136 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, c-format
 msgid "Auth option \"%s\":"
 msgstr ""
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr ""
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr ""
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr ""
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr ""
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr ""
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr ""
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr ""
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr ""
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr ""
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr ""
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr ""
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
 msgstr ""
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr ""
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr ""
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr ""
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2139,44 +2144,42 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr ""
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr ""
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr ""
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr ""
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr ""
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2184,30 +2187,30 @@ msgid ""
 "to achieve team victory with averaged individual scores."
 msgstr ""
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr ""
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr ""
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr ""
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr ""
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2216,19 +2219,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr ""
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr ""
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr ""
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2236,33 +2239,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr ""
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr ""
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr ""
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr ""
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr ""
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2272,15 +2275,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr ""
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr ""
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2290,60 +2293,60 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr ""
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr ""
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr ""
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr ""
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
 msgstr ""
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
 msgstr ""
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr ""
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2351,17 +2354,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
 msgstr ""
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr ""
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2369,17 +2372,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
 msgstr ""
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr ""
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2387,17 +2390,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
 msgstr ""
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr ""
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2405,17 +2408,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
 msgstr ""
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr ""
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2424,7 +2427,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2433,11 +2436,11 @@ msgid ""
 "cmdlevel <level> <connection-name>"
 msgstr ""
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr ""
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2459,20 +2462,20 @@ msgid ""
 "now takes connection names, not player names."
 msgstr ""
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr ""
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr ""
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2480,56 +2483,56 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr ""
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr ""
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr ""
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr ""
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr ""
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
 msgstr ""
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr ""
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2540,45 +2543,45 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
 msgstr ""
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr ""
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr ""
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr ""
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr ""
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr ""
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr ""
 
@@ -3083,25 +3086,34 @@ msgstr ""
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr ""
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr ""
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr ""
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3144,44 +3156,44 @@ msgstr ""
 msgid "There is no player nor connection by the name %s."
 msgstr ""
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr ""
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr ""
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr ""
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr ""
@@ -3240,119 +3252,119 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr ""
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr ""
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr ""
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr ""
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr ""
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr ""
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr ""
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr ""
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr ""
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr ""
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr ""
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr ""
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3585,19 +3597,19 @@ msgstr ""
 msgid "th"
 msgstr ""
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr ""
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr ""
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr ""
@@ -3608,11 +3620,11 @@ msgstr ""
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr ""
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr ""
 
@@ -3624,7 +3636,7 @@ msgid ""
 "risk."
 msgstr ""
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
 
@@ -3642,13 +3654,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3683,7 +3695,7 @@ msgstr ""
 msgid "Networking"
 msgstr ""
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr ""
@@ -3704,56 +3716,60 @@ msgstr ""
 msgid "Changed"
 msgstr ""
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
 msgstr ""
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
 msgstr ""
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr ""
 
-#: server/settings.c:236
+#: server/settings.c:181
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr ""
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr ""
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
 "  size = 20 is a huge map of 20,000 tiles"
 msgstr ""
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr ""
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -3789,11 +3805,11 @@ msgid ""
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 msgstr ""
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr ""
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -3805,11 +3821,11 @@ msgid ""
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr ""
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr ""
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -3822,35 +3838,35 @@ msgid ""
 "of start pos and to the number of players"
 msgstr ""
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr ""
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr ""
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr ""
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr ""
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr ""
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr ""
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -3868,113 +3884,113 @@ msgid ""
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr ""
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr ""
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr ""
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
 msgstr ""
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr ""
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
 msgstr ""
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr ""
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
 "usually only of interest while debugging the game."
 msgstr ""
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr ""
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr ""
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr ""
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
 msgstr ""
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr ""
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
 msgstr ""
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr ""
 
-#: server/settings.c:419
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr ""
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
 "try to connect will be rejected."
 msgstr ""
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr ""
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
 msgstr ""
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr ""
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -3990,27 +4006,27 @@ msgid ""
 "    A   = Strong attack unit (eg., Catapult)\n"
 msgstr ""
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr ""
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr ""
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr ""
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4018,33 +4034,33 @@ msgid ""
 "next techs really expensive."
 msgstr ""
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
 "determined by the ruleset or other game settings."
 msgstr ""
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr ""
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
 "does not apply when you have just gained a technology this turn."
 msgstr ""
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr ""
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4052,22 +4068,22 @@ msgid ""
 "to gold transfers in diplomatic treaties."
 msgstr ""
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr ""
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
 "this is non-zero, you can end up with negative research points."
 msgstr ""
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr ""
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4076,43 +4092,43 @@ msgid ""
 "points."
 msgstr ""
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr ""
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
 "the size of the city."
 msgstr ""
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr ""
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
 "it has a Granary)."
 msgstr ""
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr ""
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4120,32 +4136,32 @@ msgid ""
 "also notradesize."
 msgstr ""
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr ""
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
 "notradesize and smaller than fulltradesize. See also fulltradesize."
 msgstr ""
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr ""
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
 msgstr ""
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr ""
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4153,11 +4169,11 @@ msgid ""
 "numbers of cities."
 msgstr ""
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr ""
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4165,31 +4181,31 @@ msgid ""
 "(default), the ruleset value will be used."
 msgstr ""
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr ""
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
 msgstr ""
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr ""
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr ""
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr ""
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4198,21 +4214,21 @@ msgid ""
 "\"occupying\" territory."
 msgstr ""
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr ""
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4222,32 +4238,32 @@ msgid ""
 "  8 = air"
 msgstr ""
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr ""
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
 "tiles or tiles within range of more than one nation's cities."
 msgstr ""
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr ""
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr ""
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4256,11 +4272,11 @@ msgid ""
 "4 = diplomacy is disabled for everyone."
 msgstr ""
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr ""
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4275,11 +4291,11 @@ msgid ""
 "another nations unless it is a default for their nation also."
 msgstr ""
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr ""
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4288,81 +4304,81 @@ msgid ""
 "4 = raging hordes, lots of barbarians"
 msgstr ""
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr ""
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr ""
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr ""
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
 msgstr ""
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr ""
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
 "cities or terrain changes in tiles not observed."
 msgstr ""
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr ""
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr ""
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr ""
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
 "civil wars are turned off altogether."
 msgstr ""
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr ""
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
 "players cannot meet unless they have an embassy."
 msgstr ""
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr ""
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4370,21 +4386,21 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr ""
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr ""
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr ""
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4418,122 +4434,124 @@ msgid ""
 "\n"
 msgstr ""
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr ""
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
 msgstr ""
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr ""
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr ""
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr ""
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr ""
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr ""
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
 "connections will be automatically disconnected eventually)."
 msgstr ""
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr ""
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
 "not wait at all."
 msgstr ""
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr ""
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr ""
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr ""
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr ""
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
 msgstr ""
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr ""
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
 msgstr ""
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr ""
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -4555,42 +4573,42 @@ msgid ""
 "The order of characters is not significant, but their capitalization is."
 msgstr ""
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr ""
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
 msgstr ""
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr ""
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
 "this server was not compiled to use zlib."
 msgstr ""
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr ""
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
 msgstr ""
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr ""
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -4601,7 +4619,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr ""
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr ""
@@ -4730,102 +4748,102 @@ msgstr ""
 msgid "Game saved as %s"
 msgstr ""
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr ""
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr ""
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr ""
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr ""
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr ""
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr ""
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr ""
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr ""
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr ""
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr ""
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr ""
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr ""
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr ""
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr ""
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr ""
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr ""
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr ""
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr ""
 
@@ -4846,7 +4864,7 @@ msgstr ""
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5020,7 +5038,7 @@ msgstr ""
 msgid "Removed player %s from the game."
 msgstr ""
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5092,693 +5110,717 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr ""
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr ""
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr ""
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr ""
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr ""
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr ""
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr ""
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr ""
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr ""
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr ""
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr ""
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr ""
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr ""
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr ""
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr ""
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr ""
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr ""
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr ""
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr ""
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr ""
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr ""
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr ""
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr ""
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr ""
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr ""
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr ""
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr ""
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr ""
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr ""
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr ""
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr ""
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr ""
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr ""
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr ""
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr ""
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr ""
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr ""
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr ""
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr ""
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr ""
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr ""
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr ""
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr ""
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr ""
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr ""
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr ""
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr ""
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr ""
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr ""
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+msgid "You cannot take a new player at this time."
+msgstr ""
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr ""
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr ""
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr ""
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr ""
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr ""
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr ""
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr ""
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2951
+#: server/stdinhand.c:3010
 #, c-format
-msgid "%s already controls %s"
+msgid "%s already controls %s."
 msgstr ""
 
-#: server/stdinhand.c:2965
+#: server/stdinhand.c:3024
 #, c-format
-msgid "There is no free player slot for %s"
+msgid "There is no free player slot for %s."
 msgstr ""
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr ""
 
-#: server/stdinhand.c:3076
+#: server/stdinhand.c:3135
 #, c-format
-msgid "%s now controls %s (%s, %s)"
+msgid "%s now controls %s (%s, %s)."
 msgstr ""
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr ""
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr ""
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr ""
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr ""
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr ""
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr ""
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr ""
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr ""
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr ""
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr ""
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr ""
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr ""
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr ""
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr ""
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr ""
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr ""
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr ""
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr ""
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr ""
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr ""
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr ""
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr ""
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr ""
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr ""
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+msgid "Not enough human players, game will not start."
+msgstr ""
+
+#: server/stdinhand.c:3888
+msgid "No players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 msgid "Not enough nations for all players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr ""
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr ""
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr ""
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -5799,123 +5841,123 @@ msgid ""
 "  quit   -  to exit"
 msgstr ""
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr ""
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr ""
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr ""
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr ""
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr ""
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr ""
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr ""
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr ""
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr ""
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr ""
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ""
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ""
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ""
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ""
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ""
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr ""
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr ""
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr ""
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr ""
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr ""
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr ""
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr ""
 
@@ -5982,17 +6024,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr ""
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr ""
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr ""
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr ""
@@ -6499,20 +6541,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr ""
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr ""
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr ""
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr ""
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr ""
@@ -6598,120 +6640,121 @@ msgstr ""
 msgid "Cannot find audio file %s"
 msgstr ""
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr ""
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr ""
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr ""
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr ""
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr ""
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr ""
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr ""
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr ""
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr ""
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr ""
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr ""
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr ""
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr ""
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr ""
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -6823,8 +6866,8 @@ msgid "Best defending units"
 msgstr ""
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -6994,8 +7037,8 @@ msgstr ""
 msgid "?cma:Governor"
 msgstr ""
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7247,19 +7290,19 @@ msgid ""
 "%d times"
 msgstr ""
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr ""
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr ""
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr ""
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr ""
 
@@ -7267,31 +7310,31 @@ msgstr ""
 msgid "experimental"
 msgstr ""
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr ""
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr ""
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr ""
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr ""
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr ""
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr ""
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 
@@ -7376,27 +7419,27 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr ""
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr ""
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr ""
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr ""
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -7404,293 +7447,293 @@ msgid ""
 "\n"
 msgstr ""
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr ""
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr ""
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr ""
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr ""
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr ""
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr ""
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr ""
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr ""
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr ""
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr ""
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr ""
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr ""
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr ""
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr ""
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr ""
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr ""
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr ""
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr ""
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr ""
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr ""
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr ""
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr ""
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr ""
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr ""
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr ""
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr ""
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr ""
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr ""
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr ""
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr ""
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr ""
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
 "at sea.\n"
 msgstr ""
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr ""
@@ -7699,115 +7742,115 @@ msgstr ""
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr ""
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr ""
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr ""
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
 "will require %d bulbs to complete."
 msgstr ""
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr ""
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr ""
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr ""
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr ""
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr ""
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr ""
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr ""
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr ""
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr ""
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr ""
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -7818,7 +7861,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7826,48 +7869,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -7875,23 +7918,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -7902,7 +7945,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -7910,60 +7953,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr ""
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr ""
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -7971,7 +8014,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -7979,71 +8022,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr ""
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr ""
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ""
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr ""
@@ -8434,16 +8477,16 @@ msgstr ""
 msgid "Start of turn %d"
 msgstr ""
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr ""
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr ""
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr ""
 
@@ -8474,13 +8517,13 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr ""
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -8494,7 +8537,7 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr ""
 
@@ -8527,36 +8570,36 @@ msgstr ""
 msgid "Ping"
 msgstr ""
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr ""
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr ""
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr ""
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr ""
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr ""
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr ""
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr ""
@@ -8863,64 +8906,68 @@ msgstr ""
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr ""
 
-#: client/text.c:606
+#: client/text.c:607
+msgid "Moving: Nobody"
+msgstr ""
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr ""
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr ""
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr ""
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr ""
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr ""
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr ""
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr ""
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr ""
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr ""
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -8928,55 +8975,55 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr ""
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr ""
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr ""
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr ""
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr ""
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -8987,72 +9034,72 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr ""
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr ""
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr ""
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr ""
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr ""
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9060,96 +9107,96 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr ""
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr ""
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr ""
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr ""
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr ""
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr ""
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr ""
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr ""
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr ""
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr ""
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr ""
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr ""
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr ""
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr ""
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr ""
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9157,7 +9204,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9165,16 +9212,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr ""
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr ""
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9182,20 +9229,20 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr ""
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr ""
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr ""
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr ""
@@ -9236,12 +9283,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr ""
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr ""
 
@@ -9287,11 +9334,13 @@ msgid "Ooops..."
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -9306,6 +9355,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -9344,6 +9394,7 @@ msgstr ""
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr ""
 
@@ -9368,12 +9419,13 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr ""
@@ -9385,6 +9437,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -9399,6 +9452,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -9406,6 +9460,7 @@ msgid ""
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -9473,10 +9528,12 @@ msgid "Subvert Enemy Unit"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr ""
 
@@ -9574,7 +9631,7 @@ msgstr ""
 msgid "_Overview"
 msgstr ""
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -9599,11 +9656,11 @@ msgid "%d/%d %d turns"
 msgstr ""
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr ""
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr ""
 
@@ -9722,7 +9779,7 @@ msgstr ""
 msgid "Present units %d"
 msgstr ""
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr ""
 
@@ -9807,31 +9864,31 @@ msgstr ""
 msgid "What should we rename the city to?"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -9841,12 +9898,12 @@ msgstr ""
 msgid "Cities"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -9855,85 +9912,90 @@ msgstr ""
 msgid "Improvements"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr ""
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, c-format
+msgid "Total Buy Cost: %d"
+msgstr ""
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -9995,121 +10057,121 @@ msgstr ""
 msgid "Remove this preset?"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 msgid "_Description"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -10352,60 +10414,65 @@ msgstr ""
 msgid "Not _ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr ""
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+msgid "_Take Player"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr ""
 
@@ -11310,214 +11377,214 @@ msgstr ""
 msgid "Connect to Gaming _Zone"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr ""
 
@@ -11552,7 +11619,7 @@ msgstr ""
 msgid "Count"
 msgstr ""
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -11776,28 +11843,28 @@ msgstr ""
 msgid "Edit Global _Worklists"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr ""
 
@@ -12086,8 +12153,8 @@ msgid "City shrinks: %d %s"
 msgstr ""
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12187,11 +12254,11 @@ msgstr ""
 msgid "Maintenance Report"
 msgstr ""
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr ""
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -12604,21 +12671,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -13840,7 +13907,7 @@ msgstr ""
 msgid "Unit Selection"
 msgstr ""
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr ""
 
diff --git a/po/he.gmo b/po/he.gmo
index 3fdf3e5..d4ab8e0 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index 7f63f8a..cb8bfbc 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\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"
@@ -50,22 +50,22 @@ msgstr "שפע"
 msgid "Science"
 msgstr "מדע"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?בנוי:ב"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?פלא־תבל:פ"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?מיושן:י"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?מיותר:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?בנוי:ב"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?פלא־תבל:פ"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -485,81 +485,81 @@ msgstr "הודעת חיבור/ניתוק"
 msgid "AI Debug messages"
 msgstr "הודעות דיבוג א\"מ"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?גישה:נטייה לרצח עם"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?גישה:מלחמתית"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?גישה:עיינת"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?גישה:חוסר שיתוף פעולה"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?גישה:חוסר נוחות"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?גישה:ניטרלי"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?גישה:יחס של כבוד"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?גישה:מועילה"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?גישה:התלהבות"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?גישה:הערצה"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?גישה:סגידה"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?מצב_דיפלומטי:שביתת נשק"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?מצב_דיפלומטי:מלחמה"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?מצב_דיפלומטי:הפסקת אש"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?מצב_דיפלומטי:שלום"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?מצב_דיפלומטי:ברית"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?מצב_דיפלומטי:לא נפגשו"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?מצב_דיפלומטי:צוות"
 
@@ -605,13 +605,13 @@ msgstr "%s יחידות"
 msgid "Size %d"
 msgstr "גודל %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "טכנולוגיה עתידית. %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -623,65 +623,65 @@ msgstr "טכנולוגיה עתידית. %d"
 msgid "None"
 msgstr "שום־דבר"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "טכנולוגיה עתידית."
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(לא ידוע)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "דרך"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "מערכת־השקיה"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "מסילת־ברזל"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "מכרה"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "זיהום"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "בקתה"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "מבצר"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "נהר"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "חווה"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "בסיס תעופה"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "נשורת"
 
@@ -791,11 +791,11 @@ msgstr "יחידה גרעינית"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr "וגם"
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?וגם:,"
 
@@ -952,79 +952,79 @@ msgid_plural " (total %d repeats)"
 msgstr[0] "(סך הכל חזרה אחת)"
 msgstr[1] "(סך הכל %d חזרות)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "טיעון ריק בשביל \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "חסר טיעון בשביל \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d לפני הספירה"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d אחרי הספירה"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "המשתנה FREECIV_PATH נמצא אך ריק; משתמש בתיקיה הנוכחית."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "לא מצליח לקרוא מידע בספריה %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "תיקיית הנתונים צריכה להיקבע דרך משתנה הסביבה FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "תיקיית המידה הנוכחית היא: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "קובץ ה \"%s\"  נדרש... מבטל!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%sשגיאה: אתה מנסה להריץ את המשחק כ-סופר משתמש.\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "השתמש במשתמש חסר-זכויות במקום. \n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "התאמה מדויקת"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "התאמה בלבד"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "רב משמעי"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "ריק"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "ארוך מדי"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "חוסר התאמה"
 
@@ -1053,108 +1053,108 @@ msgstr "ה%s התחילו לבנות את %s ב%s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s מוכר את %s (לא נחוץ) עבור %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (א\"מ)* במצב מרוחק א\"מ אינה יכולה לחתום על הסכם שכזה."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr ""
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr ""
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr ""
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr ""
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
 "away with your crimes?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1165,14 +1165,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1185,7 +1185,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1196,13 +1196,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1213,12 +1213,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1229,7 +1229,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1240,47 +1240,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
 "intentions, and I will have no more of our alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr ""
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
 "our enemy, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
 "s. Why do I need to remind you of your promises?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1288,26 +1288,26 @@ msgid ""
 "more!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
 "cessation of hostilities?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1315,132 +1315,137 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "כל האפשריות"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr "(ותיק קרבות)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "שם זה אסור."
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "אין אפשרות לטעון קובץ תסריט קבוצת־חוקים \"%s\"."
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr ""
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr ""
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr ""
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr ""
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "הזן ססמה עבור %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "הזן ססמה חדשה (וזכור אותה)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "שרת זה מתיר רק משתמשים נבחרים. סליחה."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr ""
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "סליחה, יותר מדי ניסיונות כושלים..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
 msgstr ""
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr ""
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "ססמתך שגוייה. נסה שוב."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr ""
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2157,44 +2162,42 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr ""
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr ""
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr ""
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr ""
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr ""
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2202,30 +2205,30 @@ msgid ""
 "to achieve team victory with averaged individual scores."
 msgstr ""
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr ""
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr ""
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr ""
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr ""
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2234,19 +2237,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr ""
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr ""
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr ""
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2254,33 +2257,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr ""
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr ""
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr ""
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr ""
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr ""
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2290,15 +2293,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr ""
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr ""
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2308,60 +2311,60 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr ""
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr ""
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr ""
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr ""
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
 msgstr ""
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
 msgstr ""
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "קבע אחד או את כל שחקני הא\"מ ל'טירון'"
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2369,17 +2372,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
 msgstr ""
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr ""
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2387,17 +2390,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
 msgstr ""
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr ""
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2405,17 +2408,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
 msgstr ""
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr ""
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2423,17 +2426,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
 msgstr ""
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr ""
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2442,7 +2445,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2451,11 +2454,11 @@ msgid ""
 "cmdlevel <level> <connection-name>"
 msgstr ""
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr ""
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2477,20 +2480,20 @@ msgid ""
 "now takes connection names, not player names."
 msgstr ""
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr ""
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr ""
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2498,24 +2501,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "סיים משחק"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "סיים את המשחק מיד בתיקו."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "×”×™×›× ×¢"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "וותר על המשחק."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2524,15 +2527,15 @@ msgstr ""
 "וויתרו על המשחק באופן זה, המשחק מסתיים."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "הסר <player-name>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "מסיר שחקן באופן מלא מהמשחק."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2541,7 +2544,7 @@ msgstr ""
 "בזהירות!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2549,11 +2552,11 @@ msgstr ""
 "שמור\n"
 "שמור <file-name>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "שמור משחק לקובץ."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2564,45 +2567,45 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
 msgstr ""
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr ""
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr ""
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr ""
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr ""
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr ""
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr ""
 
@@ -3107,25 +3110,34 @@ msgstr ""
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr ""
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "שנה: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr ""
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3168,44 +3180,44 @@ msgstr ""
 msgid "There is no player nor connection by the name %s."
 msgstr ""
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr ""
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr ""
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr ""
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr ""
@@ -3264,119 +3276,119 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr ""
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr ""
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr ""
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr ""
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr ""
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr ""
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr ""
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr ""
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr ""
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr ""
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr ""
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr ""
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3609,19 +3621,19 @@ msgstr " "
 msgid "th"
 msgstr " "
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr ""
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr ""
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr ""
@@ -3632,11 +3644,11 @@ msgstr ""
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr ""
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr ""
 
@@ -3648,7 +3660,7 @@ msgid ""
 "risk."
 msgstr ""
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
 
@@ -3666,13 +3678,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3707,7 +3719,7 @@ msgstr "פנימי"
 msgid "Networking"
 msgstr "עבודת רשת"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "הכל"
@@ -3728,56 +3740,60 @@ msgstr "נדיר"
 msgid "Changed"
 msgstr "השתנה"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
 msgstr ""
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
 msgstr ""
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr ""
 
-#: server/settings.c:236
+#: server/settings.c:181
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr ""
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr ""
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
 "  size = 20 is a huge map of 20,000 tiles"
 msgstr ""
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr ""
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -3813,11 +3829,11 @@ msgid ""
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 msgstr ""
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr ""
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -3829,11 +3845,11 @@ msgid ""
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr ""
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr ""
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -3846,35 +3862,35 @@ msgid ""
 "of start pos and to the number of players"
 msgstr ""
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr ""
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr ""
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr ""
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr ""
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr ""
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr ""
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -3892,113 +3908,113 @@ msgid ""
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr ""
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr ""
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr ""
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
 msgstr ""
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr ""
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
 msgstr ""
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr ""
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
 "usually only of interest while debugging the game."
 msgstr ""
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr ""
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr ""
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr ""
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
 msgstr ""
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr ""
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
 msgstr ""
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "מספר שחקנים מזערי"
 
-#: server/settings.c:419
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "מספר שחקנים מרבי"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
 "try to connect will be rejected."
 msgstr ""
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "מספר סך כל השחקנים (כולל שחקני א\"מ)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
 msgstr ""
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "הצג רשימת היחידות הראשונית של השחקנים"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4014,27 +4030,27 @@ msgid ""
 "    A   = Strong attack unit (eg., Catapult)\n"
 msgstr ""
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr ""
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr ""
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr ""
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4042,33 +4058,33 @@ msgid ""
 "next techs really expensive."
 msgstr ""
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
 "determined by the ruleset or other game settings."
 msgstr ""
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr ""
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
 "does not apply when you have just gained a technology this turn."
 msgstr ""
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr ""
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4076,22 +4092,22 @@ msgid ""
 "to gold transfers in diplomatic treaties."
 msgstr ""
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr ""
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
 "this is non-zero, you can end up with negative research points."
 msgstr ""
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr ""
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4100,43 +4116,43 @@ msgid ""
 "points."
 msgstr ""
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr ""
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
 "the size of the city."
 msgstr ""
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr ""
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
 "it has a Granary)."
 msgstr ""
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr ""
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4144,32 +4160,32 @@ msgid ""
 "also notradesize."
 msgstr ""
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr ""
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
 "notradesize and smaller than fulltradesize. See also fulltradesize."
 msgstr ""
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr ""
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
 msgstr ""
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr ""
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4177,11 +4193,11 @@ msgid ""
 "numbers of cities."
 msgstr ""
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr ""
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4189,31 +4205,31 @@ msgid ""
 "(default), the ruleset value will be used."
 msgstr ""
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr ""
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
 msgstr ""
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr ""
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr ""
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr ""
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4222,21 +4238,21 @@ msgid ""
 "\"occupying\" territory."
 msgstr ""
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr ""
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4246,32 +4262,32 @@ msgid ""
 "  8 = air"
 msgstr ""
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr ""
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
 "tiles or tiles within range of more than one nation's cities."
 msgstr ""
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr ""
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "יכולת לקיימם דיפלומטיה עם שחקנים אחרים"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4280,11 +4296,11 @@ msgid ""
 "4 = diplomacy is disabled for everyone."
 msgstr ""
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr ""
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4299,11 +4315,11 @@ msgid ""
 "another nations unless it is a default for their nation also."
 msgstr ""
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr ""
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4312,81 +4328,81 @@ msgid ""
 "4 = raging hordes, lots of barbarians"
 msgstr ""
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr ""
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr ""
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr ""
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
 msgstr ""
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr ""
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
 "cities or terrain changes in tiles not observed."
 msgstr ""
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr ""
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr ""
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr ""
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
 "civil wars are turned off altogether."
 msgstr ""
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr ""
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
 "players cannot meet unless they have an embassy."
 msgstr ""
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr ""
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4394,21 +4410,21 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr ""
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr ""
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "שחקנים שלמשתמשים מותר לקחת"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4442,122 +4458,124 @@ msgid ""
 "\n"
 msgstr ""
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr ""
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
 msgstr ""
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr ""
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr ""
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr ""
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr ""
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr ""
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
 "connections will be automatically disconnected eventually)."
 msgstr ""
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr ""
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
 "not wait at all."
 msgstr ""
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr ""
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr ""
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr ""
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr ""
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
 msgstr ""
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr ""
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
 msgstr ""
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr ""
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -4579,42 +4597,42 @@ msgid ""
 "The order of characters is not significant, but their capitalization is."
 msgstr ""
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr ""
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
 msgstr ""
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr ""
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
 "this server was not compiled to use zlib."
 msgstr ""
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr ""
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
 msgstr ""
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr ""
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -4625,7 +4643,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr ""
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr ""
@@ -4754,102 +4772,102 @@ msgstr ""
 msgid "Game saved as %s"
 msgstr ""
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr ""
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr ""
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr ""
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr ""
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr ""
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr ""
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr ""
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr ""
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr ""
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr ""
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr ""
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr ""
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr ""
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "שחקן %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr ""
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr ""
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr ""
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr ""
 
@@ -4870,7 +4888,7 @@ msgstr ""
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5044,7 +5062,7 @@ msgstr ""
 msgid "Removed player %s from the game."
 msgstr ""
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5116,693 +5134,718 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr ""
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr ""
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr ""
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr ""
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr ""
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr ""
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr ""
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr ""
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr ""
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr ""
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr ""
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr ""
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr ""
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr ""
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr ""
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr ""
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr ""
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr ""
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr ""
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr ""
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr ""
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "כל האפשריות"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr ""
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr ""
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr ""
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr ""
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr ""
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr ""
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr ""
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr ""
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr ""
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr ""
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr ""
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr ""
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr ""
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr ""
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr ""
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr ""
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr ""
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr ""
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr ""
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr ""
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr ""
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr ""
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr ""
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr ""
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr ""
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr ""
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr ""
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "אין באפשרותך לשמור משחק באופן ידני על שרת זה."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr ""
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr ""
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr ""
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr ""
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr ""
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr ""
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr ""
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
-msgstr ""
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
+msgstr "%s נרכש מ־ %s!"
 
-#: server/stdinhand.c:2965
+#: server/stdinhand.c:3024
 #, c-format
-msgid "There is no free player slot for %s"
+msgid "There is no free player slot for %s."
 msgstr ""
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr ""
 
-#: server/stdinhand.c:3076
+#: server/stdinhand.c:3135
 #, c-format
-msgid "%s now controls %s (%s, %s)"
+msgid "%s now controls %s (%s, %s)."
 msgstr ""
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr ""
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr ""
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr ""
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "בחיים"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr ""
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr ""
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr ""
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr ""
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr ""
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s נפרד מ־ %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr ""
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr ""
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr ""
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr ""
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "אין אפשרות לטעון את קובץ־השמירה: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr ""
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "להתראות"
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr ""
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr ""
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr ""
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr ""
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr ""
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr ""
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr ""
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+msgid "Not enough human players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+msgid "No players, game will not start."
+msgstr ""
+
+#: server/stdinhand.c:3892
 msgid "Not enough nations for all players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "כל השחקנים מוכנים; המשחק מתחיל."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr ""
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr ""
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -5823,123 +5866,123 @@ msgid ""
 "  quit   -  to exit"
 msgstr ""
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr ""
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr ""
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr ""
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr ""
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr ""
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr ""
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr ""
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "רשימת שחקנים:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<אין שחקנים>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "משתמש %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", מת"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", רמת קושי %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", מוכן"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", לא מוכן"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " חיבור אחד:"
 msgstr[1] " %d חיבורים:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr ""
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr "(מצב משקיף)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "רשימת צוותים:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "צוות ריק: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "רשימת חיבורים לשרת:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<אין חיבורים>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr ""
 
@@ -6006,17 +6049,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr ""
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr ""
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr ""
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr ""
@@ -6523,20 +6566,20 @@ msgstr "ניסיון לבנות פלא־תבל עבור %s נכשל."
 msgid "Your %s has invalid orders."
 msgstr "יחידת ה%s שלך קבלה פקודה לא תקינה."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr ""
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr ""
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr ""
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr ""
@@ -6622,120 +6665,121 @@ msgstr ""
 msgid "Cannot find audio file %s"
 msgstr ""
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr ""
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr ""
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr ""
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr ""
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr ""
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr ""
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr ""
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr ""
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr ""
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr ""
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr ""
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr ""
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr ""
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr ""
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -6848,8 +6892,8 @@ msgid "Best defending units"
 msgstr "היחידות המגנות הטובות ביותר"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7030,8 +7074,8 @@ msgstr "?זיהום:זהם"
 msgid "?cma:Governor"
 msgstr "?סנא: מושל"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7285,19 +7329,19 @@ msgid ""
 "%d times"
 msgstr ""
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "טירון"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "קל"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "רגיל"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "קשה"
 
@@ -7305,31 +7349,31 @@ msgstr "קשה"
 msgid "experimental"
 msgstr "ניסיוני"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr ""
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr ""
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr ""
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "אין אפשרות להתחבר לשרת."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr ""
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr ""
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 
@@ -7430,27 +7474,27 @@ msgstr ""
 "דורשת גודל מזערי של %d.\n"
 "\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "מאפשר %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "מאפשר %s (יחד עם %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr "נהרות"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "סליחה, אין נושא עזרה עבור %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -7458,7 +7502,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
@@ -7467,287 +7511,287 @@ msgstr ""
 "דורש את בניין ה%s.\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr ""
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* מאפשר %s (יחד עם %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* מאפשר %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* ניתן לבנות רק אם יש %s בעיר.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* ניתן לבנות רק עם %s כממשל.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr ""
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr ""
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr ""
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr ""
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr ""
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* יכולים לעזור בבניית פלאי־תבל (מוסיף %d ייצור).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* אין לפרק.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr "ניתן לפרק בעיר לקבלת 50%% מעלות הייצור בחזרה.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* יכולים לבנות ערים חדשות.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* יכולים להוסיף %d לאוכלוסיית העיר בערים עם שגודלן אינו עולה על %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* יכולים לבנות דרכים ומסילות.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* יכולים להקים מכרות במשבצות.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* יכולים להקים מערכת השקיה במשבצות.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* יכולים להקים חווה.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* יכולים להקים חווה (אם %s ידוע).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* יכולים להקים חווה (אם הטכנולוגיות: %s, ידועות).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* יכולים לבנות ביצורים.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* יכולים לבנות ביצורים (אם %s ידוע).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr ""
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr ""
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr ""
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr ""
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr ""
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr ""
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr ""
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr ""
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr ""
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr ""
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr ""
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr ""
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* התעלם המשפעת חומת־עיר.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr ""
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr ""
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr ""
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
 "at sea.\n"
 msgstr ""
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr ""
@@ -7756,115 +7800,115 @@ msgstr ""
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr ""
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr ""
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr ""
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
 "will require %d bulbs to complete."
 msgstr ""
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr ""
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr ""
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr ""
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr ""
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr ""
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr ""
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr ""
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr ""
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr ""
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr ""
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -7875,7 +7919,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7883,48 +7927,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -7932,23 +7976,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -7959,7 +8003,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -7967,60 +8011,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr ""
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr ""
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8028,7 +8072,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8036,71 +8080,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr ""
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr ""
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr ""
@@ -8491,16 +8535,16 @@ msgstr ""
 msgid "Start of turn %d"
 msgstr ""
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr ""
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "פועל"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "כבוי"
 
@@ -8531,13 +8575,13 @@ msgstr "?שחקן:שם"
 msgid "Username"
 msgstr "שם משתמש"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "דגל"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -8551,7 +8595,7 @@ msgstr "גבול"
 msgid "Score"
 msgstr "ניקוד"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "צוות"
 
@@ -8584,36 +8628,36 @@ msgstr "?דשח־שחקן:חסר־מעש"
 msgid "Ping"
 msgstr ""
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "אין אפשרות למכור שיפור."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr ""
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr ""
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr ""
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr ""
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr ""
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr ""
@@ -8923,64 +8967,69 @@ msgstr "זהב: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "מס: %d שפע: %d מדע: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "תנועה: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "תנועה: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(לחץ למידע נוסף)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s אנשים"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "תור: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "זהב: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "הכנסה נטו: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "שיעור מס: זהב:%d%% שפע:%d%% מדע:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "חוקר%s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "ממשל: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -8988,55 +9037,55 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr ""
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr ""
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr ""
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr ""
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr ""
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9047,72 +9096,72 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr ""
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr ""
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "רמת זיהום: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr ""
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr ""
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "מציג את המשטר הנוכחי:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "אוכלוסיה:      %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "תמיכה:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "אנרגיה:          %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9120,96 +9169,96 @@ msgstr[0] "מסה:            %5d טון"
 msgstr[1] "מסה:            %5d טונות"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "משך המסע:     %5.1f שנים"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "משך המסע:        לא זמין     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "הסתברות להצלחה:   %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "שנת הגעה: %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr ""
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr ""
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr ""
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr ""
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr ""
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr ""
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr ""
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s מה־ %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "משקיף: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "בניינים:"
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr ""
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "?blistend:"
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "פלאי־תבל:"
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr ""
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9217,7 +9266,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9225,16 +9274,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr ""
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr ""
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9242,20 +9291,20 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr ""
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr ""
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr ""
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr ""
@@ -9296,12 +9345,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr ""
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr ""
 
@@ -9347,11 +9396,13 @@ msgid "Ooops..."
 msgstr "אופס..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "אין אפשרות לשחד יחידה זו!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -9366,6 +9417,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -9404,6 +9456,7 @@ msgstr "_התקדמויות:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "לפי שיקול דעת המרגל"
 
@@ -9428,12 +9481,13 @@ msgstr "_שיפורים:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "ייצור בעיר"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "אינך יכול להמריד את  %s."
@@ -9445,6 +9499,7 @@ msgstr "לא ניתנת להמרדה!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -9459,6 +9514,7 @@ msgstr "המרדה!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -9466,6 +9522,7 @@ msgid ""
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -9533,10 +9590,12 @@ msgid "Subvert Enemy Unit"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr ""
 
@@ -9636,7 +9695,7 @@ msgstr "זיהום:"
 msgid "_Overview"
 msgstr "_סקירה"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -9661,11 +9720,11 @@ msgid "%d/%d %d turns"
 msgstr "%d\\%d %d תורות"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_קנה"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "_ייצור"
@@ -9785,7 +9844,7 @@ msgstr "יחידות נתמכות %d"
 msgid "Present units %d"
 msgstr "יחידות נוכחות %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "מר_כז"
 
@@ -9874,32 +9933,32 @@ msgstr "שנה שם עיר"
 msgid "What should we rename the city to?"
 msgstr "איזה שם לתת לעיר?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_שנה"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "הוסף _ראשון"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "הוסף _הבא"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "הוסף _אחרון"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_בחר"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "ה_צג"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -9909,13 +9968,13 @@ msgstr "ה_צג"
 msgid "Cities"
 msgstr "ערים"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "חלון _צץ"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -9924,85 +9983,90 @@ msgstr "חלון _צץ"
 msgid "Improvements"
 msgstr "שיפורים"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "פלאי־תבל"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "כל הערים"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "אף לא עיר אחת"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "הפוך בחירה"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "בניית יחידות"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "בניית שיפורים"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "בניית פלאי־תבל"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "בניית יחידה"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "בניית שיפור"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "בניית פלא־תבל"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "ערי חוף"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "אותו אי"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "יחידות נתמכות"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "יחידות נוכחות"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "שיפורי עיר"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "פלאי־תבל בעיר"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "יחידות זמינות"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "שיפורים זמינים"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "פלאי־תבל זמינים"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "עלות כוללת:"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10068,127 +10132,127 @@ msgstr "איזה שם לתת לערך קבוע זה?"
 msgid "Remove this preset?"
 msgstr "הסר ערך קבוע זה?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "לך ל_מקום"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "_הקפץ עיר"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "אמרת שאתה רוצה מהפכה?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "מהפכה!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "מה לבזוז"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "בחר מה לבזוז:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "יחידה"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "שם"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "מבחר יחידות"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_הכן הכל"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "_זקיף חסר־מעש"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_אומות:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "איזה אומה תהייה?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "בחר אומה"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "אומה אקראית"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "בחר אומה"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_תכונות"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_מנהיג:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_נקבה"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_זכר"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "_סגנון עיר:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "_נרטיב לאומי"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "חובה לבחור את מינך"
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "חובה לבחור את סגנון העיר."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "חובה להקליד שם חוקי."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "שדרג יחידה!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -10435,61 +10499,67 @@ msgstr ""
 msgid "Not _ready"
 msgstr "_לא מוכן"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_מוכן"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_התחל"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "קח שחקן זה"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "בחר _אומה"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_השקף"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "_אל תשקיף"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "אקראי"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "השקף"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "התנתק"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "האם אתה בטוח שברצונך לצאת?"
 
@@ -11402,217 +11472,217 @@ msgstr "הת_חבר למשחק רשת"
 msgid "Connect to Gaming _Zone"
 msgstr "התחבר אל Gaming _Zone"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "ססמאות אינן תואמות, הזן ססמה."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "שם שרת"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "פורט"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "גרסה"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "מצב"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "שחקנים"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "הערה"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "_רשת תקשורת מקומית"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "_מטה־שרת אינטרנט"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_שרת:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_פורט:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_כניסה:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "_ססמה:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "_אישור ססמה:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "הת_חבר"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "שם חיבור: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "שם שחקן: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "מחשב־מארח: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "מידע שחקן/חיבור"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "מידע %s"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "הפעל/בטל מוכנות שחקן"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "בחר אומה"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "השקף על שחקן זה"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "קח שחקן זה"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "חתוך חיבור"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "הפעל/בטל א\"מ לשחקן"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "הסר שחקן"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "תן מידע לגישה"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "תן שליטה בגישה"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "שים על %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "_מספר שחקים (כולל א\"מ):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "רמת ה_מיומנות של א\"מ:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "_קבוצת כללים:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "_אפשרויות משחק נספות..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "רשומה"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "דרוג"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "מוכן"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "מנהיג"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "בחר משחק שמור לטעינה"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "בחר משחק שמור ל_טעינה:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_עיין..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "בחר בתסריט"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "בחר ב_תסריט"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "סוג"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "בחר לשחק בא_ומה:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "בחר מיקום לשמירה"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "שמור משחק"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "_משחקים שמורים:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "שמור שם־_קובץ:"
 
@@ -11647,7 +11717,7 @@ msgstr "?בניין:שם"
 msgid "Count"
 msgstr "מספר"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -11889,28 +11959,28 @@ msgstr "רשימת־_עבודה:"
 msgid "Edit Global _Worklists"
 msgstr "ערוך רשימות־עבודה _גלובליות"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "תורות"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "_משימות מקור:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "הצג מטרות _עתידיות"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "מטרת _רשימת־עבודות"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "ה_סף רשימת־עבודה גלובלית"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "שנה _ייצור"
 
@@ -12205,8 +12275,8 @@ msgid "City shrinks: %d %s"
 msgstr "צמצום עיר: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12311,11 +12381,11 @@ msgstr "דוח חיל־מצב"
 msgid "Maintenance Report"
 msgstr "דוח תחזוקה"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "רשימת־עבודה"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -12729,21 +12799,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -13989,7 +14059,7 @@ msgstr "סגנון עיר:"
 msgid "Unit Selection"
 msgstr "בחירת יחידה"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "אין"
 
diff --git a/po/hu.gmo b/po/hu.gmo
index dd3812d..5995977 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 155f0ce..5096308 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 1.14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\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"
@@ -49,22 +49,22 @@ msgstr "Luxus"
 msgid "Science"
 msgstr "Tudomány"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:M"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:cs"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolate:E"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:M"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:cs"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -494,84 +494,84 @@ msgstr "Kapcsol
 msgid "AI Debug messages"
 msgstr ""
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr ""
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr ""
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr ""
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr ""
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr ""
 
-#: common/player.c:737
+#: common/player.c:742
 #, fuzzy
 msgid "?attitude:Neutral"
 msgstr "?diplomatic_state:Semleges"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr ""
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr ""
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr ""
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr ""
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr ""
 
-#: common/player.c:759
+#: common/player.c:764
 #, fuzzy
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Szövetség"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Háború"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Tûzszünet"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Béke"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Szövetség"
 
-#: common/player.c:764
+#: common/player.c:769
 #, fuzzy
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Semleges"
 
-#: common/player.c:765
+#: common/player.c:770
 #, fuzzy
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Béke"
@@ -618,13 +618,13 @@ msgstr " egys
 msgid "Size %d"
 msgstr "Méret"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "%d. Jövõbeli Tudomány"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -636,66 +636,66 @@ msgstr "%d. J
 msgid "None"
 msgstr "Semmi"
 
-#: common/tech.c:790
+#: common/tech.c:798
 #, fuzzy
 msgid "Future Tech."
 msgstr "%d. Jövõbeli Tudomány"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Ismeretlen)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Út"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Öntözés"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Vasút"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Bánya"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Szennyezés"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Kunyhó"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Erõd"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Folyó"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Farm"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Légibázis"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Nukleáris Szennyezés"
 
@@ -806,11 +806,11 @@ msgstr "Atomrak
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " és "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?and:, "
 
@@ -965,82 +965,82 @@ msgid " (total %d repeat)"
 msgid_plural " (total %d repeats)"
 msgstr[0] " (összesen %d ismétlés)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "A(z) \"%s\" opciónak üres kifejezés a paramétere.\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "A(z) \"%s\" opciónak hiányzik a paramétere.\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "i.e. %d"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "i.sz. %d"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "A FREECIV_PATH környezeti változó értéke üres sztring; inkább az "
 "alapértelmezett adatelérési útvonalat (path) használom."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Nem sikerült beolvasni a(z) %s adatkönyvtárat: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "Az adatelérési útvonal a FREECIV_PATH környezeti változóval állítható be."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "A jelenlegi adatelérési útvonal: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Szükség van a(z) \"%s\" fájlra ... kilépés!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Hiba: root-ként próbálsz futtatni!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Használj inkább nem privilegizált felhsználót.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "illeszthetõ"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "csak eggyel illesztehtõ"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "nem egyértelmû"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "üres"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "túl hosszú"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "nem illeszthetõ"
 
@@ -1069,108 +1069,108 @@ msgstr "A(z) %s elkezdt
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s eladja a (szükségtelen) %s épületet %d aranyért."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr ""
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr ""
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr ""
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr ""
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
 "away with your crimes?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1180,14 +1180,14 @@ msgid_plural ""
 "the spaceship launch."
 msgstr[0] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1199,7 +1199,7 @@ msgid_plural ""
 "us and do likewise!"
 msgstr[0] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1209,13 +1209,13 @@ msgid_plural ""
 "declare war in %d turns."
 msgstr[0] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1225,12 +1225,12 @@ msgid_plural ""
 "apart. We declare war in %d turns."
 msgstr[0] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1240,7 +1240,7 @@ msgid_plural ""
 "Hold on - we are coming!"
 msgstr[0] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1250,47 +1250,47 @@ msgid_plural ""
 "turns.  We expect you to do likewise."
 msgstr[0] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
 "intentions, and I will have no more of our alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr ""
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
 "our enemy, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
 "s. Why do I need to remind you of your promises?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1298,26 +1298,26 @@ msgid ""
 "more!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
 "cessation of hostilities?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1325,136 +1325,141 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Helyi beállítások"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (veterán)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Milyen típusú kapcsolódások engedélyezettek"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Nincs meg a(z) %s hangfájl"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 
-#: server/auth.c:384
+#: server/auth.c:404
 #, fuzzy
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Sajnálom, nincs jogosultságod szerverparancsok kiadására."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, fuzzy, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s visszautasítva: %s már kapcsolódott."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr ""
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr ""
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, fuzzy, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s visszautasítva: A(z) %s nevet már valaki más használja."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr ""
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr ""
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, fuzzy, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s visszautasítva: A(z) %s nevet már valaki más használja."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr ""
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
 msgstr ""
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, fuzzy, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s visszautasítva: Tilos a barbárok megfigyelése."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr ""
 
-#: server/auth.c:549
+#: server/auth.c:569
 #, fuzzy
 msgid "Sorry, your connection timed out..."
 msgstr "Sajnálom, a légi egységek õrjáratozása egyelõre nincs megvalósítva."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, fuzzy, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 "%s visszautasítva: Az ember játékosok számára tilos az újrakapcsolódás."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2259,45 +2264,43 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr ""
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <beállításnév> <érték>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Szerverbeállítások értékének megadása."
 
-#: server/commands.c:133
+#: server/commands.c:132
 #, fuzzy
 msgid "team <player> [team]"
 msgstr "remove <játékosnév>"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr ""
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2305,16 +2308,16 @@ msgid ""
 "to achieve team victory with averaged individual scores."
 msgstr ""
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <könyvtár>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 #, fuzzy
 msgid "Choose new ruleset directory or modpack."
 msgstr "A jelenlegi szabálykészlet könyvtár: \"%s\""
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2323,15 +2326,15 @@ msgstr ""
 "adjuk ki, akkor kíirja a jelenleg használt szabálykészletet."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <metainfó sor>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "A metaszerveren megjelenõ infó sor beállítása."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2340,21 +2343,21 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 #, fuzzy
 msgid "metapatch <meta-line>"
 msgstr "metainfo <metainfó sor>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 #, fuzzy
 msgid "Set metaserver patches line."
 msgstr "A metaszerveren megjelenõ infó sor beállítása."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "A metaszerverrel való kapcsolat vezérlése."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2368,36 +2371,36 @@ msgstr ""
 "való kapcsolatot."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <cím>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 #, fuzzy
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Metaszerver címének beállítása."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <játékosnév>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Be- ill. kikapcsolja a játékosnál az MI irányítását."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 #, fuzzy
 msgid "take [connection-name] <player-name>"
 msgstr "create <játékosnév>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 #, fuzzy
 msgid "Take over a player's place in the game."
 msgstr "%s játékos a játékból sikeresen eltávolítva."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2407,16 +2410,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr ""
 
-#: server/commands.c:194
+#: server/commands.c:193
 #, fuzzy
 msgid "Observe a player or the whole game."
 msgstr "%s játékos a játékból sikeresen eltávolítva."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2426,63 +2429,63 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 #, fuzzy
 msgid "detach <connection-name>"
 msgstr "cut <kapcsolatnév>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr ""
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <játékosnév>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Egy MI játékos létrehozása a megadott névvel."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "A 'create' parancs csak a játék elkezdõdése elõtt adható ki."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
 msgstr ""
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 #, fuzzy
 msgid ""
 "novice\n"
 "novice <player-name>"
 msgstr "remove <játékosnév>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 #, fuzzy
 msgid "Set one or all AI players to 'novice'."
 msgstr "Egy vagy az összes MI játékos erõsségének 'normal'-ra állítása."
 
-#: server/commands.c:226
+#: server/commands.c:225
 #, fuzzy
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
@@ -2495,7 +2498,7 @@ msgstr ""
 "akkor csak a kijelölt játékos erõsségi szintjét állítja be."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2503,11 +2506,11 @@ msgstr ""
 "easy\n"
 "easy <játékosnév>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Egy vagy az összes MI játékos erõsségének 'easy'-re állítása."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2519,7 +2522,7 @@ msgstr ""
 "kijelölt játékos erõsségi szintjét állítja be."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2527,11 +2530,11 @@ msgstr ""
 "normal\n"
 "normal <játékosnév>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Egy vagy az összes MI játékos erõsségének 'normal'-ra állítása."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2543,7 +2546,7 @@ msgstr ""
 "akkor csak a kijelölt játékos erõsségi szintjét állítja be."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2551,11 +2554,11 @@ msgstr ""
 "hard\n"
 "hard <játékosnév>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Egy vagy az összes MI játékos erõsségének 'hard'-ra állítása."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2567,7 +2570,7 @@ msgstr ""
 "kijelölt játékos erõsségi szintjét állítja be."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2575,11 +2578,11 @@ msgstr ""
 "experimental\n"
 "experimental <játékosnév>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Egy vagy az összes MI játékos erõsségének 'experimental'-ra állítása."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2594,7 +2597,7 @@ msgstr ""
 "ennek a beállításnak nincs hatása."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2608,11 +2611,11 @@ msgstr ""
 "cmdlevel <szint> first\n"
 "cmdlevel <szint> <kapcsolatnév>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Parancselérési szintek lekérdezése és beállítása."
 
-#: server/commands.c:276
+#: server/commands.c:275
 #, fuzzy
 msgid ""
 "The command access level controls which server commands are available\n"
@@ -2661,20 +2664,20 @@ msgstr ""
 "is) újra tud csatlakozni.  Megjegyzés: a parancs kapcsolatnév, nem pedig "
 "játékosnév argumentumot vár."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <kör> <körnövelés> <érték> <értékszorzó>."
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Segítségért írd be: \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2686,42 +2689,42 @@ msgstr ""
 "argumentumok alapértelmezett értéke 0 0 0 1."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 #, fuzzy
 msgid "endgame"
 msgstr "Átnevezés"
 
-#: server/commands.c:311
+#: server/commands.c:310
 #, fuzzy
 msgid "End the game immediately in a draw."
 msgstr "E parancs hatására a játék azonnal befejezõdik."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr ""
 
-#: server/commands.c:316
+#: server/commands.c:315
 #, fuzzy
 msgid "Concede the game."
 msgstr "Játék befejezése."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <játékosnév>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Játékos teljes törlése a játékból."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2730,7 +2733,7 @@ msgstr ""
 "stb. együtt.  Óvatosan használd!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2738,11 +2741,11 @@ msgstr ""
 "save\n"
 "save <fájlnév>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Játékállás elmentése fájlba."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2760,7 +2763,7 @@ msgstr ""
 "parancsot, miután a játékosok csatlakoztak."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2768,11 +2771,11 @@ msgstr ""
 "load\n"
 "load <fájlnév>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Játékállás betöltése fájlból."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2782,32 +2785,32 @@ msgstr ""
 "szerverbeállításokat.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <fájlnév>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Szerverparancsok végrehajtása egy fájlból."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <fájlnév>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr ""
 "Aktuális szerverbeállítások és eddig végrehajtott szerverparancsok kiírása "
 "fájlba."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr ""
 "A szerverkimenet stílusának átkapcsolása RFC-rõl normálra ill. normálról RFC-"
 "re."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr ""
 
@@ -3342,27 +3345,36 @@ msgstr "A(z) %si l
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "A(z) %2$si lázadás kirobbantásával %1$s diplomáciai incidenst okozott."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Év: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "A körökre vonatkozó idõkorlát elérte a maximumát; rögzítés a maximális "
 "értéknél"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "A körökre vonatkozó idõkorlát kisebb mint nulla; rögzítés nullánál."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3406,26 +3418,26 @@ msgstr "Nincs %s nev
 msgid "There is no player nor connection by the name %s."
 msgstr "Sem %1$s nevû játékos sem %1$s nevû kapcsolat nincsen."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Globális felmelegedés történt!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 "A partvonalakat elöntötte a víz, és nagy területû síkságok sivasagosodtak el."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Nukleáris tél következett be!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr "A mocsarak kiszáradtak, és nagy mennyiségû füves puszta vált tundrává."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3434,7 +3446,7 @@ msgstr ""
 "A vasút felfedezése új reménnyel tölti el az embereket.\n"
 "       Önkéntes munkások gyûlnek össze, és minden várost vasúttal látnak el."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3443,14 +3455,14 @@ msgstr ""
 "Az emberek örülnek, hogy tudósaid végre megismerték a vasutat.\n"
 "       Önkéntes munkások gyûlnek össze, és minden várost vasúttal látnak el."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, fuzzy, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr ""
 "Arrébbment egy %s egységed, mert a(z) (%d, %d) mezõ tengerbõl szárazfölddé "
 "alakult."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, fuzzy, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr ""
@@ -3512,59 +3524,59 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr ""
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr ""
 "Az adó mértéke meghaladta a(z) %s államforma esetén lehetséges maximális "
 "mértéket; kiigazítva."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr ""
 "A tudományráta meghaladta a(z) %s államforma esetén lehetséges maximális "
 "értéket; kiigazítva."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr ""
 "A luxusráta meghaladta a(z) %s államforma esetén lehetséges maximális "
 "értéket; kiigazítva."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s játékos megszüntette velünk a közös látványt!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 "A(z) %s folyamatos provokációi miatt a szenátus megszavazza a javaslatodat."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "A(z) %s és a(z) %s között a diplomáciai helyzet mostantól %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3573,67 +3585,67 @@ msgstr ""
 " %s megszegte az egyezményt! A(z) %s és a(z) %s között a diplomáciai helyzet "
 "mostantól %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr ""
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "%s játékos törlése."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Kiutasítottak a játékból!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s játékost kiutasították a játékból."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Elõször találkoztál a(z) %s népével. Vezetõjük: %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr ""
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr ""
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr "Az országban polgárháború tört ki, %s a lett a lázadók vezetõje."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s hûségesküt tesz le %s mellett."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3869,21 +3881,21 @@ msgstr "."
 msgid "th"
 msgstr "."
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "A demográfiai jelentést beállító karaktersorozat érvénytelen karakter(eke)t "
 "tartalmaz. Próbálkozz \"help demography\"-val!"
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Demográfiai jelentés:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Sajnálom, a Demográfiai jelentés nem elérhetõ."
 
-#: server/report.c:746
+#: server/report.c:748
 #, fuzzy, c-format
 msgid "The %s of the %s (%s)"
 msgstr "A(z) %2$s   (Államforma: %1$s)"
@@ -3896,11 +3908,11 @@ msgstr ""
 "Nem sikerült megtalálni a(z) \"%s\" szabálykészletfájlt. (Vagy a fájl nem "
 "olvasható.)"
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Szabályok betöltése"
 
@@ -3916,7 +3928,7 @@ msgstr ""
 "elmentett játékállások, vagy érvénytelen játékállásfájl esetén is.  A "
 "folytatás némileg kockázatos."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "A játékállás túl régi, legalább 1.9.0-ás verziójúnak kéne lennie."
@@ -3940,13 +3952,13 @@ msgstr ""
 "s' használata."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3986,7 +3998,7 @@ msgstr "Ipari"
 msgid "Networking"
 msgstr ""
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 #, fuzzy
 msgid "All"
@@ -4012,7 +4024,7 @@ msgstr "Ar
 msgid "Changed"
 msgstr "Átállítás"
 
-#: server/settings.c:102
+#: server/settings.c:83
 #, fuzzy
 msgid ""
 "Allowed take string contains invalid\n"
@@ -4021,7 +4033,7 @@ msgstr ""
 "A megengedett kapcsolatokat beállító karaktersorozat érbénytelen\n"
 "karakter(eke)t tartalmaz.  Próbálkozz \"help allowconnect\"-tel!"
 
-#: server/settings.c:136
+#: server/settings.c:119
 #, fuzzy
 msgid ""
 "Starting units string contains invalid\n"
@@ -4030,22 +4042,22 @@ msgstr ""
 "A megengedett kapcsolatokat beállító karaktersorozat érbénytelen\n"
 "karakter(eke)t tartalmaz.  Próbálkozz \"help allowconnect\"-tel!"
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -4054,23 +4066,28 @@ msgstr ""
 "A játékosok száma nagyobb az elõírt értéknél, a szerver megtartja az eredeti "
 "értéket."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Nincs jogosultságod a beállítás megváltoztatására."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr ""
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
 "  size = 20 is a huge map of 20,000 tiles"
 msgstr ""
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr ""
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4106,11 +4123,11 @@ msgid ""
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 msgstr ""
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Térképgeneráló eljárás"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4122,12 +4139,12 @@ msgid ""
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr ""
 
-#: server/settings.c:301
+#: server/settings.c:292
 #, fuzzy
 msgid "Method used to choose start positions"
 msgstr "Térképgeneráló eljárás"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4140,39 +4157,39 @@ msgid ""
 "of start pos and to the number of players"
 msgstr ""
 
-#: server/settings.c:315
+#: server/settings.c:306
 #, fuzzy
 msgid "Presence of 1x1 islands"
 msgstr "Lehetnek-e 1x1-es méretû szigetek"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = nem lehetnek 1x1-es szigetek; 1 = lehetnek 1x1-es szigetek"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "A sarkvidékek különálló kontinensek legyenek-e"
 
-#: server/settings.c:322
+#: server/settings.c:313
 #, fuzzy
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = a kontinensek összekapcsolódhatnak a sarkvidékekkel; 1 = a sarkvidékek "
 "különállóak legyenek"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr ""
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr ""
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr ""
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4190,21 +4207,21 @@ msgid ""
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr ""
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr ""
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "A dombok/hegyek százalékos aránya"
 
-#: server/settings.c:360
+#: server/settings.c:351
 #, fuzzy
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
@@ -4213,22 +4230,22 @@ msgstr ""
 "A kis értékek sík térképet, a nagy értékek sok dombot és hegyet "
 "eredményeznek."
 
-#: server/settings.c:366
+#: server/settings.c:357
 #, fuzzy
 msgid "Amount of water on lands"
 msgstr "A szárazföldi mezõk százalékos aránya"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
 msgstr ""
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "A térképgeneráláshoz használt \"random seed\" érték"
 
-#: server/settings.c:375
+#: server/settings.c:366
 #, fuzzy
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
@@ -4240,12 +4257,12 @@ msgstr ""
 "aktuális rendszeridõ alapján kisorsol egy pozitív \"seed\"-et, és azt "
 "használja a térképgeneráláshoz."
 
-#: server/settings.c:388
+#: server/settings.c:379
 #, fuzzy
 msgid "Game random seed"
 msgstr "Általános \"random seed\" érték"
 
-#: server/settings.c:389
+#: server/settings.c:380
 #, fuzzy
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
@@ -4255,11 +4272,11 @@ msgstr ""
 "szerver az aktuális rendszeridõ alapján kisorsol helyette egy pozitív \"seed"
 "\"-et."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "A speciális mezõk gyakoriságát meghatározó érték"
 
-#: server/settings.c:397
+#: server/settings.c:388
 #, fuzzy
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
@@ -4273,34 +4290,34 @@ msgstr ""
 "speciálissá tétel minden tereptípus esetén valamilyen pluszt ad az eredeti "
 "mezõ termeléséhez."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Kunyhók (apró törzsi falvak) száma"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
 msgstr ""
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Játékosok minimális száma"
 
-#: server/settings.c:419
+#: server/settings.c:410
 #, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Legalább ennyi (ember vagy MI) játékosnak kell lennie ahhoz, hogy a játék "
 "elkezdõdhessen. "
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Játékosok maximális száma"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4310,12 +4327,12 @@ msgstr ""
 "száma a játék elkezdése eléri ezt a számot, akkor az új játékosok "
 "kapcsolódási kísérleteit a szerver visszautasítja."
 
-#: server/settings.c:435
+#: server/settings.c:426
 #, fuzzy
 msgid "Total number of players (including AI players)"
 msgstr "Játékosok száma (feltöltés MI játékosokkal)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 #, fuzzy
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
@@ -4324,12 +4341,12 @@ msgstr ""
 "Ha a játék elkezdésekor aifill-nél kevesebb játékos van, akkor annyi MI "
 "játékos keletkezik, hogy a játékosok száma éppen aifill-re egészítõdjön ki."
 
-#: server/settings.c:448
+#: server/settings.c:439
 #, fuzzy
 msgid "List of players' initial units"
 msgstr "Jelenlévõ egységek ki_listázása"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4345,31 +4362,31 @@ msgid ""
 "    A   = Strong attack unit (eg., Catapult)\n"
 msgstr ""
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "A kezdeti egységek mekkora területen belül szóródjanak szét"
 
-#: server/settings.c:467
+#: server/settings.c:458
 #, fuzzy
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "Azon négyzet oldalhosszának a fele, amelyen belül szétszóródnak a kezdeti "
 "egységek."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Játékosonkénti kezdeti aranymennyiség"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 
-#: server/settings.c:480
+#: server/settings.c:471
 #, fuzzy
 msgid "Number of initial techs per player"
 msgstr "Játékosonkénti kezdeti telepesek száma"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4377,11 +4394,11 @@ msgid ""
 "next techs really expensive."
 msgstr ""
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 #, fuzzy
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
@@ -4391,11 +4408,11 @@ msgstr ""
 "Azt befolyásolja, hogy a játékosok milyen gyorsan tudnak új technológiákat "
 "kifejleszteni."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Százalékos büntetés a kutatási cél átváltásáért"
 
-#: server/settings.c:501
+#: server/settings.c:492
 #, fuzzy
 msgid ""
 "If you change your current research technology, and you have positive "
@@ -4407,12 +4424,12 @@ msgstr ""
 "százalékát.  De ha éppen ebben a körben fejlesztettél ki technológiát, akkor "
 "nem érvényes ez a szabály."
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Büntetés a diplomáciai úton szerzett tudományokért"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4424,11 +4441,11 @@ msgstr ""
 "pontjaidból, ha diplomáciai úton szerzel meg egy tudományt.  Ez akár negatív "
 "számú kutatási pontot is eredményezhet!"
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Büntetés a hódítással szerzett tudományokért"
 
-#: server/settings.c:522
+#: server/settings.c:513
 #, fuzzy
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
@@ -4439,11 +4456,11 @@ msgstr ""
 "pontjaidból, ha ellenséges város elfoglalásával szerzel meg egy tudományt.  "
 "Ez akár negatív számú kutatási pontot is eredményezhet!"
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Büntetés az \"ingyen kapott\" tudományokért"
 
-#: server/settings.c:533
+#: server/settings.c:524
 #, fuzzy
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
@@ -4456,25 +4473,25 @@ msgstr ""
 "pontjaidból, ha \"ingyen\" (kunyhóból vagy Nagy Könyvtárból) kapsz egy "
 "tudományt.  Ez akár negatív számú kutatási pontot is eredményezhet!"
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "A város növekedéséhez szükséges élelem = foodbox * városméret"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
 "the size of the city."
 msgstr ""
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr ""
 "Százalékos élelemveszteség, ha a város Vízvezeték hiánya miatt nem tud "
 "növekedni"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4484,21 +4501,21 @@ msgstr ""
 "Csatornarendszerre) lenne szüksége, akkor ennyi százaléka veszik el a város "
 "élelmiszerkészletének (illetve ennek a fele, ha van Magtár a városban)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "A normális kereskedelemtermeléshez tartozó városméret"
 
-#: server/settings.c:579
+#: server/settings.c:570
 #, fuzzy
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
@@ -4512,11 +4529,11 @@ msgstr ""
 "0%-ot (nincs más büntetés a normál korrupción kívül) fulltradesize "
 "városméretnél éri el.  Lásd még a notradesize beállítást."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "A nulla kereskedelemtermeléshez tartozó maximális városméret"
 
-#: server/settings.c:590
+#: server/settings.c:581
 #, fuzzy
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
@@ -4528,11 +4545,11 @@ msgstr ""
 "kereskedelemtermelés mértéke a városméret függvényében fokozatosan "
 "növekszik.  Lásd még a fulltradesize beállítást."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Ezen városméret fölött kezdenek boldogtalanná válni a lakosok"
 
-#: server/settings.c:600
+#: server/settings.c:591
 #, fuzzy
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
@@ -4541,11 +4558,11 @@ msgstr ""
 "Az egyéb hatások figyelembe vétele nélkül egy város elsõ unhappysize lakosa "
 "elégedett, többi lakosa pedig boldogtalan.  Lásd még a cityfactor beállítást."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Az boldogtalanság mértékét növelõ városszám"
 
-#: server/settings.c:609
+#: server/settings.c:600
 #, fuzzy
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
@@ -4558,12 +4575,12 @@ msgstr ""
 "unhappysize beállítást.  Más államformák esetén a hatás már kisebb "
 "városszámnál fellép."
 
-#: server/settings.c:618
+#: server/settings.c:609
 #, fuzzy
 msgid "Minimum distance between cities"
 msgstr "A városok közötti minimális távolság (lépéstávolság)"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4578,11 +4595,11 @@ msgstr ""
 "citymindist értéket egy szabálykészletbõl vett érték írja felül a játék "
 "kezdetekor."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Körök száma az ünneplés hatásai között"
 
-#: server/settings.c:631
+#: server/settings.c:622
 #, fuzzy
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
@@ -4592,11 +4609,11 @@ msgstr ""
 "növekedése között. Ha n-re állítjuk, akkor a városok n+1 kör ünneplés után "
 "fognak növekedni."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "A meghódított épületek megsemmisülésének az esélye"
 
-#: server/settings.c:641
+#: server/settings.c:632
 #, fuzzy
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
@@ -4605,11 +4622,11 @@ msgstr ""
 "Amikor egy játékos meghódít egy várost, minden épületnek ennyi százalék "
 "esélye van a megsemmisülésre."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "A megtámadott mezõre való átlépés esélye"
 
-#: server/settings.c:648
+#: server/settings.c:639
 #, fuzzy
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
@@ -4624,21 +4641,21 @@ msgstr ""
 "mezõn).  Általános esetben ez a 0 és 100 közötti érték adja meg a "
 "\"területfoglalás\" százalékos esélyét."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Milyen típusú támadók okozzanak városcsökkenést"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4655,33 +4672,33 @@ msgstr ""
 "  4 = helikopter\n"
 "  8 = légi"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr ""
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
 "tiles or tiles within range of more than one nation's cities."
 msgstr ""
 
-#: server/settings.c:690
+#: server/settings.c:681
 #, fuzzy
 msgid "Units inside borders cause no unhappiness"
 msgstr "A harcmezõn lévõ katonai egységek boldogtalanságot okozhatnak. "
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr ""
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4690,11 +4707,11 @@ msgid ""
 "4 = diplomacy is disabled for everyone."
 msgstr ""
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Megengedett városnevek"
 
-#: server/settings.c:708
+#: server/settings.c:699
 #, fuzzy
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
@@ -4717,11 +4734,11 @@ msgstr ""
 "akkor a játékos nem adhatnak olyan nevet a városainak, ami alapértelmezett "
 "városneve egy másik népnek."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "A barbárok megjelenésének gyakorisága"
 
-#: server/settings.c:737
+#: server/settings.c:728
 #, fuzzy
 msgid ""
 "0 = no barbarians \n"
@@ -4736,29 +4753,29 @@ msgstr ""
 "3 - gyakori barbármegjelenés \n"
 "4 - dühöngõ hordák, rengeteg barbár"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Barbárok kezdési éve"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Ezen év elõtt nem jelenhetnek meg barbárok a játékban."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr ""
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
 msgstr ""
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Fog of war ki-/bekapcsolása"
 
-#: server/settings.c:765
+#: server/settings.c:756
 #, fuzzy
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
@@ -4770,31 +4787,31 @@ msgstr ""
 "nem fogják észrevenni pl. az új városok megjelenését vagy a "
 "terepváltozásokat."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Ûrhajók engedélyezése/tiltása"
 
-#: server/settings.c:783
+#: server/settings.c:774
 #, fuzzy
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Ha 1-re állítjuk, akkor a játékosok építhetnek ûrhajót."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Minimális városszám a polgárháborúhoz"
 
-#: server/settings.c:790
+#: server/settings.c:781
 #, fuzzy
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
@@ -4805,23 +4822,23 @@ msgstr ""
 "akkor a játékos országában polgárháború tör ki.  Ha a beállítás értéke "
 "maximális, akkor nem lesz polgárháború a játékban."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr ""
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
 "players cannot meet unless they have an embassy."
 msgstr ""
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Palota újrafelépítése, ha elfoglalják a fõvárost"
 
-#: server/settings.c:811
+#: server/settings.c:802
 #, fuzzy
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
@@ -4833,11 +4850,11 @@ msgstr ""
 "automatikusan újraépül a játékos egy véletlenszerûen kiválasztott városában, "
 "feltéve hogy a játékos ismeri a Kõmûvességet."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Terepfüggõ városelnevezés használata"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -4845,11 +4862,11 @@ msgstr ""
 "Ha engedélyezzük, akkor a környezõ tereptõl függ a szerver által felajánlott "
 "városnév."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr ""
 
-#: server/settings.c:835
+#: server/settings.c:826
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
@@ -4908,11 +4925,11 @@ msgstr ""
 "A többszörös ill. megfigyelõ kapcsolódások megvalósítása pillanatnyilag "
 "KÍSÉRLETI stádiumban van."
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "MI állapot be-/kikapcsolása a kapcsolódás/szétkapcsolás hatására"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -4920,25 +4937,27 @@ msgstr ""
 "Ha 1-re állítjuk, akkor kapcsolódáskor megszûnik, a kapcsolat bontásakor "
 "pedig beállítódik az MI állapot a játékosoknál."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "A játék befejezési éve"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr ""
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Maximum hány másodpercig tarthat egy kör"
 
-#: server/settings.c:885
+#: server/settings.c:876
 #, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "A kör automatikusan befejezõdik, ha ennyi idõ eltelte után nem nyomott még "
 "minden játékos \"Kör vége\" gombot. Ha a beállítás értéke nulla, akkor nincs "
@@ -4947,33 +4966,33 @@ msgstr ""
 "idõkorlátot is létrehozhatunk, ha a beállítást a 'timeoutincrease' "
 "paranccsal együtt használjuk."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 #, fuzzy
 msgid "Whether to have simultaneous player phases."
 msgstr "Játékosstatisztika naplózása"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 #, fuzzy
 msgid "Seconds to let a client's network connection block"
 msgstr "Hány másodpercig blokkolódhat egy kapcsolat"
 
-#: server/settings.c:914
+#: server/settings.c:907
 #, fuzzy
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
@@ -4984,12 +5003,12 @@ msgstr ""
 "bezárja a szerver. A nulla érték azt jelenti, hogy nincs külön idõkorlát a "
 "TCP protokoll által meghatározott idõkorláton kívül."
 
-#: server/settings.c:923
+#: server/settings.c:916
 #, fuzzy
 msgid "Max seconds for network buffers to drain"
 msgstr "Maximum hány másodpercig ürülhetnek ki a TCP pufferek"
 
-#: server/settings.c:924
+#: server/settings.c:917
 #, fuzzy
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
@@ -5000,12 +5019,12 @@ msgstr ""
 "puffer blokkolódásának megszûnésére. Ha a beállítás értéke nulla, akkor a "
 "szerver semennyit sem fog várni."
 
-#: server/settings.c:932
+#: server/settings.c:925
 #, fuzzy
 msgid "Seconds between PINGs"
 msgstr "Hány másodpercenként PING-eljen a szerver"
 
-#: server/settings.c:933
+#: server/settings.c:926
 #, fuzzy
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
@@ -5015,20 +5034,20 @@ msgstr ""
 "PING kérést. Ha egy kliens nem válaszol PONG-gal a következõ PING elõtt, "
 "akkor a klienssel megszakad a kapcsolat."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr ""
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Szigorúan körökre osztott játékmód"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
@@ -5038,11 +5057,11 @@ msgstr ""
 "játékos (beleértve azokat is, akikkel megszakadt a kapcsolat) be nem fejezte "
 "a körét."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Fix hosszúságú körök"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5051,11 +5070,11 @@ msgstr ""
 "Ha 1-re állítjuk, akkor nem kezdõdik el a következõ kör az idõkorlát letelte "
 "elõtt, függetlenül attól, hogy a játékosok nyomtak-e \"Kör vége\" gombot."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Mi legyen a Demográfiai jelentésben"
 
-#: server/settings.c:964
+#: server/settings.c:957
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
@@ -5092,11 +5111,11 @@ msgstr ""
 "(A karakterek sorrendje nem számít, de a kis és nagy betûk különbözõnek "
 "számítanak.)"
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Hány körönként legyen automatikus mentés"
 
-#: server/settings.c:989
+#: server/settings.c:982
 #, fuzzy
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
@@ -5105,11 +5124,11 @@ msgstr ""
 "A játék ennyi körönként automatikusan el lesz mentve.\n"
 "A nulla azt jelenti, hogy soha ne legyen automatikus mentés."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Elmentett állások tömörítésének mértéke"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 #, fuzzy
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
@@ -5121,11 +5140,11 @@ msgstr ""
 "lassabb tömörítést eredményez.  Ha a beállítás maximális értéke nulla, akkor "
 "a szervert úgy fordították, hogy ne használjon zlib-et."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Automatikus mentés név-elõtagja"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 #, fuzzy
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
@@ -5135,11 +5154,11 @@ msgstr ""
 "lesz.\n"
 "Ez a beállítás adja meg az <elõtag> részt."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Játékosstatisztika naplózása"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 #, fuzzy
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
@@ -5156,7 +5175,7 @@ msgstr ""
 "A szerver nem tudja olvasni a standard bemenetet. Bemenet figyelmen kívül "
 "hagyása."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, fuzzy, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Metaszerver: rossz cím: [%s]."
@@ -5295,104 +5314,104 @@ msgstr "Nem siker
 msgid "Game saved as %s"
 msgstr "A játékállást elmentettem %s néven"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "A játék már fut."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Játék indítása."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr ""
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, fuzzy, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Figyelmeztetés: Éhínség van %s városában."
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "%d típusú csomag érkezett egy legyõzött vagy megfigyelõ játékostól"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Nem üres nevet válassz."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 #, fuzzy
 msgid "That nation is already in use."
 msgstr "A játék már fut."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "Van már '%s' nevû játékos.  Válassz másik nevet."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 #, fuzzy
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Nem üres nevet válassz."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, fuzzy, c-format
 msgid "%s nation is already in use."
 msgstr "A játék már fut."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s a(z) %s uralkodó %s néven."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, fuzzy, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Nem sikerült elkezdeni a játékot: a játék már fut."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, fuzzy, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "A szerver felvette a játékba %s MI irányította játékost."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "%d. Játékos"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s a(z) %s uralkodója."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Információ küldése a metszervernek [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Vége a játéknak..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Most fogadom a kliensek kapcsolódását."
 
@@ -5413,7 +5432,7 @@ msgstr "(k
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5590,7 +5609,7 @@ msgstr "A j
 msgid "Removed player %s from the game."
 msgstr "%s játékos a játékból sikeresen eltávolítva."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5669,744 +5688,772 @@ msgstr ""
 "Nem sikerült '%s' szintre növelni a parancselérési szintet; csak '%s' "
 "szinttel rendelkezel."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "A(z) %2$s kapcsolat parancselérési szintje mostantól '%1$s'."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 "Nem sikerült beállítani a(z) '%s' parancselérési szintet a(z) %s kapcsolat "
 "számára."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Az új játékosok parancselérési szintje mostantól '%s'."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "A parancselérési szint az elsõ játékos számára mostantól '%s'."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 #, fuzzy
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "A 'firstlevel' parancsnak a szerver konzoljáról kiadva nincsen hatása."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Már rendelkezel '%s' vagy magasabb parancselérési szinttel."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 #, fuzzy
 msgid "Someone else already is game organizer."
 msgstr "Sajnálom, ez már valaki másnak a neve."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Érvénytelen argumentum: %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Használat: timeoutincrease <kör> <körnövelés> <érték> <értékszorzó>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Dinamikus idõzítõ beállítása %d %d %d %d értékre"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Beállítás:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Leírás:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Státusz: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "változtatható"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fix"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Érték: %d, Minimum: 0, Alapértelmezés: %d, Maximum: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Érték: %d, Minimum: %d, Alapértelmezés: %d, Maximum: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Érték: \"%s\", Alapértelmezés: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "A következõ szerverbeállításokhoz található leírás:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Még nincs hozzá leírás."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Kétértelmû beállításnév."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Szerveroperátor: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "'%s' játékos MI erõsségi szintje mostantól '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s játékos nem MI irányítás alatt áll."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Az alapértelmezett MI erõsségi szint '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 #, fuzzy
 msgid "This command is client only."
 msgstr "Ez a parancs pillanatnyilag még nincs megvalósítva."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr ""
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, fuzzy, c-format
 msgid "%s set to away mode."
 msgstr "A(z) \"%s\" érvénytelen városnév."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, fuzzy, c-format
 msgid "%s returned to game."
 msgstr "A(z) %s egységed visszatért üzemanyagfelvételre."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Sajnálom, nincs jogosultságod a(z) '%s' beállítás megtekintésére."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "A(z) '%s' ismeretlen beállítás."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 #, fuzzy
 msgid "All options with non-default values"
 msgstr "az '=' jelentése: a beállítás az alapértelmezett értékén van"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 #, fuzzy
 msgid "All options"
 msgstr "Helyi beállítások"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 #, fuzzy
 msgid "Vital options"
 msgstr "Városbeállítások"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 #, fuzzy
 msgid "Situational options"
 msgstr "Helyi beállítások"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr ""
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "a '+' jelentése: a beállítás változtatható"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "az '=' jelentése: a beállítás az alapértelmezett értékén van"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s érték   (min,max)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Beállítás"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "leírás"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 #, fuzzy
 msgid "Cannot change teams once game has begun."
 msgstr "Nem állíthatod át a rátákat a játék elkezdõdése elõtt."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 #, fuzzy
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Definiálatlan argumentum.  Használat: set <beállítás> <érték>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 #, fuzzy
 msgid "Cannot team a barbarian."
 msgstr "Barbár játékos MI irányítását nem lehet kikapcsolni."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, fuzzy, c-format
 msgid "Player %s set to team %s."
 msgstr "A(z) %s vesztettek egy %s egységet a(z) %s támadása miatt"
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 #, fuzzy
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Definiálatlan argumentum.  Használat: set <beállítás> <érték>."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr ""
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr ""
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr ""
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr ""
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 #, fuzzy
 msgid "Value must be integer."
 msgstr "Egész számot kell megadni."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr ""
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, fuzzy, c-format
 msgid "You voted for \"%s\""
 msgstr "Megalapítottad %s városát"
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 #, fuzzy
 msgid "Can only use this command once game has begun."
 msgstr "A játék elkezdõdése után nem lehet MI játékosokat hozzáadni."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 #, fuzzy
 msgid "Value 2 & 3 must be integer."
 msgstr "Egész számot kell megadni."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr ""
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr ""
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "%s %s egységét atomtámadás érte."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "%s %s egységét atomtámadás érte."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 #, fuzzy
 msgid "Value 2 must be integer."
 msgstr "Egész számot kell megadni."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr ""
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Definiálatlan argumentum.  Használat: set <beállítás> <érték>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Nincs jogosultságod a beállítás megváltoztatására."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Ez a beállítás a játék elkezdõdése után már nem változtatható meg."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Egész számot kell megadni."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr ""
 "A megadott érték kívül esik a megengedett tartományon (minimum: 0, maximum: "
 "1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "A(z) %s beállítás új értéke: %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr ""
 "A megadott érték kívül esik a megengedett tartományon (minimum: %d, maximum: "
 "%d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "A megadott sztring túl hosszú.  Használat: set <beállítás> <érték>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "A(z) %s beállítás új értéke: \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 #, fuzzy
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Sajnálom, ebbe a játékba nem léphetnek be új játékosok."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr ""
+"Sajnálom, ebben a játékban az ember játékosok számára tilos az "
+"újrakapcsolódás."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 #, fuzzy
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Sajnálom, ebben a játékban tilos a barbárok megfigyelése."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 #, fuzzy
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Sajnálom, ebben a játékban tilos a barbárok megfigyelése."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 #, fuzzy
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Sajnálom, ebben a játékban tilos a legyõzött játékok megfigyelése."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 #, fuzzy
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Sajnálom, ebben a játékban tilos a legyõzött játékok megfigyelése."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 #, fuzzy
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Sajnálom, ebben a játékban tilos az MI játékosok megfigyelése."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 #, fuzzy
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Sajnálom, ebben a játékban tilos az MI játékosok megfigyelése."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 #, fuzzy
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Sajnálom, ebben a játékban tilos az MI játékosok megfigyelése."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 #, fuzzy
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 "Sajnálom, ebben a játékban az ember játékosok számára tilos az "
 "újrakapcsolódás."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 #, fuzzy
 msgid "Sorry, one can't observe in this game."
 msgstr "Sajnálom, ebbe a játékba nem léphetnek be új játékosok."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 #, fuzzy
 msgid "Sorry, one can't take players in this game."
 msgstr "Sajnálom, ebbe a játékba nem léphetnek be új játékosok."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 #, fuzzy
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "Sajnálom, ebbe a játékba nem léphetnek be új játékosok."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr ""
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 #, fuzzy
 msgid "Usage: observe [player-name]"
 msgstr "remove <játékosnév>"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, fuzzy, c-format
 msgid "%s is already observing %s."
 msgstr "%s városában %s épül."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, fuzzy, c-format
 msgid "%s is already observing."
 msgstr "%s városában %s épül."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, fuzzy, c-format
 msgid "%s now observes %s"
 msgstr "%1$s mostantól %3$s államformában irányítja a(z) %2$s népét."
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, fuzzy, c-format
 msgid "%s now observes"
 msgstr "%1$s mostantól %3$s államformában irányítja a(z) %2$s népét."
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 #, fuzzy
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "set <beállításnév> <érték>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 #, fuzzy
 msgid "Usage: take <player-name>"
 msgstr "create <játékosnév>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
-msgstr ""
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
+msgstr "%s városában %s épül."
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Sem %1$s nevû játékos sem %1$s nevû kapcsolat nincsen."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr ""
 
-#: server/stdinhand.c:3076
+#: server/stdinhand.c:3135
 #, fuzzy, c-format
-msgid "%s now controls %s (%s, %s)"
+msgid "%s now controls %s (%s, %s)."
 msgstr "%1$s mostantól %3$s államformában irányítja a(z) %2$s népét."
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbár"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "MI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Ember"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 #, fuzzy
 msgid "Alive"
 msgstr "Aktív"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 #, fuzzy
 msgid "Dead"
 msgstr ", Legyõzött"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "A(z) \"%s\" érvénytelen városnév."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 #, fuzzy
 msgid "Usage: detach <connection-name>"
 msgstr "cut <kapcsolatnév>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 #, fuzzy
 msgid "You can not detach other users."
 msgstr "Ott nem támadhatsz."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, fuzzy, c-format
 msgid "%s is not attached to any player."
 msgstr "A(z) \"%s\" érvénytelen városnév."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, fuzzy, c-format
 msgid "%s detaching from %s"
 msgstr "A(z) %s ellopták a(z) %s tudományt a(z) %s népétõl"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, fuzzy, c-format
 msgid "%s no longer observing."
 msgstr "%s városában %s épül."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, fuzzy, c-format
 msgid "detaching from %s."
 msgstr "Kutatás alatt: %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 #, fuzzy
 msgid "Usage: load <game name>"
 msgstr "Használat: load <fájlnév>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 #, fuzzy
 msgid "Cannot load a game while another is running."
 msgstr "Nem lehet játékállást betölteni, amíg egy másik játék fut."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, fuzzy, c-format
 msgid "Could not load savefile: %s"
 msgstr "Nem sikerült betölteni a(z) %s játékállást"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "A jelenlegi szabálykészlet könyvtár: \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "A(z) \"%s\" szabálykészlet könyvtár nem található"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, fuzzy, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "A szabálykészlet könyvtár mostantól \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "A szabálykészlet könyvtár mostantól \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Viszlát!"
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Sajnálom, nincs jogosultságod szerverparancsok kiadására."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Figyelmeztetés: '%s' értelmezése %s'-ként, de kétértelmûség van.  Próbálkozz "
 "'%shelp'-pel!"
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Ismeretlen parancs.  Próbálkozz '%shelp'-pel!"
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr ""
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Nincs jogosultságod használni ezt a parancsot."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(szerverprompt)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 #, fuzzy
 msgid "Game ended in a draw."
 msgstr "Játék vége"
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Nem sikerült befejezni a játékot: a játék nem fut."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 #, fuzzy
 msgid "You cannot surrender now."
 msgstr "Épület szabotálása"
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
+msgstr "Nincs elég játékos, a játék nem kezdhetõ el."
+
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
 msgstr "Nincs elég játékos, a játék nem kezdhetõ el."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Nincs elég játékos, a játék nem kezdhetõ el."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 #, fuzzy
 msgid "All players are ready; starting game."
 msgstr "Van már ilyen nevû játékos."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 #, fuzzy
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr "Nem sikerült elkezdeni a játékot: a játék már fut."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Nem sikerült elkezdeni a játékot: a játék már fut."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "A(z) %s kapcsolat megszakítása."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6447,124 +6494,124 @@ msgstr ""
 "  save   -  pillanatnyi játékállás elmentése\n"
 "  quit   -  kilépés"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Parancs:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Áttekintés: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Szint: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "A lehetséges szerverparancsok a következõk:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "A help parancs '%s' argumentuma kétértelmû."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "A help parancs '%s' argumentumára semmi sem illeszkedik."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr ""
 "A list parancs argumentuma ('%s') hibás.  Próbálkozz '%shelp list'-tel!"
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "A játékosok listája:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<nincsenek játékosok>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, fuzzy, c-format
 msgid "user %s, "
 msgstr "felhasználói név: %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Legyõzött"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", erõsségi szint: %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 #, fuzzy
 msgid ", ready"
 msgstr ", Legyõzött"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ""
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] "%d kapcsolat:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s@%s (parancselérési szint: %s), pufferméret=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (megfigyelõ üzemmód)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 #, fuzzy
 msgid "List of teams:"
 msgstr "A játékosok listája:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr ""
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "A szerverhez való kapcsolódások listája:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<nincs kapcsolat>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 #, fuzzy
 msgid "List of scenarios available:"
 msgstr "Nincsenek egységek"
@@ -6642,17 +6689,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "A technológiai cél a(z) %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Elloptad a(z) %s tudományt a(z) %s népétõl."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "A(z) %s ellopták tõled a(z) %s tudományt!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "A(z) %s ellopták a(z) %s tudományt a(z) %s népétõl."
@@ -7171,20 +7218,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr "A(z) %s egységed visszatért üzemanyagfelvételre."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Sok szárazföld - ez néhány másodpercet vehet igénybe."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, fuzzy, c-format
 msgid "Falling back to generator %d."
 msgstr "Vissza a 2-es generálóeljáráshoz."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "A 3-as generálóeljárás nem helyezte el az összes nagy szigetet."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "A 3-as generálóeljárás %li szárazföldi mezõt nem helyezett el."
@@ -7272,120 +7319,121 @@ msgstr ""
 msgid "Cannot find audio file %s"
 msgstr "Nincs meg a(z) %s hangfájl"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX kör"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "körönként %3d arany"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d kör"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "soha"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/kör"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d kör"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Elavult"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Megépítve"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 #, fuzzy
 msgid "Great Wonder"
 msgstr "Világcsoda"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 #, fuzzy
 msgid "Small Wonder"
 msgstr "Megépíthetõ világcsodák"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/kör"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, fuzzy, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%s - %s lakos"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, fuzzy, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "Nem létezik kereskedelmi útvonal.\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, fuzzy, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "Egységet épít"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -7512,8 +7560,8 @@ msgid "Best defending units"
 msgstr "Jelenlévõ egységek ki_listázása"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7708,8 +7756,8 @@ msgstr "?pollution [short]:Szenny"
 msgid "?cma:Governor"
 msgstr "?cma:Helytartó"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 #, fuzzy
@@ -7983,21 +8031,21 @@ msgstr ""
 "Automatikus kapcsolódás a(z) \"%s\" szerverhez a(z) %d porton \"%s\" néven %"
 "d.%d másodpercenként (%d kísérlet)"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 #, fuzzy
 msgid "novice"
 msgstr "semmi"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "könnyû"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 #, fuzzy
 msgid "normal"
 msgstr "Tisztességes"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "nehéz"
 
@@ -8005,35 +8053,35 @@ msgstr "neh
 msgid "experimental"
 msgstr ""
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 #, fuzzy
 msgid "Starting server..."
 msgstr "Játék indítása."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 #, fuzzy
 msgid "Couldn't start the server."
 msgstr "Ott nem támadhatsz."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr ""
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 #, fuzzy
 msgid "Couldn't connect to the server."
 msgstr "Egy klienssel való kapcsolat megszakítása."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr ""
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 #, fuzzy
 msgid "We have control of the server (command access level hack)"
 msgstr "Parancselérési szintek lekérdezése és beállítása."
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 
@@ -8121,28 +8169,28 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, fuzzy, c-format
 msgid "Allows %s."
 msgstr "Lehetõvé válik a(z) %s.\n"
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, fuzzy, c-format
 msgid "Allows %s (with %s)."
 msgstr "Lehetõvé válik a(z) %s (ha van már %s).\n"
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 #, fuzzy
 msgid " Rivers"
 msgstr "  Folyók"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Sajnálom, a(z) %s azonosítóhoz nincs súgó témakör.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8153,13 +8201,13 @@ msgstr ""
 "Ez egy automatikusan generált lap.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr ""
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, fuzzy, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr ""
@@ -8167,208 +8215,208 @@ msgstr ""
 "\n"
 "A(z) %2$s elavul a %1$s felfedezésével.  "
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, fuzzy, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 "Minden %s tudományt ismerõ játékosnak engedélyezi a(z) %s egységek "
 "építését.  "
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, fuzzy, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "Lehetõvé válik a(z) %s (ha van már %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, fuzzy, c-format
 msgid "* Allows %s.\n"
 msgstr "Lehetõvé válik a(z) %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 #, fuzzy
 msgid "* May not be built in cities.\n"
 msgstr "* Alapíthat új városokat.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr ""
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr ""
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr ""
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr ""
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Tud szállítani és új üzemanyaggal ellátni %d légi egységet.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Tud szállítani és új üzemanyaggal ellátni %d rakétaegységet.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* %d szárazföldi egységet tud szállítani a tengeren.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, fuzzy, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Segíthet világcsodát építeni.\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr ""
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Alapíthat új városokat.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 #, fuzzy
 msgid "* Can build roads and railroads.\n"
 msgstr "* Segíthet világcsodát építeni.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 #, fuzzy
 msgid "* Can build mines on tiles.\n"
 msgstr "* Alapíthat új városokat.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 #, fuzzy
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Alapíthat új városokat.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 #, fuzzy
 msgid "* Can build farmland.\n"
 msgstr "Farmot Épít"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, fuzzy, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Alapíthat új városokat.\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 #, fuzzy
 msgid "* Can build fortresses.\n"
 msgstr "Lehetõvé teszi a(z) %s egységek számára az erõdépítést.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 #, fuzzy
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "Nukleáris Szennyezést Eltakarít"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 #, fuzzy
 msgid "* Can transform tiles.\n"
 msgstr "* Végezhet telepes tevékenységeket.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 #, fuzzy
 msgid "* Can build airbases.\n"
 msgstr "* Alapíthat új városokat.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Végrehajthat diplomáciai akciókat, ezen kívül speciális, csak kémekre "
 "jellemzõ képességei is vannak.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Végrehajthat diplomáciai akciókat.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr ""
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Megtámadhat ellenséges légi egységeket.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* Láthatatlan, kivéve ha közvetlenül egy ellenséges egység vagy város "
 "mellett van.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Csak tengeri mezõn tartózkodó egységeket támadhat.\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 #, fuzzy
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
@@ -8377,79 +8425,79 @@ msgstr ""
 "* Tengeri egységek fedélzetérõl is képes támadni: városokat és szárazföldi "
 "mezõket."
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, fuzzy, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr ""
 "* A városokból indítva ejtõernyõs ugrást hajthat végre (Hatótávolság: %d)."
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Dupla védelem a 'lovas' jelzõvel ellátott egységek ellen.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Bizonyos védõk ellen 'lovas' egységnek számít.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Rakéta típusú egység: támadás közben megsemmisül.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* A támadás lezárja az egység körét.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Az egység támadása atomrobbanást okoz!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr ""
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Nem hat rá a városfal.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Négyszeres védelem a rakéták és repülõgépek ellen.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 "* Mozgását nem befolyásolják a terepviszonyok (minden mezõt útként "
 "használ).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Nem hatnak rá a fennhatósági zónák.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* Nem katonai egység (nem tud támadni; nem csökkenti a zavargást).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 "* Harctéri egység: akkor is 1 boldogtalanságot okoz, amikor nem agresszív.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr ""
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, fuzzy, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8458,12 +8506,12 @@ msgstr ""
 "* Ha nem városban vagy part mellett fejezi be a körét, akkor 50%% eséllyel "
 "elsüllyed a tengerben."
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr ""
@@ -8472,29 +8520,29 @@ msgstr ""
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " vagy "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr ""
 "Ha most elkezdenénk kutatni a(z) %s tudományt, %d villanykörtét kéne "
 "összegyûjtenünk."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8503,97 +8551,97 @@ msgstr ""
 "A(z) %s tudomány felfedezéséhez elõbb ki kell fejlesztenünk %d másik "
 "technológiát. A teljes projekt teljesítése %d villanykörtét igényel."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr ""
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr " Ez a szám a többi játékos kutatásától függõen változhat.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, fuzzy, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "Az elsõ játékos, aki felfedezi a(z) %s tudományt, kap egy azonnali új "
 "technológiát.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 #, fuzzy
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "Növeli a lakosság által termelt szennyezést.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, fuzzy, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr ""
 "Lehetõvé teszi a(z) %s egységek számára az útépítést a folyóval rendelkezõ "
 "mezõkön.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, fuzzy, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "Lehetõvé teszi a(z) %s egységek számára az erõdépítést.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, fuzzy, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "Lehetõvé teszi a(z) %s egységek számára a légibázisépítést.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, fuzzy, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr ""
 "Lehetõvé teszi a(z) %s egységek számára az utak vasúttá fejlesztését.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, fuzzy, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr ""
 "Lehetõvé teszi a(z) %s egységek számára az öntözött területek farmmá "
 "fejlesztését.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 #, fuzzy
 msgid "* You cannot build cities on this terrain."
 msgstr "Ennek a népnek az egységeit nem lehet lefizetni."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr ""
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr ""
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr ""
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8603,7 +8651,7 @@ msgid_plural ""
 "become unhappy.\n"
 msgstr[0] "A harcmezõn lévõ katonai egységek boldogtalanságot okozhatnak. "
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8611,48 +8659,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8660,23 +8708,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8686,71 +8734,71 @@ msgid_plural ""
 "force %d unhappy citizens to become content.\n"
 msgstr[0] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
 msgstr[0] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 #, fuzzy
 msgid "* Your units cannot be bribed.\n"
 msgstr "Ez az egységtípus nem hajthat végre ejtõernyõs támadást."
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 #, fuzzy
 msgid "* Your cities cannot be incited.\n"
 msgstr "A város nem lázítható fel!"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 #, fuzzy
 msgid "* Has no unhappy citizens.\n"
 msgstr "a plusz %d boldogtalan lakosos büntetés életbe lépéséig."
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 #, fuzzy
 msgid "* Veteran units.\n"
 msgstr "Tengeri egységek ellen"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8758,7 +8806,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8766,71 +8814,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, fuzzy, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "Lehetõvé teszi a(z) %s egységek számára a légibázisépítést.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, fuzzy, c-format
 msgid "%s%d %s"
 msgstr "%3d/%3d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d boldogtalan"
@@ -9248,16 +9296,16 @@ msgstr "A szerver k
 msgid "Start of turn %d"
 msgstr "Elkezdõdött a(z) %d. kör"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "Az MI irányítás %s van kapcsolva."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "BE"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "KI"
 
@@ -9291,13 +9339,13 @@ msgstr "?city:N
 msgid "Username"
 msgstr "Átnevezés"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Zászló"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9313,7 +9361,7 @@ msgstr "B
 msgid "Score"
 msgstr "Pontszámok"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 #, fuzzy
 msgid "Team"
 msgstr "Templom"
@@ -9350,37 +9398,37 @@ msgstr ""
 msgid "Ping"
 msgstr "Király"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 #, fuzzy
 msgid "You cannot sell improvements."
 msgstr "Épület szabotálása"
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, fuzzy, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "%d %s eladva %d aranyért"
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, fuzzy, c-format
 msgid "No %s could be sold."
 msgstr "Egy %s sem adható el"
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr ""
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, fuzzy, c-format
 msgid "%s cannot be disbanded."
 msgstr "Egy %si %s feloszlott, mert a város nem tudja fenntartani."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, fuzzy, c-format
 msgid "Disbanded %d %s."
 msgstr "Feloszlott egy %s egységed a(z) (%d, %d) mezõn."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, fuzzy, c-format
 msgid "No %s could be disbanded."
 msgstr "Egy %s sem adható el"
@@ -9687,121 +9735,126 @@ msgstr "Arany: %d"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Adó:%d Lux:%d Tud:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr " %s városában"
+
+#: client/text.c:609
 #, fuzzy, c-format
 msgid "Moving: %s"
 msgstr " %s városában"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr ""
 
-#: client/text.c:625
+#: client/text.c:629
 #, fuzzy, c-format
 msgid "%s People"
 msgstr "Fel"
 
-#: client/text.c:629
+#: client/text.c:633
 #, fuzzy, c-format
 msgid "Turn: %d"
 msgstr "Terep: %s"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Arany: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr ""
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, fuzzy, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Adó:%d Lux:%d Tud:%d"
 
-#: client/text.c:639
+#: client/text.c:643
 #, fuzzy, c-format
 msgid "Researching %s: %s"
 msgstr "Kutatás:    %s: %d/%d"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Államforma: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, fuzzy, c-format
 msgid "%d unit"
 msgid_plural "%d units"
 msgstr[0] " egység"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr ""
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr ""
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, fuzzy, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "Egységválasztás"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 #, fuzzy
 msgid "No units selected."
 msgstr "Nép kiválasztása"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 #, fuzzy
 msgid "No units to upgrade!"
 msgstr "Nem volt felfejlesztendõ egység."
 
-#: client/text.c:860
+#: client/text.c:864
 #, fuzzy
 msgid "None of these units may be upgraded."
 msgstr "Nem volt felfejlesztendõ egység."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9813,11 +9866,11 @@ msgstr[0] ""
 "Felfejlesszük a(z) %s egységet %s egységgé %d aranyért?\n"
 "A kincstárban %d arany van."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 
-#: client/text.c:893
+#: client/text.c:897
 #, fuzzy
 msgid "no research target."
 msgstr ""
@@ -9825,203 +9878,203 @@ msgstr ""
 "(nincs kutatás)"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr ""
 
-#: client/text.c:917
+#: client/text.c:921
 #, fuzzy, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Szennyezés:   %3d"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr ""
 
-#: client/text.c:936
+#: client/text.c:940
 #, fuzzy, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Maximális lehetséges arány %s államforma esetén: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 #, fuzzy
 msgid "Shows your current government:"
 msgstr "Aktuális pontszámok megjelenítése."
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, fuzzy, c-format
 msgid "Population:      %5d"
 msgstr "Népesség: %s"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, fuzzy, c-format
 msgid "Energy:          %5d %%"
 msgstr "Tömeg:           %5d tonna"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
 msgstr[0] "Tömeg:           %5d tonna"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Útidõ:           %5.1f év"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Útidõ:              -       "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr ""
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:ki"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02dmp"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dperc %02dmp"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dóra %02dperc"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dnap %02dóra"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:túlcsordulás"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr ""
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, fuzzy, c-format
 msgid "%s of the %s"
 msgstr "A(z) %2$s   (Államforma: %1$s)"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, fuzzy, c-format
 msgid "Observer: %s"
 msgstr " (megfigyelõ)"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Épületek: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Nincsenek. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Világcsodák: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Városok: %d darab, %d várossal több mint a(z) %d városos küszöb."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
 msgstr[0] "%d elégedett lakos lehet még "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
 msgstr[0] "a plusz %d boldogtalan lakosos büntetés életbe lépéséig."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Katonai jelenlét hatása ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "nincs egységlimit, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
 msgstr[0] "maximum %d egységig, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "egységenként %d). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "A harcmezõn lévõ katonai egységek boldogtalanságot okozhatnak. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "A katonai egységek nincsenek hatással a közhangulatra. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luxus: összesen %d."
@@ -10069,12 +10122,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "semmi"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "saját"
 
@@ -10130,12 +10183,14 @@ msgid "Ooops..."
 msgstr "Beállítások..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 #, fuzzy
 msgid "This unit cannot be bribed!"
 msgstr "Ez az egységtípus nem hajthat végre ejtõernyõs támadást."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10152,6 +10207,7 @@ msgstr "Ellens
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10193,6 +10249,7 @@ msgstr "Technol
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "A kém megítélésére bízzuk"
 
@@ -10218,12 +10275,13 @@ msgstr "Fejleszt
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "A város termelése"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Nem lázíthatod fel %s városát."
@@ -10235,6 +10293,7 @@ msgstr "A v
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10251,6 +10310,7 @@ msgstr "Fell
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10260,6 +10320,7 @@ msgstr ""
 "A kincstárban %d arany van."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10329,11 +10390,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Ellenséges egység átállítása"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Uram, a diplomata a parancsára vár"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Uram, a kém a parancsára vár"
@@ -10437,7 +10500,7 @@ msgstr "Szennyez
 msgid "_Overview"
 msgstr "Általános _jellemzõk"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10462,11 +10525,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d kör"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "Meg_vétel"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "Termelés"
@@ -10595,7 +10658,7 @@ msgstr "Eltartott egys
 msgid "Present units %d"
 msgstr "Jelenlévõ egységek: %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "_Középre hozás"
 
@@ -10687,36 +10750,36 @@ msgstr "V
 msgid "What should we rename the city to?"
 msgstr "Mi legyen a város új neve?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_Átállítás"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 #, fuzzy
 msgid "Add _First"
 msgstr "Minta hozzáadása"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 #, fuzzy
 msgid "Add _Next"
 msgstr "Minta hozzáadása"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 #, fuzzy
 msgid "Add _Last"
 msgstr "Minta hozzáadása"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 #, fuzzy
 msgid "_Select"
 msgstr "Kiválasztás"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "_Megjelenítés..."
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10726,13 +10789,13 @@ msgstr "_Megjelen
 msgid "Cities"
 msgstr "Városok"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "Meg_nyitás"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10741,85 +10804,90 @@ msgstr "Meg_nyit
 msgid "Improvements"
 msgstr "Fejlesztések"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Világcsodák"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Összes város"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Nincsenek városok"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Kijelölés invertálása"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Egységet épít"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Épületet épít"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Világcsodát épít"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Egységet épít"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Épületet épít"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Világcsodát épít"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Partmenti városok"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Ugyanazon a szigeten"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Eltartott egységek"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Jelenlévõ egységek"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Épületek a városban"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Világcsodák a városban"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Legyártható egységek"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Megépíthetõ épületek"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Megépíthetõ világcsodák"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Összes Kiadás:"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10883,135 +10951,135 @@ msgstr "Mi legyen az 
 msgid "Remove this preset?"
 msgstr "Töröljem ezt a mintát?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "Menj (_L)"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "_Városablak felnyitása"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Azt mondod, forradalom kéne?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Forradalom!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Mit fosztogassunk"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Válaszd ki, hogy mit fosztogassunk:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 #, fuzzy
 msgid "Unit"
 msgstr "Egységek"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Név"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Egységválasztás"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 #, fuzzy
 msgid "_Ready all"
 msgstr "Mindenki készenlétbe"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 #, fuzzy
 msgid "_Sentry idle"
 msgstr "A tétlen egységek õrködjenek (_s)"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Nép:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Melyik nemzet leszel?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 #, fuzzy
 msgid "Pick Nation"
 msgstr "Rendõrállomás"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Egyesült Nemzetek"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 #, fuzzy
 msgid "Select a nation"
 msgstr "Válassz célt"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 #, fuzzy
 msgid "_Properties"
 msgstr "Prófétanõ"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 #, fuzzy
 msgid "_Leader:"
 msgstr "Vezetõ:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 #, fuzzy
 msgid "_Female"
 msgstr "Lány"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 #, fuzzy
 msgid "_Male"
 msgstr "Fiú"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "_Városstílus"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "Légió"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Be kell állítanod a nemedet."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Be kell állítanod a városaid stílusát."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Érvényes nevet kell beírnod."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Egység felfejlesztése!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11272,71 +11340,77 @@ msgstr ""
 msgid "Not _ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 #, fuzzy
 msgid "_Ready"
 msgstr "Mindenki készenlétbe"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 #, fuzzy
 msgid "_Start"
 msgstr "Állapot"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Városok"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 #, fuzzy
 msgid "Pick _Nation"
 msgstr "Rendõrállomás"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 #, fuzzy
 msgid "_Observe"
 msgstr " (megfigyelõ)"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "%1$s mostantól %3$s államformában irányítja a(z) %2$s népét."
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 #, fuzzy
 msgid "<AI>"
 msgstr "MI"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 #, fuzzy
 msgid "<Easy AI>"
 msgstr "MI"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 #, fuzzy
 msgid "<Hard AI>"
 msgstr "MI"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 #, fuzzy
 msgid "Random"
 msgstr "Rádió"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Observer"
 msgstr " (megfigyelõ)"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Detached"
 msgstr ", Legyõzött"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr ""
 
@@ -12285,238 +12359,238 @@ msgstr ""
 msgid "Connect to Gaming _Zone"
 msgstr "Kapcsolódj be itt"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Szervernév"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Verzió"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Állapot"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Játékosok"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 #, fuzzy
 msgid "Internet _Metaserver"
 msgstr "Metaszerver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 #, fuzzy
 msgid "_Host:"
 msgstr "_Szerver"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 #, fuzzy
 msgid "_Port:"
 msgstr "_Port"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 #, fuzzy
 msgid "_Login:"
 msgstr "Légió"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 #, fuzzy
 msgid "C_onnect"
 msgstr "Kapcsolódás"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, fuzzy, c-format
 msgid "Connection name: %s"
 msgstr "Kapcsolódás"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, fuzzy, c-format
 msgid "Player name: %s"
 msgstr "?city:Név"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, fuzzy, c-format
 msgid "Host: %s"
 msgstr "Gazdagép:"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, fuzzy, c-format
 msgid "%s info"
 msgstr "Városinfó"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 #, fuzzy
 msgid "Toggle player ready"
 msgstr "aitoggle <játékosnév>"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 #, fuzzy
 msgid "Pick nation"
 msgstr "Rendõrállomás"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 #, fuzzy
 msgid "Take this player"
 msgstr "Városok"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 #, fuzzy
 msgid "Cut connection"
 msgstr "A(z) %s kapcsolat megszakítása."
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 #, fuzzy
 msgid "Aitoggle player"
 msgstr "aitoggle <játékosnév>"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 #, fuzzy
 msgid "Remove player"
 msgstr "%s játékos törlése."
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, fuzzy, c-format
 msgid "Put on %s"
 msgstr "Népesség: %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "Ennyire egészítsék ki a játékosok számát az MI játékosok"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "CMA _kikapcsolása"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 #, fuzzy
 msgid "_More Game Options..."
 msgstr "Üzenetbeállítások..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 #, fuzzy
 msgid "Record"
 msgstr "Jelentés"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 #, fuzzy
 msgid "Rating"
 msgstr "Várakozik"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 #, fuzzy
 msgid "Ready"
 msgstr "Mindenki készenlétbe"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 #, fuzzy
 msgid "Leader"
 msgstr "Vezetõ:"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 #, fuzzy
 msgid "_Browse..."
 msgstr "_Megjelenítés..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 #, fuzzy
 msgid "Choose a Scenario"
 msgstr "Scenario betöltése"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 #, fuzzy
 msgid "Choose a _Scenario:"
 msgstr "Scenario betöltése"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Típus"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 #, fuzzy
 msgid "Choose a _nation to play:"
 msgstr "Válassz tevékenységet:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 #, fuzzy
 msgid "Select Location to Save"
 msgstr "Válassz népet és a nevet"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Játék elmentése"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 #, fuzzy
 msgid "Saved _Games:"
 msgstr "Játék elmentése"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 #, fuzzy
 msgid "Save _Filename:"
 msgstr "Játék elmentése"
@@ -12554,7 +12628,7 @@ msgstr "
 msgid "Count"
 msgstr "Db"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12802,31 +12876,31 @@ msgstr "_Munkaterv"
 msgid "Edit Global _Worklists"
 msgstr "Munkatervek szerkesztése"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Körök"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 #, fuzzy
 msgid "Show _Future Targets"
 msgstr "Mutasd a jövõbeli célokat"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 #, fuzzy
 msgid "Target _Worklist:"
 msgstr "_Munkaterv"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 #, fuzzy
 msgid "_Add Global Worklist"
 msgstr "Lehetséges Munkatervek"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 #, fuzzy
 msgid "Chan_ge Production"
 msgstr "Termelés átállítása"
@@ -13132,8 +13206,8 @@ msgid "City shrinks: %d %s"
 msgstr "Város: %s(%s)"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13248,12 +13322,12 @@ msgstr "
 msgid "Maintenance Report"
 msgstr "Jelentés a tudományról"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 #, fuzzy
 msgid "worklist"
 msgstr "(munkaterv)"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13693,21 +13767,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -15010,7 +15084,7 @@ msgstr "_V
 msgid "Unit Selection"
 msgstr "Egységválasztás"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "SEMMI"
 
diff --git a/po/it.gmo b/po/it.gmo
index 1b631fe..8c143b0 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index fd5918b..0e8570a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,4 +1,4 @@
-# $Id: it.po 14766 2008-06-16 07:02:24Z dmarks $
+# $Id: it.po 15343 2008-11-30 11:48:06Z dmarks $
 #
 # |~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|
 # |  Italian translations for Freeciv  |
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 1.14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-08-12 15:47+0300\n"
 "Last-Translator: Freeciv Italian Team <slug-freeciv at siena.linux.it>\n"
 "Language-Team: Italian <slug-freeciv at siena.linux.it>\n"
@@ -53,22 +53,22 @@ msgstr "Lusso"
 msgid "Science"
 msgstr "Scienza"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:C"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:m"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:O"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:C"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:m"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -496,82 +496,82 @@ msgstr "Connessione in avanzamento."
 msgid "AI Debug messages"
 msgstr ""
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:Genocidio"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:Belligerante"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:Ostile"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:Non cooperativo"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:Scontento"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?attitude:Neutrale"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:Rispettoso"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:Cooperante"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:Entusiasta"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:In ammirazione"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:In adorazione"
 
-#: common/player.c:759
+#: common/player.c:764
 #, fuzzy
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Alleanza"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Guerra"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Cessate-il-fuoco"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Pace"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Alleanza"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Mai incontrati"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Squadra"
 
@@ -618,13 +618,13 @@ msgstr " unit
 msgid "Size %d"
 msgstr "Dimensione"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Ricerca della Tecnologia Futura %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -636,66 +636,66 @@ msgstr "Ricerca della Tecnologia Futura %d"
 msgid "None"
 msgstr "Nessuno"
 
-#: common/tech.c:790
+#: common/tech.c:798
 #, fuzzy
 msgid "Future Tech."
 msgstr "Ricerca della Tecnologia Futura %d"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Sconosciuto)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Strada"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Irrigazione"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Ferrovia"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Miniera"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Inquinamento"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Capanna"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Fortezza"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Fiume"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Fattoria"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Base aerea"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Radioattività"
 
@@ -805,11 +805,11 @@ msgstr "Missile Nucleare"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " e "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?and:, "
 
@@ -965,83 +965,83 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (%d ripetizione totale)"
 msgstr[1] " (%d ripetizioni totali)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Argomento vuoto per \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Argomento mancante per \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d a.C."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d d.C."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "FREECIV_PATH è definita ma vuota; utilizzo in sostituzione il percorso "
 "predefinito."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Impossibile leggere la directory dei dati %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "Il percorso dei file dati può essere impostato tramite la variabile "
 "d'ambiente FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Il percorso dei file dati attuale è: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "È necessario il file \"%s\"... chiusura!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Errore fatale: state tentando di eseguirmi come superuser!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Utilizzate un account non privilegiato invece.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "corrispondenza esatta"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "unica corrispondenza"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "ambiguo"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "vuoto"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "troppo lungo"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "nessuna corrispondenza"
 
@@ -1070,22 +1070,22 @@ msgstr "gli %s hanno cominciato a costruire %s a %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s vende %s (non ne ha bisogno) per %d auri."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, fuzzy, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (IA)* In modalità away la IA non può firmare dei trattati"
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, fuzzy, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (IA)* Prima rompi l'alleanza con %s, %s"
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, fuzzy, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (IA)* Cessiamo innanzitutto le ostilità, %s"
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1094,69 +1094,69 @@ msgstr ""
 "*%s (IA)* Non ti permetterò di liberarti così facilmente, %s. L'attuale "
 "trattato permane."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, fuzzy, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (IA)* Prima rompi l'alleanza con %s, %s"
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr ""
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (IA)* Spiacente, avere la visione in comune con te non è sicuro."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (IA)* Benvenuto nella nostra alleanza %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, fuzzy, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (IA)* Si, speriamo di rimanere uniti per sempre, %s"
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (IA)* Si, firmiamo la pace!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, fuzzy, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (IA)* D'accordo. Niente più ostilità, %s"
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, fuzzy, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (IA)* Si, firmiamo la pace!"
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, fuzzy, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (IA)* Pace?... forse un'altra volta!"
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1165,19 +1165,19 @@ msgstr ""
 "*%s (IA)* Alla fine siamo di fronte! Speri forse di poter scappare dopo i "
 "crimini che hai commesso?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, fuzzy, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr ""
 "*%s (IA)* La tua aggressione contro i nostri alleati è stato il vostro "
 "ultimo errore!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1188,14 +1188,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1208,7 +1208,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1219,13 +1219,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1236,12 +1236,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1252,7 +1252,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1263,7 +1263,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1272,7 +1272,7 @@ msgstr ""
 "*%s (IA)* Il tuo tentativo di conquistare lo spazio da solo tradisce le tue "
 "vere intenzioni, la nostra allenza è finita!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1281,7 +1281,7 @@ msgstr ""
 "*%s (IA)* Il tuo tentativo di dominare unilateralmente lo spazio esterno è "
 "estremamente offensivo."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1290,13 +1290,13 @@ msgstr ""
 "*%s (IA)* Se non fermate i lavori di costruzione della nave spaziale, ci "
 "vedremo costretti a prendere provvedimenti!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 "*%s (IA)* Spiacente, avere la visione in comune con te non è più sicuro"
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1305,7 +1305,7 @@ msgstr ""
 "*%s (IA)* Saluti al nostro più fedele alleato, ci rivolgiamo a te per "
 "distruggere il nostro nemico, %s"
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1315,7 +1315,7 @@ msgstr ""
 "dichiarato guerra al nostro nemico, %s. Perché dobbiamo essere noi a "
 "ricordarti le tue promesse?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1326,7 +1326,7 @@ msgstr ""
 "pace con il nostro mortale nemico, %s! Questo è inaccettabile, la nostra "
 "alleanza è finita!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1335,14 +1335,14 @@ msgstr ""
 "*%s (IA)* Saluti amico, possiamo suggerire una campagna militare congiunta "
 "contro %s?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, fuzzy, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "*%s (IA)* Saluti vicino, possiamo suggerire una campagna militare congiunta "
 "contro %s?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1351,7 +1351,7 @@ msgstr ""
 "*%s (IA)* %s sta minacciando entrambi, possiamo suggerire di terminare le "
 "ostilità?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1359,59 +1359,64 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Tutte le opzioni"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (veterano)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Quel nome non è permesso."
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Impossibile trovare il file audio %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 "Attenzione: l'ospite con nome '%s' è stato preso, utente rinominato a '%s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Gli ospiti non sono consentiti su questo server. Spiacente."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, fuzzy, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s è stato rifiutato: capacità non corrispondenti."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1420,7 +1425,7 @@ msgstr ""
 "C'è stato un'errore durante la lettura del database utenti, ingresso "
 "consentito come ospite '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1428,41 +1433,41 @@ msgstr ""
 "C'è stato un'errore durante la lettura del database utenti e l'accesso come "
 "ospiti non è consentito. Spiacenti"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Inserisci la password per %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Inserisci una password (e ricordatela!)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 "Questo server permette l'accesso solo a utenti pre-registrati. Spiacenti"
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, fuzzy, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr ""
 "Questo server permette l'accesso solo a utenti pre-registrati. Spiacenti"
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Spiacenti, troppi tentativi sbagliati..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1470,33 +1475,33 @@ msgstr ""
 "Attenzione: C'è stato un errore nel salvare su database. Puoi continuare ma "
 "le tue statistiche non saranno salvate."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, fuzzy, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s è stato rifiutato: capacità non corrispondenti."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "La password non è corretta. Riprova."
 
-#: server/auth.c:549
+#: server/auth.c:569
 #, fuzzy
 msgid "Sorry, your connection timed out..."
 msgstr ""
 "spiacente, il comando connect non è ancora stato implementato per le unità "
 "aeree."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "La tua password è troppo corta, la lunghezza minima è %d. Riprova."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2299,16 +2304,14 @@ msgid "Cast a vote."
 msgstr "Effettua un voto."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Un giocatore con livello di accesso info che esegue un comando di livello "
 "controllo inizia un nuovo voto per il suddetto comando. Il comando /vote "
@@ -2320,7 +2323,7 @@ msgstr ""
 "vota contro. Se trascorre un intero turno il voto può passare se nessuno "
 "vota contro."
 
-#: server/commands.c:122
+#: server/commands.c:121
 #, fuzzy
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
@@ -2328,12 +2331,12 @@ msgid ""
 msgstr ""
 "debug [ player <giocatore> | city <x> <y> | units <x> <y> | unit <id> ]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 "Attiva oppure no il debugging della IA relativo all'entità in questione."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2341,24 +2344,24 @@ msgstr ""
 "Stampa informazioni di debug della IA al riguarda della specifica entità e "
 "attiva o meno l'output di debugging continuo riguardo all'entità."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <nome-opzione> <valore>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Imposta le opzioni del server."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "squadra <nome-giocatore> [squadra]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr ""
 "Cambia, aggiungi o rimuovi l'affiliazione di un giocatore ad una squadra."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2372,15 +2375,15 @@ msgstr ""
 "che combattono assieme per raggiungere la vittoria, ottenendone dei punteggi "
 "individuali mediati."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "Directory dei ruleset <directory>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Scegli una nuova directory dei ruleset o un nuovo modpack."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2389,15 +2392,15 @@ msgstr ""
 "senza argomenti e verrà visualizzata la directory attualmente selezionata."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <linea-metaserver>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Imposta la linea di informazioni per il metaserver."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2406,19 +2409,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <linea-metaserver>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Imposta la linea per le patches del metaserver."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Controlla il collegamento con il metaserver."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2429,33 +2432,33 @@ msgstr ""
 "'metaconnection up' oppure 'metac u' si connette al metaserver."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <indirizzo>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Imposta l'indirizzo (URL) del metaserver a cui riferire."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <nome-giocatore>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Cambia lo stato di IA del giocatore."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "prendi [nome-connessione] <nome-giocatore>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Prendi il posto di un giocatore nella partita."
 
-#: server/commands.c:185
+#: server/commands.c:184
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2472,15 +2475,15 @@ msgstr ""
 "attaccata a un osservatore globale."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "osserva [nome-connessione] [nome-giocatore]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Osserva un giocatore o l'intera partita."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2496,15 +2499,15 @@ msgstr ""
 "attaccata a un osservatore globale."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "distacca <nome-connessione>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "distacca da un giocatre."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2513,21 +2516,21 @@ msgstr ""
 "possono forzare il distacco di un giocatore."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <nome-giocatore>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Crea un giocatore IA con il nome specificato."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 "Il comando 'create' è disponibile solo prima dell'inizio della partita."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2535,16 +2538,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Mettiti in modalità assente. La IA ti sostituirà nel frattempo."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "La IA governerà la tua nazione ma effettuerà cambiamenti minimi."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2552,11 +2555,11 @@ msgstr ""
 "novice\n"
 "novice <nome-giocatore>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Imposta uno o tutti i giocatori IA a 'novizio'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2568,7 +2571,7 @@ msgstr ""
 "giocatore."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2576,11 +2579,11 @@ msgstr ""
 "easy\n"
 "easy <nome-giocatore>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Imposta uno o tutti i giocatori IA a 'facile'."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2592,7 +2595,7 @@ msgstr ""
 "giocatore."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2600,11 +2603,11 @@ msgstr ""
 "normal\n"
 "normal <nome-giocatore>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Imposta uno o tutti i giocatori IA a 'normale'."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2616,7 +2619,7 @@ msgstr ""
 "giocatore."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2624,11 +2627,11 @@ msgstr ""
 "hard\n"
 "hard <nome-giocatore>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Imposta uno o tutti i giocatori IA a 'difficile'."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2640,7 +2643,7 @@ msgstr ""
 "quel giocatore."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2648,11 +2651,11 @@ msgstr ""
 "experimental\n"
 "experimantal <nome-giocatore>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Imposta uno o tutti i giocatori IA a 'sperimentale'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2665,7 +2668,7 @@ msgstr ""
 "quel giocatore."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2679,11 +2682,11 @@ msgstr ""
 "cmdlevel <livello> first\n"
 "cmdlevel <livello> <nome-collegamento>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Mostra o imposta il livello di accesso ai comandi."
 
-#: server/commands.c:276
+#: server/commands.c:275
 #, fuzzy
 msgid ""
 "The command access level controls which server commands are available\n"
@@ -2726,20 +2729,20 @@ msgstr ""
 "nome.  Attenzione che questo comando richiede il nome di un collegamento, "
 "non di un giocatore."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <turno> <incrementoturno> <valore> <moltiplicavalore>."
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Vedete \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2750,42 +2753,42 @@ msgstr ""
 "opzione assieme all'opzione \"timeout\". Il valore predefinito è 0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 #, fuzzy
 msgid "endgame"
 msgstr "Rinomina"
 
-#: server/commands.c:311
+#: server/commands.c:310
 #, fuzzy
 msgid "End the game immediately in a draw."
 msgstr "La partita è finita con un pareggio"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr ""
 
-#: server/commands.c:316
+#: server/commands.c:315
 #, fuzzy
 msgid "Concede the game."
 msgstr "Impossibile caricare il file con la partita salvata"
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <nome-giocatore>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Elimina completamente un giocatore dalla partita."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2794,7 +2797,7 @@ msgstr ""
 "e le unità ecc.  Usare con cautela!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2802,11 +2805,11 @@ msgstr ""
 "save\n"
 "save <nome-file>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Salva la partita in un file."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2823,7 +2826,7 @@ msgstr ""
 "e usate il comando 'start' quando i giocatori si sono ricollegati."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2831,11 +2834,11 @@ msgstr ""
 "load\n"
 "load <nome-file>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Carica la partita da un file."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2844,28 +2847,28 @@ msgstr ""
 "ruleset e le opzioni del server vengono perse.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <nome-file>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Esegue dei comandi per il server da un file."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <nome-file>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Scrive su un file le impostazioni attuali come comandi per il server."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Cambia lo stile di output del server da 'RFC-style' a normale."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr ""
 
@@ -3393,27 +3396,36 @@ msgstr ""
 "%s ha provocato un incidente diplomatico tentando di incitare una rivolta a %"
 "s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr "Unità di mare iniziali non ancora supportate, nessuno ottiene %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Anno: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Il timeout del turno ha superato il valore massimo, riportato al valore "
 "massimo"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Il timeout del turno è minore di zero, riportato a zero."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3456,11 +3468,11 @@ msgstr "non c'
 msgid "There is no player nor connection by the name %s."
 msgstr "non ci sono nè giocatori nè connessioni di nome %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "è avvenuto un riscaldamento globale!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
@@ -3468,16 +3480,16 @@ msgstr ""
 "le coste sono state sommerse ed ampie zone di prateria sono diventate "
 "deserti."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "è iniziato un inverno nucleare!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "i mari si sono ritirati ed ampie zone di prateria sono diventate tundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3488,7 +3500,7 @@ msgstr ""
 "       I lavoratori si riuniscono spontaneamente e modernizzano tutte le "
 "città con ferrovie."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3499,14 +3511,14 @@ msgstr ""
 "       I lavoratori si riuniscono spontaneamente e modernizzano tutte le "
 "città con ferrovie."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, fuzzy, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr ""
 "il vostro %s è stato spostato a causa della trasformazione di un quadrante "
 "da mare a terra."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, fuzzy, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr ""
@@ -3567,34 +3579,34 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr "Devi scegliere un nuovo tipo di governo dal menu governo."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "il tasso di imposte eccede il massimo per %s; aggiustato."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "il tasso di scienza eccede il massimo per %s; aggiustato."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "il tasso di lusso eccede il massimo per %s; aggiustato."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s non ci dà più la visione in comune!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
@@ -3602,19 +3614,19 @@ msgstr ""
 "Il senato approva la vostra proposta a causa delle provocazioni continue "
 "degli %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "lo stato diplomatico tra gli %s e gli %s ora è %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3623,14 +3635,14 @@ msgstr ""
 "gli %s hanno cancellato l'accordo diplomatico! Lo stato diplomatico tra gli %"
 "s e gli %s ora è %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 "%s ha attaccato il tuo alleato %s! L'alleanza con l'aggressore è cancellata."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3639,43 +3651,43 @@ msgstr ""
 "Il tuo compagno di squadra %s ha dichiarato guerra a %s. Sei obbligato a "
 "cancellare l'alleanza con %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Rimosso giocatore %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "siete stati rimossi dal gioco!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s è stato rimosso dal gioco."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "avete avuto un contatto con gli %s, governati da %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, fuzzy, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 "%s ha attaccato il tuo alleato %s! L'alleanza con l'aggressore è cancellata."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Impossibile far cadere in una guerra civile %s - troppi giocatori"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Impossibile far cadere in una guerra civile %s - troppi giocatori"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3684,12 +3696,12 @@ msgstr ""
 "la vostra nazione è spinta nella guerra civile; %s è dichiarato capo degli "
 "stati ribelli."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s firma un'alleanza con %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3928,21 +3940,21 @@ msgstr "
 msgid "th"
 msgstr "°"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "La stringa riguardante la demografia contiene caratteri non validi. Provate "
 "\"help demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Rapporto Demografico:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Spiacente, il rapporto demografico non è disponibile."
 
-#: server/report.c:746
+#: server/report.c:748
 #, fuzzy, c-format
 msgid "The %s of the %s (%s)"
 msgstr "La %s degli %s"
@@ -3953,11 +3965,11 @@ msgstr "La %s degli %s"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Impossibile trovare un file \"%s\" di ruleset leggibile."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Caricamento ruleset"
 
@@ -3973,7 +3985,7 @@ msgstr ""
 "accadere con alcuni vecchi salvataggi di partite, o può indicare un file di "
 "salvataggio non valido. Procedete a vostro rischio."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
@@ -3998,13 +4010,13 @@ msgstr ""
 "supportate. Utilizzo '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4041,7 +4053,7 @@ msgstr "Interno"
 msgid "Networking"
 msgstr "Rete"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Tutto"
@@ -4063,7 +4075,7 @@ msgstr "Raro"
 msgid "Changed"
 msgstr "Cambia"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4071,7 +4083,7 @@ msgstr ""
 "La stringa riguardante come prendere le connessioni contiene\n"
 "caratteri non validi. Provate \"help allowtake\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4079,7 +4091,7 @@ msgstr ""
 "La stringa riguardante le unità iniziali contiene\n"
 "caratteri non validi. Provate \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4088,15 +4100,15 @@ msgstr ""
 "La stringa riguardante le unità iniziali non contiene\n"
 "almeno un'unità che possa fondare città. Provate \"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -4105,11 +4117,16 @@ msgstr ""
 "Il numero dei giocatori è maggiore del valore richiesto; valore precedente "
 "mantenuto."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Non avete il permesso di modificare quest'opzione."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Dimensione mappa (in migliaia di quadranti)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4119,12 +4136,12 @@ msgstr ""
 "  size = 4 è una mappa normale di 4000 quadranti (default)\n"
 "  size = 20 è una mappa gigante di 20000 quadranti"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Indice topologico della mappa"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4193,11 +4210,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Metodo usato per generare la mappa"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4218,11 +4235,11 @@ msgstr ""
 "allora il valore di \"startpos\" sarà scelto in base al generatore. Vedi la "
 "variabile \"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Metodo usato per scegliere le posizioni di partenza"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4244,35 +4261,35 @@ msgstr ""
 "Nota: I generatori cercano di creare un numero di continenti adeguato al "
 "valore di startpos e al numero di giocatori"
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Presenza o assenza di isole 1x1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "Le isole 1x1 possono essere presenti se vale 1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Controlla se i poli sono continenti separati"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr "I poli saranno separati dagli altri continenti se vale 1"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Tutta la mappa ha clima temperato"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "Il pianeta avrà interamente clima temperato se vale 1"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Temperatura media del pianeta"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4306,11 +4323,11 @@ msgstr ""
 "0 equivale a un pianeta veramente freddo con larghe zone polari e assenza di "
 "zone tropicali"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Percentuale della mappa coperta da terra"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
@@ -4318,11 +4335,11 @@ msgstr ""
 "Questa variabile fornisce una percentuale approssimativa della mappa che "
 "sarà rappresentato da terra."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Quantità di colline e montagne"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4330,11 +4347,11 @@ msgstr ""
 "Valori piccoli danno mappe pianeggianti, valori alti danno una mappa più "
 "frastagliata con più colline e montagne."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Quantità d'acqua sulla terra"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4343,11 +4360,11 @@ msgstr ""
 "valori alti significano una mappa più ricca d'acqua con più paludi, giungle "
 "e fiumi."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Seme di generazione casuale della mappa"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4357,11 +4374,11 @@ msgstr ""
 "predefinito) verrà scelta un seme basato sull'ora, per avere una mappa "
 "casuale."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Seme casuale generale"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4370,11 +4387,11 @@ msgstr ""
 "Questa variabile normalmente è di interesse solo durante il debugging del "
 "gioco"
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Quantità di quadranti con risorse \"speciali\""
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4382,11 +4399,11 @@ msgstr ""
 "Le risorse speciali migliorano il tipo di terreno su cui sono. La scala "
 "della variabile è il numero di parti su mille."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Quantità di capanne (villaggi di tribù minori)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4395,23 +4412,24 @@ msgstr ""
 "posizionate sull'intera mappa. Le capanne rappresentano villaggi di tribù "
 "minori che possono essere visitati dalle vostre unità."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Numero minimo di giocatori"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Ci deve essere almeno questo numero di giocatori (connessi o IA) prima che "
 "il gioco possa iniziare."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Numero massimo di giocatori"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4422,11 +4440,11 @@ msgstr ""
 "durante lo stato di pregame, ogni nuovo giocatore che prova a collegarsi "
 "viene rifiutato."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Numero totale di giocatori (inclusi i giocatori controllati dalle IA)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 #, fuzzy
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
@@ -4436,11 +4454,11 @@ msgstr ""
 "verranno creati dei nuovi giocatori IA per aumentare il numero totale di "
 "giocatore fino al valore di questa opzione."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Lista delle unità iniziali dei giocatori"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4468,29 +4486,29 @@ msgstr ""
 "    a   = Unità d'attacco veloce (es. Cavalleggeri)\n"
 "    A   = Unità d'attacco buona (es. Catapulta)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Area dove sono posizionate le unità iniziali"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "Questo è il raggio all'interno del quale sono disperse le unità iniziali."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Quantità iniziale di auri per giocatore"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 "All'inizio del gioco a ogni giocatore viene fornito questa quantità di auri."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Numero iniziale di tecnologie iniziali per ogni giocatore"
 
-#: server/settings.c:481
+#: server/settings.c:472
 #, fuzzy
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
@@ -4501,11 +4519,11 @@ msgstr ""
 "All'inizio del gioco a ogni giocatore viene fornito questo numero di "
 "tecnologie. Le tecnologie fornite sono scelte casualmente per ogni giocatore."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 #, fuzzy
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
@@ -4516,11 +4534,11 @@ msgstr ""
 "nuove tecnologie. Raddoppiare questo valore renderà necessario il doppio del "
 "tempo per effettuare le stesse ricerche."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Penalità percentuale quando si cambia tecnologia"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4530,12 +4548,12 @@ msgstr ""
 "positivi, perdete questa percentuale di punti di ricerca.  Questo non si "
 "applica se avete appena scoperto una tecnologia in questo turno."
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Penalità quando si ottiene una tecnologia da un trattato"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4548,11 +4566,11 @@ msgstr ""
 "tecnologia. Se questa opzione è diversa da zero ne potranno risultare anche "
 "punti di ricerca negativi."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Penalità quando si ottiene una tecnologia da una conquista"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4563,11 +4581,11 @@ msgstr ""
 "tecnologia. Se questa opzione è diversa da zero ne potranno risultare anche "
 "punti di ricerca negativi."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Penalità quando si ottiene una tecnologia gratuita"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4581,11 +4599,11 @@ msgstr ""
 "costo di ricerca di una nuova tecnologia. Se questa opzione è diversa da "
 "zero ne potranno risultare anche punti di ricerca negativi."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Cibo richiesto per far crescere una città"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4595,12 +4613,12 @@ msgstr ""
 "Questo valore è moltiplicato per un altro fattore che è contenuto nel "
 "ruleset e dipendente dalla dimensione della città."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Percentuale di cibo perso se manca l'aquedotto"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4610,21 +4628,21 @@ msgstr ""
 "Sistema Fognario), perde questa percentuale della sua riserva di cibo (o "
 "metà di questa quantità se ha un Granaio)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Dimensione minima da cui le città producono commercio normalmente"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4637,11 +4655,11 @@ msgstr ""
 "penalità eccetto la normale corruzione) per dimensione uguale a "
 "fulltradesize. Vedete anche notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Dimensione massima fino a cui le città non producono commercio"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4652,11 +4670,11 @@ msgstr ""
 "dimensioni maggiori di notradesize e minori di fulltradesize. Vedete anche "
 "fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Dimensione della città prima che inizi il malcontento"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4665,11 +4683,11 @@ msgstr ""
 "sono soddisfatti ed i restanti cittadini sono scontenti. Vedete anche "
 "cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Numero di città prima che aumenti il malcontento"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4681,11 +4699,11 @@ msgstr ""
 "vedete anche unhappysize. Questo è il caso della Democrazia; per altre forme "
 "di governo l'effetto si verifica con un numero minore di città."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Distanza minima tra due città"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4698,11 +4716,11 @@ msgstr ""
 "vale 3, ci devono essere almeno 2 quadranti tra 2 città in ogni direzione. "
 "Se vale 0 (predefinito), viene considerato il valore presente nel ruleset."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Numero di turni prima che l'entusiasmo abbia effetto."
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4711,11 +4729,11 @@ msgstr ""
 "dell'entusiamo. Se posto a n una città crescerà dopo che l'entusiasmo è "
 "stato in effetto per n+1 turni."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Possibilità di distruzione per una struttura conquistata"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4723,11 +4741,11 @@ msgstr ""
 "Quando un giocatore conquista una città, ogni Struttura Cittadina ha questa "
 "percentuale di possibilità di essere distrutta."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Possibilità di muoversi in un quadrante dopo un attacco"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4741,21 +4759,21 @@ msgstr ""
 "quadrante). Se impostato ad un valore tra 0 e 100, sarà usato come "
 "percentuale della possibilità di \"occupare\" il quadrante."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Riduce la popolazione di una città dopo un attacco"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4772,11 +4790,11 @@ msgstr ""
 "  4 = elicotteri\n"
 "  8 = aerei"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Raggio dei confini nazionali"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4788,12 +4806,12 @@ msgstr ""
 "quadranti che che sono all'interno del raggio d'influenza di città di "
 "diverse nazioni."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr ""
 "Le unità militari all'interno dei confini nazionali non causano malcontento. "
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4801,11 +4819,11 @@ msgstr ""
 "Se questa variabile vale 1, le unità non causeranno malcontento quando sono "
 "all'interno dei confini nazionali."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Capacità di effettuare attività diplomatica con altri giocatori"
 
-#: server/settings.c:698
+#: server/settings.c:689
 #, fuzzy
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
@@ -4827,11 +4845,11 @@ msgstr ""
 "E' sempre consentita l'attività diplomatica tra giocatori della stessa "
 "squadra."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Nomi di città permessi"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4858,11 +4876,11 @@ msgstr ""
 "città presenti tra quelli di default delle altre nazioni a meno che non sia "
 "presente nei nomi di default della propria nazione."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Frequenza di comparsa dei barbari"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4876,19 +4894,19 @@ msgstr ""
 "3 = comparsa frequente di barbari \n"
 "4 = orde scatenate, molti barbari"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Anno di comparsa dei barbari"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "I barbari non compariranno prima di quest'anno."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Durata in turni delle rivoluzioni"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4897,11 +4915,11 @@ msgstr ""
 "numero di turni pari a questa variabile. Settare questa variabile a 0 "
 "equivarrà ad una durata casuale di 1-6 turni."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Attivare o no la nebbia di guerra"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4911,30 +4929,30 @@ msgstr ""
 "unità e città vi saranno visibili. Non vedrete nuove città o cambiamenti del "
 "terreno in quadranti non osservati."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Permettere o no la corsa allo spazio"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Se questa opzione vale 1, i giocatori possono costruire astronavi."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Numero minimo di città per una guerra civile"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4944,11 +4962,11 @@ msgstr ""
 "sua capitale è conquistata. Se quest'opzione è impostata al valore massimo, "
 "le guerre civili sono completamente disabilitate."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Numero di turni prima che il contatto tra giocatori si perda"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4959,12 +4977,12 @@ msgstr ""
 "se non hanno un'ambasciata. Se è settato a zero i giocatori non possono "
 "incontrarsi finché non hanno un'ambasciata."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Ricostruisce il palazzo se la capitale viene conquistata"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4976,11 +4994,11 @@ msgstr ""
 "scelta a caso. Questa opzione ignora le tecnologie eventualmente necessarie "
 "per la costruzione di un palazzo."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Se utilizzare nomi naturali per le città"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -4988,11 +5006,11 @@ msgstr ""
 "Se abilitata, il nome predefinito per le città verrà determinato in base al "
 "tipo di terreno circostante."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Giocatori la cui presa è consentita agli utenti"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -5061,11 +5079,11 @@ msgstr ""
 "4 = Nessun controllore consentito, osservatori consentiti;\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Cambiamento automatico in IA alla disconnessione"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5073,24 +5091,27 @@ msgstr ""
 "Se quest'opzione è impostata ad 1, lo stato di IA viene disattivato quando "
 "un giocatore si collega e riattivato quando il giocatore si disconnette."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Anno di fine del gioco"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Il gioco terminerà alla fine dell'anno indicato."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Numero massimo di secondi per turno"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Se non tutti i giocatori hanno premuto \"Fine Turno\" prima dello scadere di "
 "questo tempo, allora il turno finisce automaticamente. Zero significa nessun "
@@ -5098,32 +5119,32 @@ msgstr ""
 "la modalità di prova automatica. Utilizzate questa opzione in congiunzione "
 "con \"timeoutincrease\" per avere un timeout dinamico."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 #, fuzzy
 msgid "Whether to have simultaneous player phases."
 msgstr "Registrare o no le statistiche dei giocatori"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Secondi di blocco permessi alla connessione di rete di un client"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5134,11 +5155,11 @@ msgstr ""
 "timeout (tuttavia in base alle implementazioni del protocollo di rete le "
 "connessioni sarranno chiuse automaticamente ad un certo punto)."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Numero massimo di secondi per lo svuotamento dei buffer di rete"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5148,11 +5169,11 @@ msgstr ""
 "connessioni di rete dei client si sblocchino. Zero significa che il server "
 "non aspetterà."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Secondi tra i PING"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5160,22 +5181,22 @@ msgstr ""
 "Il server sonderà i client con un pacchetto di PING ogni volta che questo "
 "numero di secondi è passato."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Tempo prima di disconnettere un client"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Se un client non risponde a un PING entro questo tempo il client è "
 "disconnesso."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Modalità di gioco con blocco per il turno"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
@@ -5185,11 +5206,11 @@ msgstr ""
 "tutti i giocatori hanno finito il loro turno, compresi i giocatori "
 "disconnessi."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Modalità di gioco con turni di durata fissa"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5199,11 +5220,11 @@ msgstr ""
 "è scaduto il timeout, anche se tutti i giocatori hanno premuto \"Fine Turno"
 "\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Cosa c'è nel rapporto demografico"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5244,11 +5265,11 @@ msgstr ""
 "(l'ordine di questi caratteri non è significativo, ma il maiuscolo o "
 "minuscolo sì)"
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Turni per il salvataggio automatico"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5256,11 +5277,11 @@ msgstr ""
 "Il gioco sarà salvato automaticamente dopo questo numero di turni.\n"
 "Zero significa non salvare mai automaticamente."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Livello di compressione dei salvataggi"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5271,11 +5292,11 @@ msgstr ""
 "lenti. Se il massimo è zero questo server non è stato compilato per usare "
 "zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Prefisso per i nomi dei salvataggi automatici"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5283,11 +5304,11 @@ msgstr ""
 "I giochi salvati automaticamente avranno nome \"<prefisso><anno>.sav\"."
 "Questa opzione imposta la parte <prefisso>."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Registrare o no le statistiche dei giocatori"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5301,7 +5322,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Il server non può leggere l'ingresso standard. Ignoro l'ingresso."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Metaserver: indirizzo errato: [%s:%d]."
@@ -5443,104 +5464,104 @@ msgstr "Ho fallito nel salvataggio del gioco come %s"
 msgid "Game saved as %s"
 msgstr "Gioco salvato come %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Il gioco sta già girando."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Inizio gioco."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "richiesta per rapporto sconosciuto (tipo %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Attenzione: vecchio client %s rifiutato"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr ""
 "Ricevuto un pacchetto del tipo %d da un giocatore morto o da un osservatore"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Per favore scegliete un nome non vuoto."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Quella nazione è già in uso."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr ""
 "Un altro giocatore già ha il nome '%s'.  Per favore scegliete un altro nome."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Per favore scegliete un nome contenente solo caratteri ASCII."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, fuzzy, c-format
 msgid "%s nation is already in use."
 msgstr "Quella nazione è già in uso."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s è il governatore %s %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, fuzzy, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Impossibile iniziare la partita: è già iniziata."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, fuzzy, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s è stato aggiunto come giocatore controllato dalla IA."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Giocatore %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s guida gli %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Sto mandando informazioni al metaserver [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "il gioco è finito..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Da ora sono accettate nuove connessioni dai client."
 
@@ -5562,7 +5583,7 @@ msgstr "(ambiguo)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5741,7 +5762,7 @@ msgstr "I giocatori non possono essere rimossi dopo l'inizio della partita."
 msgid "Removed player %s from the game."
 msgstr "Giocatore %s rimosso dalla partita."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5823,285 +5844,285 @@ msgstr ""
 "Impossibile ampliare il livello di accesso ai comandi a '%s'; avete solo il "
 "livello '%s'."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Livello di accesso ai comandi impostato a '%s' per il collegamento %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 "Il livello di accesso ai comandi non può essere impostato a '%s' per il "
 "collegamento %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Livello di accesso ai comandi impostato a '%s' per i nuovi giocatori."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 "Livello di accesso ai comandi impostato a '%s' per il primo giocatore che lo "
 "richiede."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 #, fuzzy
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 "Il comando 'firstlevel' non ha senso dalla linea di comando del server."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Avete già il livello di accesso ai comandi '%s' o superiore."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 #, fuzzy
 msgid "Someone else already is game organizer."
 msgstr ""
 "Qualcun'altro ha già il livello di accesso ai comandi '%s' o superiore."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Argomento non consentito %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Uso: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Timeout dinamico settato a %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Opzione:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Stato: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "modificabile"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fissato"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Valore: %d, minimo: 0, predefinito: %d, massimo: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Valore: %d, minimo: %d, predefinito: %d, massimo: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Valore: \"%s\", predefinito: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Sono disponibili spiegazioni per le seguenti opzioni del server:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Nessuna spiegazione disponibile per questo."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Nome di opzione ambiguo."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Operatore Server: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Il giocatore '%s' è da ora un IA con livello di gioco '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s non è controllato da una IA."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Livello di gioco predefinito delle IA impostato a '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Questo comando è consentito solo ai client."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Uso: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s impostato su modalità 'assente'"
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s ritorna nella partita."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Spiacente, non avete accesso all'opzione '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Opzione '%s' sconosciuta."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 #, fuzzy
 msgid "All options with non-default values"
 msgstr "= significa che l'opzione ha il suo valore predefinito"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Tutte le opzioni"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Opzione vitale"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Opzioni specifiche"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Opzioni raramente usate"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ significa che potete cambiare l'opzione"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= significa che l'opzione ha il suo valore predefinito"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s valore  (min,max)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Opzione"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "descrizione"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 #, fuzzy
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr "Prova 'show situational' o 'show rare' per mostrare più opzioni"
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Impossibile modificare le squadre dopo l'inizio della partita."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 #, fuzzy
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Argomento non definito.  Uso: team <giocatore> [squadra]."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Impossibile unire in squadra un giocatore barbaro."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Il giocatore %s assegnato alla squadra %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Argomento non definito.  Uso: vote yes/no [numero voto]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Gli osservatori non possono votare."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Voto %d \"%s\": %d a favore, %d contro"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Non ci sono votazioni in corso."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "L'ultimo voto non è legale."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Il valore deve essere un intero."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Nessun voto (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Hai votato a favore \"%s\""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Hai votato contro \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 #, fuzzy
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
@@ -6110,446 +6131,474 @@ msgstr ""
 "Argomento indefinito. Uso: debug <player <giocatore> | city <x> <y> | units "
 "<x> <y> | unit <id>>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Puoi usare questo comando solo dopo che la parita è iniziata."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, fuzzy, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "%s non più debuggato"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, fuzzy, c-format
 msgid "%s diplomacy debugged"
 msgstr "%s debuggato"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, fuzzy, c-format
 msgid "%s tech no longer debugged"
 msgstr "%s non più debuggato"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, fuzzy, c-format
 msgid "%s tech debugged"
 msgstr "%s debuggato"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "I secondo e terzo valore deve essere intero."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Coordinate mappa errate."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Nessuna città a queste coordinate."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s non più debuggato"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "%2$s di %1$s non più debuggato."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "%2$s di %1$s debuggato."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Il secondo valore deve essere un intero."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "L'unità %d non esiste."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Argomento non definito.  Uso: set <opzione> <valore>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Non avete il permesso di modificare quest'opzione."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr ""
 "Questa impostazione non può essere modificata dopo l'inizio della partita."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Il valore deve essere un intero."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Valore fuori campo (minimo: 0, massimo: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Opzione: %s è stata impostata a %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Valore fuori campo (minimo: %d, massimo: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Stringa troppo lunga.  Uso: set <opzione> <valore>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Opzione: %s è stata impostata a \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Spiacente, l'osservazione globale non è permessa in questa partita."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 "Spiacente, non puoi controllare un osservatore globale. Usalo invece per "
 "osservare."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr ""
+"Spiacente, il controllo di giocatori umani non è permesso in questa partita."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr ""
 "Spiacente, l'osservazione dei barbari non è permessa in questa partita."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Spiacente, il controllo dei barbari non è permesso in questa partita."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr ""
 "Spiacente, l'osservazione dei giocatori morti non è permessa in questa "
 "partita."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr ""
 "Spiacente, il controllo dei giocatori morti non è permesso in questa partita."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 "Spiacente, l'osservazione dei giocatori IA non è permessa in questa partita."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 "Spiacente, il controllo dei giocatori IA non è permesso in questa partita."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 "Spiacente, l'osservazione dei giocatori umani non è permessa in questa "
 "partita."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 "Spiacente, il controllo di giocatori umani non è permesso in questa partita."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Spiacente, l'osservazione non è permessa in questa partita."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Spiacente, il controllo di giocatori non è pemesso in questa partita."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 "Spiacente, il controllo di giocatori già connessi non è permesso in questa "
 "partita."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Uso: observe [nome-connessione [nome-giocatore]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Uso: observe [nome-giocatore]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s già controlla %s. Usare 'observe' rimuoverebbe %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s sta già osservando %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, fuzzy, c-format
 msgid "%s is already observing."
 msgstr "%s sta già osservando %s."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s da ora osserva %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, fuzzy, c-format
 msgid "%s now observes"
 msgstr "%s da ora osserva %s"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Uso: take <nome-connessione> <nome-giocatore>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Uso: take <nome-giocatore>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Uso: take [nome-connessione] <nome-giocatore>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s già controlla %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "non ci sono nè giocatori nè connessioni di nome %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "scollegato da %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s ora controlla %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbaro"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "IA"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Umano"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Vivo"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Morto"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s non è collegato ad alcun giocatore."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Uso: detach <nome-connessione>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Non puoi disconnettere gli altri utenti."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s non è collegato ad alcun giocatore."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s scollegato da %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, fuzzy, c-format
 msgid "%s no longer observing."
 msgstr "%s non più debuggato"
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "scollegato da %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 #, fuzzy
 msgid "Usage: load <game name>"
 msgstr "Uso: load <nome-file>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 #, fuzzy
 msgid "Cannot load a game while another is running."
 msgstr "Una partita non può essere caricata mentre un'altra è in corso."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, fuzzy, c-format
 msgid "Could not load savefile: %s"
 msgstr "Non ho potuto caricare il file salvato: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "La directory dei ruleset corrente è: \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Directory dei ruleset \"%s\" non trovata"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, fuzzy, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Directory dei ruleset settata a \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Directory dei ruleset settata a \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Arrivederci."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Spiacente, non avete il permesso di usare comandi del server."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Attenzione: '%s' è stato interpretato come '%s', ma è ambiguo.  Provate '%"
 "shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Comando sconosciuto.  Provate '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Il tuo nuovo voto ha cancellato il tuo voto precedente."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, fuzzy, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Nuovo voto, numero %d, da parte di %s: %s"
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Non avete il permesso di usare questo comando."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr " (linea di comando del server)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 #, fuzzy
 msgid "Game ended in a draw."
 msgstr "La partita è finita con un pareggio"
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Terminare la partita. Il server dopo che tutti i client si saranno "
 "disconnessi."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Impossibile terminare la partita: nessuna partita in corso."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 #, fuzzy
 msgid "You cannot surrender now."
 msgstr "Non potete corrompere %s!"
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Non ci sono abbastanza giocatori, partita non iniziata."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Non ci sono abbastanza giocatori, partita non iniziata."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Non ci sono abbastanza giocatori, partita non iniziata."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 #, fuzzy
 msgid "All players are ready; starting game."
 msgstr "Esiste già un giocatore con questo nome."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "Impossibile iniziare la partita: il server sta aspettando che tutti i client "
 "si scolleghino."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Impossibile iniziare la partita: è già in corso."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Chiusura del collegamento %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6588,125 +6637,125 @@ msgstr ""
 "  save   -  per salvare la partita attuale\n"
 "  quit   -  per uscire"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Comando:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Sintassi: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Livello: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Sono disponibili i seguenti comandi del server:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "L'argomento '%s' di 'help' è ambiguo."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Nessuna corrispondenza per l'argomento '%s' di 'help'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Argomento errato per 'list': '%s'.  Provate '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Elenco dei giocatori:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<nessun giocatore>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "utente %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Morto"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", livello di difficoltà %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 #, fuzzy
 msgid ", ready"
 msgstr ", Morto"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ""
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d collegamento:"
 msgstr[1] " %d collegamenti:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s da %s (livello di accesso ai comandi %s), dim. buffer=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (modalità osservatore)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 #, fuzzy
 msgid "List of teams:"
 msgstr "Elenco dei giocatori:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr ""
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Elenco dei collegamenti al server:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<nessun collegamento>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 #, fuzzy
 msgid "List of scenarios available:"
 msgstr "Nessuna unità disponibile"
@@ -6778,17 +6827,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "l'obiettivo Tecnologico è %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "hai rubato %s dagli %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "gli %s hanno rubato %s a te!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "gli %s hanno rubato %s dagli %s."
@@ -7312,20 +7361,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr "il vostro %s ha degli ordini non consentiti."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Valore di landmass alto - questo potrebbe richiedere alcuni secondi."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Utilizzo invece il generatore %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Il generatore 3 non ha posizionato tutte le isole grandi."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Il generatore 3 ha lasciato %li terre non piazzate."
@@ -7420,122 +7469,123 @@ msgstr "Forse i permessi sono errati o c'
 msgid "Cannot find audio file %s"
 msgstr "Impossibile trovare il file audio %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX turni"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d auri per turno"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d turno"
 msgstr[1] "%3d turni"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "mai"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/turno"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d turno"
 msgstr[1] "%s (%d) %d turni"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Obsoleta"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Costruita"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 #, fuzzy
 msgid "Great Wonder"
 msgstr "Meraviglia"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 #, fuzzy
 msgid "Small Wonder"
 msgstr "Meraviglie disponibili"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/turno"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, fuzzy, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%s - %s cittadini"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, fuzzy, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "Non c'è nessuna rotta commerciale.\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, fuzzy, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "Costruisci unità"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -7648,8 +7698,8 @@ msgid "Best defending units"
 msgstr "La migliore unità di difesa"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7831,8 +7881,8 @@ msgstr "?pollution [short]:Inq"
 msgid "?cma:Governor"
 msgstr "Governatore"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 #, fuzzy
@@ -8102,19 +8152,19 @@ msgstr ""
 "Collegamento automatico al server \"%s\" alla porta %d come \"%s\" ogni %f "
 "secondi per %d volte"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "novizio"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "facile"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normale"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "difficile"
 
@@ -8122,31 +8172,31 @@ msgstr "difficile"
 msgid "experimental"
 msgstr "sperimentale"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Server in fase di inizializzazione..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Impossibile far partire il server."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Dovrai farlo partire manualmente. Spiacenti..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Impossibile collegarsi al server."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Probabilmente non è possibile farlo partire da qui."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Hai il controllo del server (livello hack di accesso ai comandi)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 "Non è possibile prendere il controllo del server, tentativo di fermarlo."
@@ -8237,27 +8287,27 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, fuzzy, c-format
 msgid "Allows %s."
 msgstr "Permette %s.\n"
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, fuzzy, c-format
 msgid "Allows %s (with %s)."
 msgstr "Permette %s (con %s).\n"
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Fiumi"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Spiacente, nessuna guida per %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8268,87 +8318,87 @@ msgstr ""
 "Questa pagina è stata generata automaticamente.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr "Non puoi ricercare questa tecnologia."
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* La scoperta della %s renderà obsoleta qualsiasi %s esistente.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 "* Permette a tutti i giocatori che conoscono %s di costruire le unità %s.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Permette %s (con %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Permette %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Non può essere costruito nelle città.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Non ha mai una città d'origine.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Perder questa unità comporterà la perdita della partita!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Ogni giocatore può avere al più una unità di questo tipo.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Richiede %d punti di popolazione per essere costruito.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Può trasportare e rifornire %d unità aerea.\n"
 msgstr[1] "* Può trasportare e rifornire %d unità aeree.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Può trasportare e rifornire %d missile.\n"
 msgstr[1] "* Può trasportare e rifornire %d missili.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Può trasportare %d unità terrestri attraverso i mari.\n"
 msgstr[1] "* Può trasportare %d unità terrestri attraverso i mari.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8357,136 +8407,136 @@ msgstr ""
 "obiettivo e deve essere ad almeno 9 quadranti di distanza (i movimenti in "
 "diagonale non sono considerati) dalla città d'origine dell'unità.\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr ""
 "* può aiutare a costruire delle meraviglie del mondo (aggiunge %d scudi alla "
 "produzione).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* non può essere congedato.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Può essere congedata in una città per recuperare il 50%% del costo di "
 "produzione.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Può costruire nuove città.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 "* Può aggiungere %d punti di popolazione a città di dimensione non superiore "
 "a %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* può costruire strade e ferrovie nei quadranti.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Può costruire miniere nei quadranti.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Può costruire l'irrigazione nei quadranti.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Può costruire fattorie nei quadranti.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Può costruire fattorie nei quadranti (se %s è stata scoperta).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 "* Può costruire fattorie nei quadranti (se una qualsiasi delle seguenti "
 "tecnologie è stata scoperta: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Può costruire fortezze nei quadranti.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Può costruire fortezze nei quadranti (se %s è stata scoperta).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 "* Può costruire fortezze nei quadranti (se una qualsasi delle seguenti "
 "tecnologie è stata scoperta: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Può eliminare l'inquinamento dai quadranti.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Può eliminare la ricaduta radioattiva dai quadranti.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Può trasformare il tipo di terreno dei quadranti.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Può costruire basi aree nei quadranti.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Può trincerarsi, acquisendo un bonus difensivo del 50%%.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Può saccheggiare un quadrante per distruggerne le infrastrutture.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Può effettuare azioni diplomatiche ed inoltre ha le competenze speciali di "
 "una spia.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Può effettuare azioni diplomatiche.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Non può mai perdere un combattimento a livello diplomatico.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Non può essere corrotto.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Può attaccare unità aeree nemiche.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* È invisibile, tranne quando è accanto ad una unità o città nemica.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 "* Può attaccare solo unità nell'oceano (nessun attacco verso la terra).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
@@ -8494,40 +8544,40 @@ msgstr ""
 "* Può attaccare direttamente da una nave: contro città nemiche o verso "
 "quadranti di terra.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Può essere paracadutato da una città amica (portata: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Ha una difesa doppia contro le unità a cavallo.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Conta come 'unità a cavallo' contro certi difensori.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Un missile: è utilizzabile una sola volta.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Termina il proprio turno una volta che ha attaccato.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* L'attacco di quest'unità causa un'esplosione nucleare!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Raddoppia la capacità di fuoco quando attacca le città.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignora gli effetti delle cinte murarie.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8537,39 +8587,39 @@ msgstr ""
 "danneggeranno (ma non uccideranno mai) il difensore senza che l'attaccante "
 "corra dei rischi.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Ha una difesa quintuplicata contro i missili e gli aerei.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 "* Ignora gli effetti dei terreni (tratta tutti i quadranti come strade).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignora le zone di controllo.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 "* Un'unità non militare (non può attaccare o imporre la legge marziale).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 "* Un'unità da battaglia: crea del malcontento anche se non è aggressiva.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Non raggiungerà mai il livello di veterano.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
 "* Può diventare veterano attraverso l'allenamento e il combattimento.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8578,12 +8628,12 @@ msgstr ""
 "* Deve terminare il turno in una città o vicino ad una costa, altrimenti ha "
 "il 50%% di possibilità di sparire in mare.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* La scoperta di %s riduce il rischio di perdita al 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s riduce il rischio al 12%%.\n"
@@ -8592,27 +8642,27 @@ msgstr "* %s riduce il rischio al 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " o "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* Unità deve essere in una città, o su una %s dopo %d turno.\n"
 msgstr[1] "* Unità deve essere in una città, o su una %s dopo %d turni.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Se vogliamo iniziare con %s abbiamo bisogno di %d lampadine."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8621,93 +8671,93 @@ msgstr ""
 "Per raggiungere %s dobbiamo ottenere %d altre tecnologie in precedenza. "
 "L'intero progetto richiederà %d lampadine per essere completato."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Non puoi ricercare questa tecnologia."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 " Il numero può variare in dipendenza di cosa gli altri giocatori andranno a "
 "ricercare.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* Il primo giocatore che scopre %s ottiene immediatamente una nuova "
 "tecnologia.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Riduce la probabilità di perdere navi in alto mare al 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Riduce la probabilità di perdere mavi in altro mare al 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Aumenta l'inquinamento prodotto dalla popolazione.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Permette ai %s di costruire strade sui quadranti con fiumi.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Permette ai %s di costruire fortezze.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Permette ai %s di costruire basi aeree.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Permette ai %s di aggiornare le strade in ferrovie.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Permette ai %s di aggiornare le irrigazioni in fattorie.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* L'inquinamento non può essere prodotto su questo tipo di terreno."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* non puoi costruire una città su questo tipo di terreno."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* La costa di questo tipo di terreno non è sicura."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr ""
 "* Questo tipo di terreno non è sicuro per le unità che lo attraversano."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Unità terrestri non possono viaggiare su quadranti oceanici."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8718,7 +8768,7 @@ msgid_plural ""
 msgstr[0] "Unità militari sul campo possono causare malcontento. "
 msgstr[1] "Unità militari sul campo possono causare malcontento. "
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8726,48 +8776,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8775,23 +8825,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8802,7 +8852,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8810,64 +8860,64 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 #, fuzzy
 msgid "* Your units cannot be bribed.\n"
 msgstr "Questa unità non può essere corrotta!"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 #, fuzzy
 msgid "* Your cities cannot be incited.\n"
 msgstr "La città non può essere incitata alla rivolta!"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 #, fuzzy
 msgid "* Has no unhappy citizens.\n"
 msgstr "%d cittadini scontenti ulteriori."
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 #, fuzzy
 msgid "* Veteran units.\n"
 msgstr "Unità di mare"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8875,7 +8925,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8883,71 +8933,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, fuzzy, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Permette ai %s di costruire basi aeree.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, fuzzy, c-format
 msgid "%s%d %s"
 msgstr "%3d/%3d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d malcontento"
@@ -9363,16 +9413,16 @@ msgstr "Stringa delle capacit
 msgid "Start of turn %d"
 msgstr "Inizio del %d turno"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "La modalità IA ora è %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "attiva"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "disattiva"
 
@@ -9404,13 +9454,13 @@ msgstr "?Player:Nome"
 msgid "Username"
 msgstr "Nome utente"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Bandiera"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9424,7 +9474,7 @@ msgstr "Confine"
 msgid "Score"
 msgstr "Punteggio"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Squadra"
 
@@ -9457,38 +9507,38 @@ msgstr "?Player_dlg:Inattivo"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 #, fuzzy
 msgid "You cannot sell improvements."
 msgstr "Vendi strutture cittadine"
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, fuzzy, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Vendere %s per %d auri?"
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, fuzzy, c-format
 msgid "No %s could be sold."
 msgstr "nessuna unità ha potuto essere aggiornata."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 #, fuzzy
 msgid "You cannot disband units."
 msgstr "Non potete corrompere %s!"
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, fuzzy, c-format
 msgid "%s cannot be disbanded."
 msgstr "* non può essere congedato.\n"
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, fuzzy, c-format
 msgid "Disbanded %d %s."
 msgstr "il vostro %s è stato congedato."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, fuzzy, c-format
 msgid "No %s could be disbanded."
 msgstr "nessuna unità ha potuto essere aggiornata."
@@ -9800,64 +9850,69 @@ msgstr "Auri: %d"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Imp: %d Lusso: %d Sci:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "a %s"
+
+#: client/text.c:609
 #, fuzzy, c-format
 msgid "Moving: %s"
 msgstr "a %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr ""
 
-#: client/text.c:625
+#: client/text.c:629
 #, fuzzy, c-format
 msgid "%s People"
 msgstr "%s Benveuto"
 
-#: client/text.c:629
+#: client/text.c:633
 #, fuzzy, c-format
 msgid "Turn: %d"
 msgstr "Terreno: %s"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Auri: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr ""
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, fuzzy, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Imp: %d Lusso: %d Sci:%d"
 
-#: client/text.c:639
+#: client/text.c:643
 #, fuzzy, c-format
 msgid "Researching %s: %s"
 msgstr "Ricerca: %s (%d/%d)"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Governo: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, fuzzy, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9865,58 +9920,58 @@ msgstr[0] " unit
 msgstr[1] " unità"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Turni all'obiettivo: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, fuzzy, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Turni all'obiettivo: %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, fuzzy, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "Scelta unità"
 msgstr[1] "Scelta unità"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 #, fuzzy
 msgid "No units selected."
 msgstr "nazione selezionata"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 #, fuzzy
 msgid "No units to upgrade!"
 msgstr "nessuna unità ha potuto essere aggiornata."
 
-#: client/text.c:860
+#: client/text.c:864
 #, fuzzy
 msgid "None of these units may be upgraded."
 msgstr "nessuna unità ha potuto essere aggiornata."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9931,14 +9986,14 @@ msgstr[1] ""
 "Aggiornare %s a %s per %d auri?\n"
 "Il tesoro contiene %d auri."
 
-#: client/text.c:887
+#: client/text.c:891
 #, fuzzy
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 "Mostra l'avanzamento nell'attuale ricerca tecnologica.\n"
 "%s: %d/%d."
 
-#: client/text.c:893
+#: client/text.c:897
 #, fuzzy
 msgid "no research target."
 msgstr ""
@@ -9946,46 +10001,46 @@ msgstr ""
 "(nessuna ricerca)"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 #, fuzzy
 msgid "Shows the progress of global warming:"
 msgstr ""
 "Mostra l'avanzamento del riscaldamento globale:\n"
 "%d."
 
-#: client/text.c:917
+#: client/text.c:921
 #, fuzzy, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Inquinamento: %3d"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 #, fuzzy
 msgid "Shows the progress of nuclear winter:"
 msgstr ""
 "Mostra l'avanzamento dell'inverno nucleare:\n"
 "%d."
 
-#: client/text.c:936
+#: client/text.c:940
 #, fuzzy, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Tasso massimo per %s: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 #, fuzzy
 msgid "Shows your current government:"
 msgstr ""
@@ -9993,25 +10048,25 @@ msgstr ""
 "%s."
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Popolazione:     %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Supporto:        %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energia:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -10019,96 +10074,96 @@ msgstr[0] "Massa:           %5d tonnellata"
 msgstr[1] "Massa:           %5d tonnellate"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Tempo di viaggio: %5.1f anni"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Tempo di viaggio:     -     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Probabilità di successo: %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Anno di arrivo:  %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:-"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dg %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:troppo grande"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s dei %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, fuzzy, c-format
 msgid "Observer: %s"
 msgstr "Osservatore"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Strutture: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Nessuno. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Meraviglie: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Città: %d in totale, %d sopra la soglia di %d."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10116,7 +10171,7 @@ msgstr[0] "%d cittadini soddisfatti prima delle penalit
 msgstr[1] "%d cittadini soddisfatti prima delle penalità con "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10124,16 +10179,16 @@ msgstr[0] "%d cittadini scontenti ulteriori."
 msgstr[1] "%d cittadini scontenti ulteriori."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Legge marziale in effetto ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "nessun massimo, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10141,20 +10196,20 @@ msgstr[0] "massimo %d unit
 msgstr[1] "%d unità massimo, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d per unità). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Unità militari sul campo possono causare malcontento. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Le unità militari non hanno effetti sul malcontento. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Lusso: %d totale."
@@ -10202,12 +10257,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "nessuno"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "personalizzato"
 
@@ -10261,11 +10316,13 @@ msgid "Ooops..."
 msgstr "Ooops..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Questa unità non può essere corrotta!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10282,6 +10339,7 @@ msgstr "Corrompi unit
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10322,6 +10380,7 @@ msgstr "_Tecnologie:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "A discrezione della spia"
 
@@ -10346,12 +10405,13 @@ msgstr "_Strutture cittadine"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Produzione della città"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Non puoi incitare una rivolta a %s."
@@ -10363,6 +10423,7 @@ msgstr "La citt
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10379,6 +10440,7 @@ msgstr "Incita una rivolta!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10388,6 +10450,7 @@ msgstr ""
 "Il tesoro contiene %d auri."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10457,11 +10520,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Attaccare un'unità nemica"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Il diplomatico attende i vostri ordini"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "La spia attende i vostri ordini"
@@ -10562,7 +10627,7 @@ msgstr "Inquinamento:"
 msgid "_Overview"
 msgstr "_Descrizione"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10587,11 +10652,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d turni"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "Co_mpra"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "Pro_duzione"
@@ -10713,7 +10778,7 @@ msgstr "Unit
 msgid "Present units %d"
 msgstr "Unità presenti %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "C_entra"
 
@@ -10802,32 +10867,32 @@ msgstr "Rinomina citt
 msgid "What should we rename the city to?"
 msgstr "Qual è il nuovo nome della città?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_Cambia"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Aggiungi _primo"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Aggiungi _prossimo"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Aggiungi _ultimo"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Seleziona"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "_Mostra"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10837,13 +10902,13 @@ msgstr "_Mostra"
 msgid "Cities"
 msgstr "Città"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "F_inestra"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10852,85 +10917,90 @@ msgstr "F_inestra"
 msgid "Improvements"
 msgstr "Strutture cittadine"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Meraviglie del mondo"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Tutte le città"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Nessuna città"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Inverti la selezione"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Costruisci unità"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Costruisci strutture cittadine"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Costruisci meraviglie"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Costruisci unità"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Costruisci struttura cittadina"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Costruisci meraviglia"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Le città sulla costa"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Sulla stessa isola"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Unità supportate"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Unità presenti"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Strutture cittadine"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Meraviglie in città"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Unità disponibili"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Strutture cittadini disponibili"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Meraviglie disponibili"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Costo totale:"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 #, fuzzy
 msgid ""
@@ -10999,127 +11069,127 @@ msgstr "Qual'
 msgid "Remove this preset?"
 msgstr "Elimina questa preselezione?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "_Vai alla posizione"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "Apri finestra _città"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Volete fare una rivoluzione?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Rivoluzione!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Cosa saccheggiare"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Scegliete cosa saccheggiare:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Unità"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Nome"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Scelta unità"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_Sveglia tutti"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "Inattiva in _sentinella"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Nazioni:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Che nazione volete essere?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 #, fuzzy
 msgid "Pick Nation"
 msgstr "Centrale di polizia"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Nazioni Unite"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Scegliete una nazione"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Proprietà"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Capo:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Femmina"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Maschio"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "Stile delle _città:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "_Leggenda"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Dovete scegliere il vostro sesso."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Dovete scegliere lo stile delle vostre città."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Dovete digitare un nome valido."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Aggiorna unità!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11365,70 +11435,76 @@ msgstr ""
 msgid "Not _ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 #, fuzzy
 msgid "_Ready"
 msgstr "_Sveglia tutti"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Inizia"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Città"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 #, fuzzy
 msgid "Pick _Nation"
 msgstr "Centrale di polizia"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 #, fuzzy
 msgid "_Observe"
 msgstr "Osservatore"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "%s da ora osserva %s"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 #, fuzzy
 msgid "<AI>"
 msgstr "IA"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 #, fuzzy
 msgid "<Easy AI>"
 msgstr "IA"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 #, fuzzy
 msgid "<Hard AI>"
 msgstr "IA"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 #, fuzzy
 msgid "Random"
 msgstr "Radio"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Observer"
 msgstr "Osservatore"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Detached"
 msgstr "Morto"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Sei sicuro di voler terminare?"
 
@@ -12357,227 +12433,227 @@ msgstr "C_onnessione a una partita in rete"
 msgid "Connect to Gaming _Zone"
 msgstr "Connessione a una partita in rete"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Le password non coincidono, inserisci password."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Nome server"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Porta"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versione"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Stato"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Giocatori"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Commento"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "_Rete locale"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Internet _Metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Host:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Ingresso:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Conf_erma Password:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 #, fuzzy
 msgid "C_onnect"
 msgstr "Collega"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, fuzzy, c-format
 msgid "Connection name: %s"
 msgstr "Connessione in avanzamento."
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, fuzzy, c-format
 msgid "Player name: %s"
 msgstr "?Player:Nome"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, fuzzy, c-format
 msgid "Host: %s"
 msgstr "Server:"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, fuzzy, c-format
 msgid "%s info"
 msgstr "Informazioni città"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 #, fuzzy
 msgid "Toggle player ready"
 msgstr "aitoggle <nome-giocatore>"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 #, fuzzy
 msgid "Pick nation"
 msgstr "Centrale di polizia"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 #, fuzzy
 msgid "Take this player"
 msgstr "Città"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 #, fuzzy
 msgid "Cut connection"
 msgstr "Chiusura del collegamento %s."
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 #, fuzzy
 msgid "Aitoggle player"
 msgstr "aitoggle <nome-giocatore>"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 #, fuzzy
 msgid "Remove player"
 msgstr "Rimosso giocatore %s."
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, fuzzy, c-format
 msgid "Put on %s"
 msgstr "Popolazione: %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "_Numero di giocatori (incluse le IA):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "livello _AI:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "Capo:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Ulteriori _opzioni gioco..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 #, fuzzy
 msgid "Record"
 msgstr "Rapporto"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 #, fuzzy
 msgid "Rating"
 msgstr "Scrittura"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 #, fuzzy
 msgid "Ready"
 msgstr "Tutti pronti"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Capo"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Scegli la partita salvata da caricata"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Scegli la partita salvata da _caricare"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Sfoglia..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Scegli uno scenario"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Scegli uno _scenario:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Tipo"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Scegliete la _nazione con cui giocare:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Scegliete una nazione ed un nome"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Salva partita"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "_Salva partita:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Salva nome _file:"
 
@@ -12614,7 +12690,7 @@ msgstr "Nome struttura"
 msgid "Count"
 msgstr "Numero"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12859,28 +12935,28 @@ msgstr "_Liste lavori:"
 msgid "Edit Global _Worklists"
 msgstr "_Modifica lista lavori globale"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Turni"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "Sorgente _compiti:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Mostra obiettivi _futuri"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Obiettivo _Lista lavori:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "_Aggiungi lista lavori globale"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "_Cambia produzione"
 
@@ -13184,8 +13260,8 @@ msgid "City shrinks: %d %s"
 msgstr "Città: %s (%s)"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13301,12 +13377,12 @@ msgstr "Rapporto Finale:"
 msgid "Maintenance Report"
 msgstr "Rapporto scientifico"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 #, fuzzy
 msgid "worklist"
 msgstr "(lista lavori)"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13748,21 +13824,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -15073,7 +15149,7 @@ msgstr "Stile delle _citt
 msgid "Unit Selection"
 msgstr "Scelta unità"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "NESSUNA"
 
diff --git a/po/ja.gmo b/po/ja.gmo
index 7cf038a..2c1e49e 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index bacc39d..0ebea13 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -144,7 +144,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.0.99-devel\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-08-12 15:56+0300\n"
 "Last-Translator: MITA Yuusuke <clefs at mail.goo.ne.jp>\n"
 "Language-Team: SAWADA Katsuya <ama at petmail.net>\n"
@@ -185,22 +185,22 @@ msgstr "è´…æ²¢"
 msgid "Science"
 msgstr "科学"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:建"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:不"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:古"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:建"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:不"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -634,87 +634,87 @@ msgid "AI Debug messages"
 msgstr "AIのデバッグ用メッセージ"
 
 # ntaka 何て訳せばいいんだよ
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "憎悪"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "強硬"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "敵対的"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "非協力的"
 
 # ntaka 変?
 # clefs 「神経質」「猜疑的」とか考えられますが,「不安」で行きましょう
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "不安"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "中立"
 
 # ntaka Worshipful とどう訳し分けるんだよ?
 # worshipは崇めるようにするのに対し、respectは一目置くって程度なんですけど
 # 訳語は難しいですね (clefs)
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "好意的"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "協力的"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "熱狂的"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "賛美"
 
 # was "尊敬"
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "崇拝"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "休戦"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "敵対"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "停戦"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "和平"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "同盟"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "未接触"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "チーム"
 
@@ -764,13 +764,13 @@ msgstr "%s 部隊"
 msgid "Size %d"
 msgstr "規模 %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "先端技術 %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -782,65 +782,65 @@ msgstr "先端技術 %d"
 msgid "None"
 msgstr "なし"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "先端技術"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(なし)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "道路"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "灌漑"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "鉄道"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "資源"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "公害"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "小屋"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "要塞"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "川"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "農地"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "飛行場"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "死の灰"
 
@@ -957,11 +957,11 @@ msgstr "核兵器"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr "と"
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "と"
 
@@ -1125,81 +1125,81 @@ msgid " (total %d repeat)"
 msgid_plural " (total %d repeats)"
 msgstr[0] " (合計 %d回)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "\"%s\"への引数が空です。\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "\"%s\"への引数がみつかりません。\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d BC"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d AD"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "FREECIV_PATH がセットされていますが空です。かわりにディフォルトパスを使いま"
 "す。"
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "データディレクトリ %s を読むことができません: %s。"
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "データパスは環境変数 FREECIV_PATH で設定できます。"
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "現在のデータパスは: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "\"%s\" ファイルが必要です ... 中止しています!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: 致命的エラー: スーパーユーザで起動しようとしています!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "特権のないアカウントをかわりに使って下さい。\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "完全一致"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "唯一の一致"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "あいまい"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "空"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "長すぎる"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "不一致"
 
@@ -1230,17 +1230,17 @@ msgstr "%sで(不必要な)%sを金%dで売ります。"
 
 # clefs
 # XXX `away mode'
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (AI)* 不在モードではAIはそのような条約にはサインできません。"
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%1$s (AI)* %3$sよ,まず最初に%2$sとの同盟関係を絶ってから来るべきだ。"
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (AI)* %sよ,まずは敵対関係を止めようではないか。"
@@ -1248,7 +1248,7 @@ msgstr "*%s (AI)* %sよ,まずは敵対関係を止めようではないか。
 # clefs
 # AI外交の台詞はどうも私にはうまく訳せないので
 # どんどんより良いものに置き換えていってください。
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1258,18 +1258,18 @@ msgstr ""
 "けたいと思う,%sよ。"
 
 # clefs XXX
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (AI)* 私はまだ同盟を結ぶほど貴国を信頼していないのだ,%sよ。"
 
 # clefs XXX
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (AI)* そのような都市は知らない。"
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
@@ -1277,33 +1277,33 @@ msgstr ""
 "る。"
 
 # clefs
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (AI)* %sよ,この取引は我々にとってそれほど良いものではなさそうだ。"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* %sよ,我が同盟にようこそ!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* 了解した。%sと我が国との同盟が永遠に続くことを願おう。"
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* 了解した。我々に平和な時が訪れたようだ。"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)* 同意した。%sよ,もはや敵対関係を止めよう。"
 
 # clefs
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1314,14 +1314,14 @@ msgstr ""
 
 # clefs
 # 宇宙船を打ち上げると首都を奪いにくる
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* 宇宙は貴国のものにはさせない。"
 
 # clefs
 # XXX `vicious antics'
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr "*%s (AI)* 貴様の悪ふざけにはもう我慢の限界だ。戦争だ!"
@@ -1329,13 +1329,13 @@ msgstr "*%s (AI)* 貴様の悪ふざけにはもう我慢の限界だ。戦争
 # clefs
 # was "*%s (AI)* 平和な時は...終わりだ!"
 # some other timeというのは過去でなく未来のいつか、今ではないということでは?
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (AI)* 平和を……いつの日にか,な。"
 
 # clefs
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1345,20 +1345,20 @@ msgstr ""
 "いたわけではあるまいな?"
 
 # clefs
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (AI)* おまえの隠然たる敵対行為がこの戦争をもたらしたのだ!"
 
 # clefs
 # was "*%s (AI)* 貴国の我が同盟国に対する行いは、貴国の最後の過ちだ!"
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)* 貴国の%sに対する行いは,貴国の最後の過ちだ!"
 
 # clefs
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1371,7 +1371,7 @@ msgstr[0] ""
 "争に突入する。"
 
 # clefs
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1381,7 +1381,7 @@ msgstr ""
 "かんことを!"
 
 # clefs
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1396,7 +1396,7 @@ msgstr[0] ""
 "る,貴国も同盟を尊重し我々に続くように!"
 
 # clefs
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1408,14 +1408,14 @@ msgstr[0] ""
 "*%s (AI)* 我々は%sの豊かな文明を略奪してやるつもりだ。%dターン後に宣戦する。"
 
 # clefs
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr "*%s (AI)* 戦利品の分け前が欲しいなら,遠慮なく参加してくれたまえ!"
 
 # clefs
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1428,7 +1428,7 @@ msgstr[0] ""
 "れようではないか。%dターン後に宣戦する。"
 
 # clefs
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
@@ -1436,7 +1436,7 @@ msgstr ""
 "る。"
 
 # clefs
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1449,7 +1449,7 @@ msgstr[0] ""
 "我々もすぐ駆けつける!"
 
 # clefs
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1462,7 +1462,7 @@ msgstr[0] ""
 "我々に続くものと期待する。"
 
 # clefs
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1471,7 +1471,7 @@ msgstr ""
 "*%s (AI)* 貴国が単独で宇宙を征服しようとしているのを見れば貴国の意図は明らか"
 "だ。同盟は破棄させてもらう!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1480,7 +1480,7 @@ msgstr ""
 "*%s(AI)* 貴国の一方的に宇宙空間を支配しようとする試みは大変攻撃的なものであ"
 "る。"
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1489,14 +1489,14 @@ msgstr ""
 "*%s (AI)* もし貴国が宇宙船の建設を中止しないならば,我が国は何らかの行動にで"
 "ることも辞さない!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 "*%s (AI)* すまないが,貴国と視野を共有することは我が国にとってもはや安全な事"
 "ではない。"
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1505,7 +1505,7 @@ msgstr ""
 "*%s (AI)* 我が最も信頼のおける同盟国諸君よ,我々は%sを打倒するために貴国の力"
 "を必要としている。"
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1516,7 +1516,7 @@ msgstr ""
 "らんのだ?"
 
 # clefs
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1528,7 +1528,7 @@ msgstr ""
 "だ!"
 
 # clefs
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1536,13 +1536,13 @@ msgid ""
 msgstr "*%s (AI)* 親愛なる友人よ,大義を共有し同盟を結ぼうではないか?"
 
 # clefs
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr "*%s (AI)* 親愛なる隣人よ,より平和的な関係を持とうではないか?"
 
 # clefs
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1551,7 +1551,7 @@ msgstr "*%s (AI)* 相続く流血にはうんざりです。停戦を結ぼう
 
 # clefs
 # msgstr "*%s (AI)* %sは我々両国を脅かしている。我々は停戦をすべきではないか?"
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1562,40 +1562,45 @@ msgstr ""
 
 # clefs
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "全てのオプション"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr " (デフォルト)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (ベテラン)"
 
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
 # clefs
-#: server/auth.c:266
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "その名前は許可されていません。"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "オーディオフィアル %s が見つかりません。"
@@ -1603,24 +1608,24 @@ msgstr "オーディオフィアル %s が見つかりません。"
 # clefs
 # このあたりは翻訳しても,日本語でサーバを走らせない限り意味がないのですけど。
 # freeciv.orgなどのサーバからのメッセージは英語のままなわけです。
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr "警告: ゲスト名 '%s' は既に使われているので '%s' に変更します。"
 
 # clefs
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "申し訳ありませんが,このサーバではゲストは許可されていません。"
 
 # clefs
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s は拒絶されました: ゲストは許可されていません。"
 
 # clefs
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1630,7 +1635,7 @@ msgstr ""
 "グインしています。"
 
 # clefs
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1639,44 +1644,44 @@ msgstr ""
 "れていません。申し訳ない。"
 
 # clefs
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%sは拒絶されました:データベース・エラー,かつゲスト不許可"
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "%sのパスワードを入力してください:"
 
 # clefs
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "新しいパスワードを入力してください(後で使うので忘れないで)。"
 
 # clefs
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "このサーバは事前に登録したユーザしか受け入れていません。ごめんね。"
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%sは拒絶されました:事前登録者のみ許可しています。"
 
 # clefs
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "残念ですが,失敗回数が限度を超えました……"
 
 # clefs
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr "%sは拒絶されました:新規ユーザのパスワード認証失敗過多"
 
 # clefs
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1685,34 +1690,34 @@ msgstr ""
 "保存されません。"
 
 # 意訳 (clefs)
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s は拒絶されました: パスワード認証に失敗しました。"
 
 # 戯訳 ;-)
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "じゅもんが ちがいます"
 
 # clefs
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "ごめんなさい,あなたの接続はタイムアウトしました……"
 
 # clefs
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s は拒絶されました: パスワード認証中にタイムアウトしました。"
 
 # clefs
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "このパスワードは短すぎます。最低%d文字で,もう一度。"
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2531,7 +2536,6 @@ msgstr "vote yes|no [投票番号]"
 msgid "Cast a vote."
 msgstr "投票します。"
 
-# 変更が近いらしいから訳しても無駄になりそうなので後回し
 #: server/commands.c:111
 #, no-c-format
 msgid ""
@@ -2540,44 +2544,42 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr ""
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <オプション名> <値>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "サーバオプションを設定する。"
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <プレイヤー> [チーム]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "プレイヤーの所属チームを変更,追加,削除する。"
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2590,16 +2592,16 @@ msgstr ""
 "ます。チームのプレイヤーは,プレイヤーの平均得点で決まるチームの勝利を目指し"
 "て一緒に戦います。"
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <ディレクトリ>"
 
 # clefs
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "ルールセット・ディレクトリまたはmodpackを選択する。"
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2608,15 +2610,15 @@ msgstr ""
 " 選択する。引数なしで呼んだら,現在選択されているルールセットを表示します。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <メタサーバ情報行>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "メタサーバ情報行を設定する。"
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2625,20 +2627,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapath <メタサーバ情報行>"
 
 # Daniel
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "メタサーバ情報行を設定する。"
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "メタサーバ接続を操作する。"
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2649,36 +2651,36 @@ msgstr ""
 "'metaconnection up' もしくは 'metac u' は,メタサーバへ接続します。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <所在>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "メタサーバへ報告する所在を設定します。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <プレイヤー名>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "プレイヤーの AI 状態を切り替える。"
 
 # clefs
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [接続名] <プレイヤー名>"
 
 # clefs XXX
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "ゲーム上でそのプレイヤーになる。"
 
 # clefs
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2693,16 +2695,16 @@ msgstr ""
 
 # Daniel
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [接続名] <プレイヤー名>"
 
 # clefs
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "プレイヤー,またはゲーム全体を観察します。"
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2717,18 +2719,18 @@ msgstr ""
 
 # Daniel
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <接続名>"
 
 # clefs
 # was "プレイヤーからデタッチする"
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "プレイヤーを放棄する。"
 
 # clefs
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2737,21 +2739,21 @@ msgstr ""
 "ヤーからデタッチさせることができます。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <プレイヤー名>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "与えられた名前で AI プレイヤーを作る。"
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "'create' コマンドは,ゲームを開始する前だけ利用できます。"
 
 # clefs
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2761,18 +2763,18 @@ msgstr ""
 
 # clefs
 # 「(お)留守番モード」とでもすればわかりやすいのかな
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "不在モードに設定します。AIが面倒を見てくれます。"
 
 # clefs
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "AIがあなたの国を統治しますが,変化は最小限にとどめます。"
 
 # Daniel
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2781,12 +2783,12 @@ msgstr ""
 "novice <プレイヤー名>"
 
 # Daniel
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "1人もしくは全ての AI プレイヤーを 'novice' に設定する。"
 
 # Daniel
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2797,7 +2799,7 @@ msgstr ""
 "ら,そのプレイヤーの手腕だけを設定します。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2805,11 +2807,11 @@ msgstr ""
 "easy\n"
 "easy <プレイヤー名>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "1人もしくは全ての AI プレイヤーを 'easy' に設定する。"
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2820,7 +2822,7 @@ msgstr ""
 "そのプレイヤーの手腕だけを設定します。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2828,11 +2830,11 @@ msgstr ""
 "normal\n"
 "normal <プレイヤー名>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "1人もしくは全ての AI プレイヤーを 'normal' に設定する。"
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2843,7 +2845,7 @@ msgstr ""
 "ら,そのプレイヤーの手腕だけを設定します。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2851,11 +2853,11 @@ msgstr ""
 "hard\n"
 "hard <プレイヤー名>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "1人もしくは全ての AI プレイヤーを 'hard' に設定する。"
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2866,7 +2868,7 @@ msgstr ""
 "そのプレイヤーの手腕だけを設定します。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2874,11 +2876,11 @@ msgstr ""
 "experimental\n"
 "experimental <プレイヤー名>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "1人もしくは全ての AI プレイヤーを 'experimental' に設定する。"
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2891,7 +2893,7 @@ msgstr ""
 "です!*** 通常のサーバでは,このオプションは無効です。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2905,11 +2907,11 @@ msgstr ""
 "cmdlevel <レベル> first\n"
 "cmdlevel <レベル> <接続名>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "コマンド利用権レベルを問い合わせ,または設定する。"
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2952,20 +2954,20 @@ msgstr ""
 "としてプレイヤー名ではなく接続名を取ることに注意して下さい。"
 
 # clefs
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "まだいなければ,より強い権限を持ったゲーム主催者になります。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <ターン> <ターン増加> <値> <乗値>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "\"help timeoutincrease\" を見て下さい。"
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2977,27 +2979,27 @@ msgstr ""
 
 # then there's nothing left :) -clefs
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
 # clefs
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "このコマンドは,ゲームを即座に引き分けで終了します。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "surrender"
 
 # clefs
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "敗北を認めます。"
 
 # clefs XXX
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -3006,15 +3008,15 @@ msgstr ""
 "全員が同様に負けを認めるとそれでゲームは終了します。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <プレイヤー名>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "ゲームからプレイヤーを完全に追い出す。"
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -3023,7 +3025,7 @@ msgstr ""
 "して使って下さい。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -3031,11 +3033,11 @@ msgstr ""
 "save\n"
 "save <ファイル名>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "ファイルにゲームを保存します。"
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -3052,7 +3054,7 @@ msgstr ""
 "を使い起動し,一旦プレイヤーを再接続してコマンド 'start' を使って下さい。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -3060,12 +3062,12 @@ msgstr ""
 "load\n"
 "load <ファイル名>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "ファイルからゲームをロードします。"
 
 # clefs
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -3074,29 +3076,29 @@ msgstr ""
 "を含む全てのデータは失われます。\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <ファイル名>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "ファイルからのサーバコマンドを処理する。"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <ファイル名>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "ファイルへサーバコマンドとして現在の設定を保存する。"
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "サーバの出力を,'RFC-style' と通常の形式とで切り替えます。"
 
 # clefs
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "単純にサーバのIDを返します。"
 
@@ -3681,27 +3683,36 @@ msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%sは%sで叛乱を煽動しようとして事変を引き起こしました。"
 
 # clefs
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "ゲーム開始時の海上部隊はまだサポートされていないので,どのプレイヤーも%sは持"
 "ちません。"
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "西暦: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr "ターン・タイムアウトが最大値を越えています。最大値に修正しています。"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "ターン・タイムアウトが 0より小さいです。 0に修正しています。"
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "GGZクライアントのみがggzモードでcivclientを起動するべきです!\n"
 
@@ -3746,27 +3757,27 @@ msgid "There is no player nor connection by the name %s."
 msgstr "%s という名前のプレイヤーもしくは接続はありません。"
 
 # yasu
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "地球温暖化が起こりました!"
 
 # yasu
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr "海岸が洪水になり,多くの草原が砂漠に変わりました。"
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "核の冬が起こりました!"
 
 # yasu
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr "湿潤な土地は乾燥し,草原の多くがツンドラになりました。"
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3775,7 +3786,7 @@ msgstr ""
 "鉄道の発見が公表されたことで,新しい希望が火のように国を駆け巡ります。\n"
 "      労働者が自発的に集まり,全ての都市に鉄道を引きます。"
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3785,13 +3796,13 @@ msgstr ""
 "労働者は自発的に集まり,全ての都市に鉄道を引きます。"
 
 # clefs
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "地形の変更に伴い%sを移動しました。"
 
 # clefs
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "地形の変更に伴い%sを解散しました。"
@@ -3855,31 +3866,31 @@ msgid "You should choose a new government from the government menu."
 msgstr "「政治体制」メニューから新しい統治形態を選択してください。"
 
 # yasu
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "税金の割合が %s の最大値を超えました。修正しました。"
 
 # yasu
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "科学の割合が %s の最大値を超えました。修正しました。"
 
 # yasu
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "贅沢の割合が %s の最大値を超えました。修正しました。"
 
 # yasu
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s はもう視野を提供してくれません。"
 
 # clefs
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3889,14 +3900,14 @@ msgstr ""
 "グを待つかする必要があります。"
 
 # yasu, clefs
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "%s の絶え間ない挑発のため,上院はあなたの議案を通過させました。"
 
 # clefs XXX
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3905,13 +3916,13 @@ msgstr ""
 "上院は%sとの条約破棄を承認しませんが,わけなく別の議会にすげ替えました。"
 
 # yasu
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "%sと%sの外交状態はいま%sです。"
 
 # yasu, ama
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3919,14 +3930,14 @@ msgid ""
 msgstr "%sは外交条約を破棄しました! %sと%sの外交状態はいま%sです。"
 
 # clefs
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr "%s はあなたの同盟国の %sを攻撃しました! 侵略国との同盟を破棄します。"
 
 # clefs
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3937,31 +3948,31 @@ msgstr ""
 
 # yasu, clefs
 # was "プレイヤー %s を中止させます。"
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "プレイヤー %s を除去します。"
 
 # yasu, clefs
 # was "あなたはゲームを中止させられました。"
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "あなたはゲームから除去されました!"
 
 # yasu, clefs
 # was "%sはゲームを中止させられました。"
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%sはゲームから除去されました。"
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "あなたは %2$s によって統治された %1$s と接触しました。"
 
 # clefs
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3969,20 +3980,20 @@ msgstr ""
 "%s と %s は接触と同時に戦争状態となりました。両国との同盟を破棄します。"
 
 # clefs
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "%sに内戦を起こせませんでした――プレイヤーが多すぎます"
 
 # clefs
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "%sに内戦を起こせませんでした――プレイヤーが多すぎます"
 
 # yasu
 # XXX
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3990,14 +4001,14 @@ msgid ""
 msgstr "あなたの国は内戦になりました。%sが叛乱者のリーダー宣言しました。"
 
 # yasu
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%sは%sに対する忠誠を宣言しました。"
 
 # clefs
 # 原文の2行目以降に行頭のスペースがあるのは、1行目の「Game:」を消した名残りか
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -4233,20 +4244,20 @@ msgid "th"
 msgstr "位"
 
 # clefs
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "人口統計設定文字列に無効な文字が含まれています。\"help demography\"参照"
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "人口統計報告:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "すみません。人口統計報告は利用できません。"
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%sの%s (%s)"
@@ -4257,11 +4268,11 @@ msgstr "%sの%s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "ルールセットファイル \"%s.%s\" が見つかりません。"
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "ルールセットをロードしています"
 
@@ -4277,7 +4288,7 @@ msgstr ""
 "こることもあるし,不正なセーブゲームファイルを指定したのかもしれません。自分"
 "のリスクで続けて下さい。"
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "savegame は古過ぎます。1.9.0 以上が必要です。"
@@ -4301,14 +4312,14 @@ msgstr ""
 "使います。"
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 # clefs
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4344,7 +4355,7 @@ msgstr "内部設定"
 msgid "Networking"
 msgstr "ネットワーク"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "全て"
@@ -4368,7 +4379,7 @@ msgid "Changed"
 msgstr "変更あり"
 
 # clefs
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4377,7 +4388,7 @@ msgstr ""
 "\"参照。"
 
 # clefs
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4386,7 +4397,7 @@ msgstr ""
 "照。"
 
 # clefs
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4395,28 +4406,33 @@ msgstr ""
 "開始時ユニット設定文字列に都市を創設できる部隊が含まれていません。\"help "
 "allowtake\"参照。"
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
 # clefs
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "GGZモードでは maxplayers を変更できません。"
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr "プレイヤー数が要求した値より大きいです。値を変更しません。"
 
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "このオプションの設定を許可されていません。"
+
 # clefs
-#: server/settings.c:236
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "地図の大きさ (×1000タイル)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4428,14 +4444,14 @@ msgstr ""
 
 # clefs
 # トポロジってのは、要はタイルのつながり方です
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "地図のトポロジ"
 
 # XXX Problem is tHat the backticks can be displayed as Yen mark in Japanese
 # environment... (clefs)
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4503,12 +4519,12 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "地図生成の方法"
 
 # clefs
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4529,12 +4545,12 @@ msgstr ""
 "\"startpos\" も参照してください。"
 
 # clefs
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "開始位置の決定方法"
 
 # clefs
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4555,34 +4571,34 @@ msgstr ""
 "注: ジェネレータは,開始位置の選択とプレイヤーの人数に相応わしい数の大陸を生"
 "成しようとします。"
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "大きさ 1x1 島の出現"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = 1x1 島なし; 1 = 1x1 島あり"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "極地が大陸から離れているかどうか"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr "0 = 大陸は極地に接しているかもしれない; 1 = 極地は離れている"
 
 # clefs
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "地図全域を温帯とするか"
 
 # clefs
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = 地球のような惑星; 1 = 惑星全体が温帯"
 
 # clefs
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "惑星の平均気温"
 
@@ -4590,7 +4606,7 @@ msgstr "惑星の平均気温"
 # 親切な訳註つき
 # trivia: 日本の冷凍庫やアイスクリームの保存温度がよく「-18℃」になっているのは
 # 単に 0°F≒-18℃ だからなんですね
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4623,34 +4639,34 @@ msgstr ""
 "0では巨大な極地があり熱帯は存在しない極めて寒冷な惑星となります。[0°F≒-18℃]"
 
 # clefs
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "地図に占める陸地の割合"
 
 # clefs
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr "地図のおおよそ何%が陸地になるか"
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "丘・山の量"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
 msgstr "値が小さければ平坦な土地に,大きければ丘や山の多い土地になります。"
 
 # clefs
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "陸地の湿潤さ"
 
 # clefs
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4658,11 +4674,11 @@ msgstr ""
 "値を小さくすると乾燥した,砂漠のような陸地になります。値を大きくすると湿潤"
 "な,沼やジャングルや河川の多い陸地になります。"
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "地図生成用のランダム種"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4671,11 +4687,11 @@ msgstr ""
 "同じ種は常に同じ地図を作成します。ゼロ(既定値)の時は,時間を基にして種を選び"
 "ます。これが必要なのはデバッグの時くらいでしょう。"
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "一般用のランダム種"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4683,24 +4699,24 @@ msgstr ""
 "ゼロ(既定値)の時は,時間を基にして種を選びます。これが必要なのはデバッグの時"
 "くらいでしょう。"
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "「特別」な資源の量"
 
 # 原文に難がありますね。鳥とか鯨とかの生成確率です。超訳する? (clefs)
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
 msgstr "特別な資源は,基本地形型を向上させます。値は 1000 に対する量です。"
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "小屋(少数部族の村)の量"
 
 # clefs
 # 原文 "investiged" は "investigated" か
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4709,24 +4725,25 @@ msgstr ""
 "で,そこを部隊が探査します。[訳註:プレイヤーの数に合わせて増減しないと望まし"
 "くない結果になります]"
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "最小プレイヤー数"
 
 # clefs
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "ゲームが始まる前に,少なくともこの数のプレイヤーがいなければなりません。プレ"
 "イヤーは人間でもAIでも構いません。"
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "最大プレイヤー数"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4735,11 +4752,11 @@ msgstr ""
 "ゲームに参加する人間プレイヤーと AIプレイヤーの最大数。プリゲーム状態にこの数"
 "のプレイヤーが接続したら,接続しようとする新しいプレイヤーは拒絶されます。"
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "プレイヤーの数(AIも含む)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4747,14 +4764,14 @@ msgstr ""
 "もしゲーム開始時にこの数のプレイヤーより少なければ,合計がこのオプションの値"
 "になるまで AI プレイヤーで穴埋めされます。"
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "開始時にプレイヤーが所持する部隊"
 
 # clefs
 # 実際には "King"「王様」なんてユニットはないんだけれど
 # "Leadership" ならある
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4781,34 +4798,34 @@ msgstr ""
 "    a   = 高速な攻撃部隊       (例: 騎手)\n"
 "    A   = 強力な攻撃部隊       (例: カタパルト)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "最初の部隊が置かれる範囲"
 
 # clefs
 # was "これは、最初の部隊が分散する土地の片側の長さの半分です。"
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "開始時に,この値の半径の範囲内で部隊が分散して配置されます。"
 
 # clefs
 # was "プレイヤーごとの開始時の金"
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "各プレイヤーが開始時に持っている金額"
 
 # clefs
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "ゲーム開始時に,各プレイヤーはこの額の資金を与えられることになります。"
 
 # clefs
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "各プレイヤーが最初に持っている技術の数"
 
 # clefs
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4821,12 +4838,12 @@ msgstr ""
 "コストが極めて大きいものになるかもしれません。"
 
 # clefs
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "科学技術研究コストの係数(パーセント)"
 
 # clefs
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4836,11 +4853,11 @@ msgstr ""
 "コストにはこの係数(パーセント)がかけられます。係数をかける前の基本コストは"
 "ルールセットや他の設定により決定されます。"
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "科学を変えた時に受けるペナルティーの割合"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4851,13 +4868,13 @@ msgstr ""
 "の規則は適用されません。"
 
 # clefs
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "条約により科学または金を得た時のペナルティー"
 
 # clefs
 # 改善の余地あり
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4870,11 +4887,11 @@ msgstr ""
 "究ポイントになることもあります。外交条約でやりとりされた現金についても適用さ"
 "れます。"
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "征服により科学を得た時のペナルティー"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4884,11 +4901,11 @@ msgstr ""
 "で指定した割合に等しいだけの研究ポイントを失います。この値が 0 以外なら負の研"
 "究ポイントになることもあります。"
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "自由に入手可能な科学を得た時のペナルティー"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4901,12 +4918,12 @@ msgstr ""
 "こで指定した割合に等しいだけの研究ポイントを失います。この値が 0 以外なら負の"
 "研究ポイントになることもあります。"
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "都市拡大に必要な食料"
 
 # clefs
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4915,13 +4932,13 @@ msgstr ""
 "都市が拡大するために必要な食料の量です。この値はルールセットによる他の要素に"
 "より修正されるほか,都市の大きさによっても変わってきます。"
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "水道が必要な時に失う食料の割合"
 
 # ama, yasu
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4931,12 +4948,12 @@ msgstr ""
 "こで指定した割合だけ(穀物庫がある場合はその半分)食料備蓄から失います。"
 
 # clefs
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "製造コストの係数(パーセント)"
 
 # clefs
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4944,12 +4961,12 @@ msgstr ""
 "部隊および都市施設の製造スピードに影響します。基本値にこの係数(パーセント)"
 "がかけられます。"
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "最大交易を得るための最小都市規模"
 
 # clefs
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4960,11 +4977,11 @@ msgstr ""
 "notradesize 以下なら 100%(交易なし),そこから徐々に減って size=fulltradesize"
 "では 0%(通常の汚職を除いてペナルティなし)になります。notradesize も参照。"
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "交易のない都市の最大規模"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4974,12 +4991,12 @@ msgstr ""
 "fulltradesize より小さい都市では,徐々に交易が増えます。fulltradesize も参"
 "照。"
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "市民が不幸にならない都市規模"
 
 # yasu, clefs
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4987,11 +5004,11 @@ msgstr ""
 "他の修正がない時、最初の unhappysize 単位までの市民は普通状態、それ以後の市民"
 "は不幸状態になります。cityfactor も参照。"
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "不幸増加の都市数"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -5002,11 +5019,11 @@ msgstr ""
 "市民が不幸になります。 unhappysize も見て下さい。これは民主制の時です。他の政"
 "治体制では、都市の数は少なくなります。"
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "都市間の最小距離"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -5019,12 +5036,12 @@ msgstr ""
 "なりません。 0(デフォルト)にセットしたら,ルールセットで設定された値を使用し"
 "ます。"
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "歓喜を得るまでのターン数"
 
 # clefs
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -5033,23 +5050,23 @@ msgstr ""
 "nに設定した場合,都市はn+1ターンの祝典の後に成長します。"
 
 # yasu
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "占領した建物が壊れる確率"
 
 # yasu, clefs
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr "都市を占領した場合,都市の各施設はそれぞれこの確率で破壊されます。"
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "攻撃の後タイルへ移動する可能性"
 
 # clefs
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -5063,12 +5080,12 @@ msgstr ""
 "を設定したら,「占領」の発生する確率として使われます。"
 
 # clefs
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "サーバ側での自動攻撃のオン・オフ"
 
 # clefs
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -5076,11 +5093,11 @@ msgstr ""
 "オンにすると,移動力が残っている部隊はすぐそばで移動する敵を自動で攻撃しよう"
 "とするようになります。"
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "攻撃による都市人口の減少"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -5096,11 +5113,11 @@ msgstr ""
 "  4 = ヘリコプター部隊\n"
 "  8 = 飛行部隊"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "国境線の半径"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -5110,23 +5127,23 @@ msgstr ""
 "ます。海および,複数国の都市の範囲内にある土地には特別なルールが適用されま"
 "す。"
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "部隊が国境線内にいるときは不幸をもたらさない"
 
 # clefs
 # そのまんま
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr "セットすると,部隊が国境線内にいるときは不幸をもたらさなくなります。"
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "他のプレイヤーと外交を行えるか"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -5140,11 +5157,11 @@ msgstr ""
 "3 = チーム単位でのみ外交を行えなす。\n"
 "4 = 外交は一切行えません。"
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "都市名の許可"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -5165,11 +5182,11 @@ msgstr ""
 "つまり,ゲーム中の全ての都市は違う名前を持つことになります。 3 に設定したら,"
 "プレイヤーは他の国家のデフォルトの都市名を使うことはできません。"
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "バーバリアンの出現頻度"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -5183,21 +5200,21 @@ msgstr ""
 "3 - 頻繁なバーバリアンの出現\n"
 "4 - 猛威を振るう遊牧民,バーバリアンの群れ"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "バーバリアン攻撃開始年"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "バーバリアンはこの年より前には出現しません。"
 
 # clefs
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "革命に必要なターン数"
 
 # clefs
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -5205,11 +5222,11 @@ msgstr ""
 "統治形態を変更する時に,この値のターン数の間,無政府状態が発生します。0に設定"
 "すると,ランダムで1から6ターンの無政府状態となります。"
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "fog of warを有効にするかどうか"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -5219,12 +5236,12 @@ msgstr ""
 "ていない場所の新しい都市や地形の変更をあなたは見ることができません。"
 
 # clefs
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "外交官・スパイの基本成功確率"
 
 # clefs
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -5233,20 +5250,20 @@ msgstr ""
 "外交官またはスパイが任務に成功する確率,および任務に成功したスパイが生還する"
 "確率です。"
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "宇宙開発競争を有効にするかどうか"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "このオプションが 1 なら,プレイヤーは宇宙船を建造できます。"
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "内戦の起こる都市数の最小"
 
 # ama, clefs
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -5255,12 +5272,12 @@ msgstr ""
 "プレイヤーが少なくともこの数の都市を持っている時に首都が占領されると内戦が引"
 "き起こされます。このオプションを最大値に設定すると内戦は完全にやみます。"
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "プレイヤー間の接触が失われるまでのターン数"
 
 # clefs
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -5270,13 +5287,13 @@ msgstr ""
 "レイヤー同士の外交会談を持つことができます。0に設定すると,大使館を開設しない"
 "限り会談は持てなくなります。"
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "首都が占領された時に宮殿が再建築されるか"
 
 # clefs
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -5286,23 +5303,23 @@ msgstr ""
 "1をセットしていて首都が占領されたら,無料で他のランダムに選ばれた都市に自動的"
 "に宮殿が再建築されます。これは「建築」を知らなくても起こります。"
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "自然な都市名を使うかどうか"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr "有効にしたら,デフォルトの都市名をまわりの地形を元に決定します。"
 
 # clefs
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "接続した人間が利用できるプレイヤーの種類"
 
 # clefs
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -5358,11 +5375,11 @@ msgstr ""
 "   4 = 操作者不可,観察者可\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "接続によって AI の状態を切りかえるかどうか"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5370,25 +5387,28 @@ msgstr ""
 "1 にしたら,プレイヤーが接続した時に AI を無効にし,切断した時に AI を有効に"
 "します。"
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "ゲーム終了年"
 
 # clefs
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "この年の終わりにゲームが終了します。"
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "ターン毎の最大秒数"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "プレイヤー全員がこの時間までに「ターン終了」を実行しなくても,自動的にターン"
 "を終了させます。ゼロはタイムアウトしないことを意味します。 DEBUG サーバでは,"
@@ -5397,12 +5417,12 @@ msgstr ""
 "す。"
 
 # clefs XXX
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "敵が移動した場合に残す最小のタイムアウト秒数"
 
 # clefs XXX
-#: server/settings.c:896
+#: server/settings.c:889
 #, fuzzy
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
@@ -5411,12 +5431,12 @@ msgstr ""
 "敵のユニットが視界内で移動した場合に,残りのタイムアウトがこの値よりも小さけ"
 "ればこの値にセットされます。"
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "プレイヤーのフェーズを同時にするか"
 
 # clefs XXX
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5424,12 +5444,12 @@ msgstr ""
 "trueにすると,プレイヤー全員の移動フェーズは同時に発生します。falseにすると,"
 "プレイヤーはかわりばんこに移動します。"
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "クライアントの接続中断を待つ秒数"
 
 # ama, clefs
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5440,12 +5460,12 @@ msgstr ""
 "ます。"
 
 # clefs
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "ネットワークバッファを空にする最大秒数"
 
 # XXX clefs
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5455,11 +5475,11 @@ msgstr ""
 "るまでこのパラメータで指定した秒を最大待ちます。ゼロはサーバは全く待たないこ"
 "とを意味します。"
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "PING 間の秒数"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5467,21 +5487,21 @@ msgstr ""
 "civserver はここで指定した秒数経過するたびに, PING をクライアントに送りま"
 "す。"
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "クライアントを切断するまでの時間"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr "この時間以内にクライアントが PONG を返さなければ切断されます。"
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "ターンブロッキング・ゲームプレイモード"
 
 # 原文「0/1」だが、実際にはチェックボックス (clefs)
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5489,11 +5509,11 @@ msgstr ""
 "1 にしたら,全てのプレイヤーが自分のターンを終了するまでゲームターンは進みま"
 "せん。これには切断されたプレイヤーも含みます。"
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "固定長ターン・プレイモード"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5502,12 +5522,12 @@ msgstr ""
 "1 にしたら,プレイヤーが「ターン終了」を実行するかどうかに関係なく,タイムア"
 "ウトするまでゲームターンは進みません。"
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "人口統計報告の項目"
 
 # clefs
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5546,11 +5566,11 @@ msgstr ""
 "(これらの文字の順には意味がありませんが,大文字小文字の違いには意味がありま"
 "す。)"
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "自動保存の間隔"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5558,11 +5578,11 @@ msgstr ""
 "ゲームはここで指定したターンごとに自動的に保存されます。\n"
 "ゼロは自動保存しないことを意味します。"
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "セーブゲームの圧縮レベル"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5572,11 +5592,11 @@ msgstr ""
 "良い圧縮を生みますが,時間がかかります。最大値がゼロの時は,サーバは zlib を"
 "使うようにコンパイルされていません。"
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "自動保存の名前接頭辞"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5584,12 +5604,12 @@ msgstr ""
 "自動的に保存されるゲームは \"<接頭辞><年>.sav\" という名前になります。\n"
 "この変数は <接頭辞> の部分を設定します。"
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "プレイヤー統計のログを行うかどうか"
 
 # ama, clefs
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5602,7 +5622,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "サーバは標準入力を読むことができません。入力を無視しています。"
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "サーバ: 間違ったアドレス: [%s:%d]"
@@ -5750,116 +5770,116 @@ msgstr "%s という名前でゲームを保存失敗しました。"
 msgid "Game saved as %s"
 msgstr "%s という名前でゲームをセーブしました。"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "ゲームは既に始まっています。"
 
 # clefs
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%sはゲーム開始と同時にcontrolコマンドレベルを失いました。以後は投票システムを"
 "使用してください。"
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "ゲームを開始しています。"
 
 # clefs
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "不明な報告の要求です (タイプ %d)"
 
 # clefs
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "警告: 旧型のクライアント%sを拒否しました"
 
 # yasu
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "%d タイプのパケットを全滅または観察中のプレイヤーから受け取りました。"
 
 # yasu
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "空白ではない名前を選んで下さい。"
 
 # clefs
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "その民族は既に使われています。"
 
 # yasu, ama
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr ""
 "他のプレイヤーが既に'%s'という名前を選んでいます。他の名前を選んでください。"
 
 # yasu, clefs
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "ASCII文字だけで綴られた名前にしてください。"
 
 # clefs
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "このシナリオでは%sは選択できません。"
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "%sはもう他の誰かが選択しています。"
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%sは%sの支配者%sです。"
 
 # clefs
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "ゲームの開始待ち中――%2$d人のうち%1$d人は準備を完了しています。"
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s は%sレベルのAIプレイヤーとして加わりました。"
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "プレイヤー %d"
 
 # clefs
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%sは%sを統治します。"
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "メタサーバに情報を送っています [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "ゲームオーバーです!"
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "新しいクライアント接続を受け付けています。"
 
@@ -5882,7 +5902,7 @@ msgstr "(あいまい)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -6067,7 +6087,7 @@ msgid "Removed player %s from the game."
 msgstr "ゲームからプレイヤー %s を追い出しました。"
 
 # clefs
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "\"%s\" という名前はセキュリティ上の理由から許可されていません。"
@@ -6148,198 +6168,198 @@ msgstr ""
 "'%1$s' へコマンド利用権レベルを上げられません; あなたは利用権 '%2$s' しか持っ"
 "ていません。"
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "接続 %2$s のコマンド利用権レベルを '%1$s' に設定しました。"
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "接続 %2$s のコマンド利用権レベルを '%1$s' に設定できません。"
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "新規プレイヤーのコマンド利用権レベルを '%s' に設定しました。"
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "最初のプレイヤーが取得するコマンド利用権レベルを '%s' に設定しました。"
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 "サーバのコマンドラインで 'first' コマンドを利用しても意味がありません。"
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "既にコマンド利用権レベルは '%s' 以上です。"
 
 # clefs
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "他の誰かが既にゲーム主催者になっています。"
 
 # clefs
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "接続 %s がゲーム主催者になることを選択しました。"
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "無効な引数 %d"
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "使用法: timeoutincrease <ターン> <ターン増加> <値> <乗値>"
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "動的タイムアオウトを %d %d %d %d へセットします"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "オプション:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "説明:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "状態: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "変更可"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "固定"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "現在値: %d, 最小値: 0, 既定値: %d, 最大値: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "現在値: %d, 最小値: %d, 既定値: %d, 最大値: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "現在値: \"%s\", 既定値: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "以下に挙げるサーバオプションには,説明があります:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "その説明はまだありません。"
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "オプション名を省略し過ぎです。"
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "サーバオペレータ: %s"
 
 # clefs
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "プレイヤー '%s' は 手腕 '%s' のAIになりました。"
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s は AI で制御されていません。"
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "デフォルトの AI 手腕を '%s' に設定しました。"
 
 # clefs
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "このコマンドはクライアントでしか利用できません。"
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "使用法: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "プレイヤーのみがawayコマンドを利用できます。"
 
 # clefs
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%sは不在モードになりました。"
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%sがゲームに復帰しました。"
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "残念ながらオプション '%s' を閲覧する権限を持っていません。"
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "未知のオプション '%s'。"
 
 # ama, clefs
 # was "= は既定値のままのオプションを意味します。"
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "デフォルトから変更されている全てのオプション"
 
 # clefs
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "全てのオプション"
 
 # clefs
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "特に重要なオプション"
 
 # situationalってのはわかりにくいが、要は対戦の時にどれだけ意味を持つかによる
 # 分類のようです (clefs)
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "状況により必要になるオプション設定"
 
 # clefs
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "めったに使われないオプション"
 
 # ama, clefs
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ は変更可能なオプションを意味します。"
 
 # ama, clefs
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= は既定値のままのオプションを意味します。"
 
@@ -6348,21 +6368,21 @@ msgstr "= は既定値のままのオプションを意味します。"
 # /show: オプション 値      (最小,最大)    説明
 # /show: ----------------------------------------------------------------
 # /show: separatepoles +=1     (0,1)                 極地が大陸から離れて
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s 値      (最小,最大)    "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "オプション"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "説明"
 
 # clefs
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -6371,43 +6391,43 @@ msgstr ""
 "す。\n"
 "'show changed' で,変更されたオプションのみを表示します。"
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "一旦ゲームが始まるとチームを変更できません。"
 
 # clefs
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "定義されていない引数です。使用法: team <プレイヤー> [チーム]"
 
 # clefs
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr "%sというチームはありません。正しいチーム名か番号を入力してください。"
 
 # clefs
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "バーバリアン・プレイヤーとはチームを組めません。"
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "プレイヤー %s をチーム %s に加えました。"
 
 # clefs
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "定義されていない引数です。使用法: vote yes|no [投票番号]"
 
 # clefs
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "観察者は投票できません。"
 
 # clefs
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -6416,500 +6436,526 @@ msgstr ""
 "ら,'first' コマンドでゲーム主催者になってください。"
 
 # clefs
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "投票 %d \"%s\": 賛成 %d , 反対%d"
 
 # clefs
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "投票は行われていません。"
 
 # clefs
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "まだ有効な投票はありません。"
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "値は整数でなければなりません。"
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "そのような投票はありません (%d)。"
 
 # clefs
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "\"%s\" に賛成票を投じました。"
 
 # clefs
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "\"%s\" に反対票を投じました。"
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "このコマンドはゲーム開始後にのみ使用できます。"
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "値2・3は整数でなければなりません。"
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr ""
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr ""
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr ""
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr ""
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "値2は整数でなければなりません。"
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr ""
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "不明な引数です。使用法: set <オプション名> <値>"
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "このオプションの設定を許可されていません。"
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "ゲームが開始された後,この設定を変更できません。"
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "値は整数でなければなりません。"
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "範囲外の値です (最小値: 0, 最大値: 1)"
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "オプション: %s は %d に設定されました。"
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "範囲外の値です (最小値: %d, 最大値: %d)"
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "文字列の値が長すぎます。使用法: set <オプション> <値>"
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "オプション: %s は \"%s\" に設定されました。"
 
 # clefs
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "残念ながらこのゲームではゲーム全体の観察を認めていません。"
 
 # clefs
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr "残念ながら全体の観察者をtakeすることはできません。observeしましょう。"
 
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "残念ながらこのゲームでは人間モードプレイヤーへの再接続はできません。"
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
 # clefs
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "残念ながらこのゲームではバーバリアンの観察はできません。"
 
 # clefs
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "残念ながらこのゲームではバーバリアンの操作はできません。"
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "残念ながらこのゲームでは死んだプレイヤーの観察はできません。"
 
 # clefs
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "残念ながらこのゲームでは死んだプレイヤーの操作はできません。"
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "残念ながらこのゲームでは AI プレイヤーの観察はできません。"
 
 # clefs
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "残念ながらこのゲームでは AI プレイヤーの操作はできません。"
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "残念ながらこのゲームでは人間モードプレイヤーの観察はできません。"
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "残念ながらこのゲームでは人間モードプレイヤーへの再接続はできません。"
 
 # clefs
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "残念ながらこのゲームでは観察を認めていません。"
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "残念ながらこのゲームでは新しいプレイヤーの参加を認めていません。"
 
 # clefs
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "残念ながらこのゲームでは接続済のプレイヤーの乗っ取りを認めていません。"
 
 # clefs
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "使用法: observe [接続名 [プレイヤー名]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "使用法: observe [プレイヤー名]"
 
 # clefs XXX
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%sが既に%sを操作しています。'observe'で%sを除去します"
 
 # clefs
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%sが既に%sを観察しています。"
 
 # clefs
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%sは既に観察しています。"
 
 # clefs
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s が %s を観察しています"
 
 # clefs
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s は観察しています"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "使用法: take <接続名> <プレイヤー名>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "使用法: take <プレイヤー名>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "使用法: take [接続名] <プレイヤー名>"
 
 # clefs
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%sが既に%sを操作しています"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "%s という名前のプレイヤーもしくは接続はありません。"
 
 # clefs
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "%sの操作を放棄します。"
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s は %s を操作します(%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "バーバリアン"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "AI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "人間"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "活躍中"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "死亡"
 
 # clefs
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%sは誰からも操作されていません。"
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "使用法: detach <接続名>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "他のユーザはdetachできません。"
 
 # clefs
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%sは誰からも操作されていません。"
 
 # clefs
 # detachのうまい訳語ないかなあ
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%sは%sを放棄しています"
 
 # clefs
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%sはもう観察していません。"
 
 # clefs
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "%sを放棄しています。"
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "使用法: load <ゲーム名>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "他のゲームの実行中はゲームをロードできません。"
 
 # clefs
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "\"%s\"というセーブゲームもシナリオも見当たりません。"
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "セーブファイルをロードできません: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "現在のルールセット=ディレクトリは: \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "ルールセット=ディレクトリ \"%s\" が見つかりません"
 
 # clefs
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "ルールセット=ディレクトリは既に \"%s\" です"
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "ルールセット=ディレクトリを \"%s\" にセットします"
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "さようなら。"
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "残念ですがサーバコマンドを使うことを許可されていません。"
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "警告: '%1$s' は '%2$s' と解釈されましたが,'%1$s' は一意ではありません。'%3"
 "$shelp' と打って下さい。"
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "不明なコマンドです。'%shelp'を見て下さい。"
 
 # clefs
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "再投票したので,前回の票は無効になります。"
 
 # clefs
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "%2$sによる新たな投票(番号%1$d): %3$s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "そのコマンドを利用できません。"
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(サーバ・プロンプト)"
 
 # clefs
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "ゲームは引き分けで終了しました。"
 
 # clefs
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "ゲームを終了しています。全てのクライアントが切断し次第,サーバは再起動しま"
 "す。"
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "ゲームを終了できません: ゲームは始まっていません。"
 
 # clefs
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%sは敗北宣言したのでもう勝利者になることはできません。"
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "今は降参できません。"
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
+msgstr "十分なプレイヤーがいないので,ゲームを開始できません。"
+
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
 msgstr "十分なプレイヤーがいないので,ゲームを開始できません。"
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "十分なプレイヤーがいないので,ゲームを開始できません。"
 
 # clefs
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "全員準備が整いました。ゲームを開始します。"
 
 # clefs
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "ゲームを開始できません: ゲームは全てのクライアントが接続を切るのを待っていま"
 "す。"
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "ゲームを開始できません: 既にゲームは始まっています。"
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "%sとの接続を切りました。"
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6947,124 +6993,124 @@ msgstr ""
 "  save   -  現在のゲームを保存します。\n"
 "  quit   -  終了します。"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "コマンド:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "意味: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "レベル: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "以下のサーバコマンドが利用できます:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "ヘルプ引数 '%s' は省略しすぎです。"
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "ヘルプ引数 '%s' は理解できません。"
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "list の引数 '%s' は間違っています。 '%shelp list' を試みて下さい。"
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "プレイヤーのリスト:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<なし>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "ユーザ名 %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", 死亡"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", 難易度レベル %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
 # clefs
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", 準備完了"
 
 # clefs
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", 準備中"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d接続:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s (%s から, コマンド利用権レベル %s), bufsize=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (観察者モード)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "チームのリスト:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
 # clefs
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "空のチーム: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "サーバへの接続のリスト:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<接続なし>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "利用可能なシナリオ一覧:"
 
@@ -7138,18 +7184,18 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "科学の目標は%sです。"
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "%2$sから%1$sを盗みます。"
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%sはあなたから%sを盗みました!"
 
 # yasu, ama
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%1$sは%3$sから%2$sを盗みました。"
@@ -7689,21 +7735,21 @@ msgid "Your %s has invalid orders."
 msgstr "%sには無効な命令が与えられています。"
 
 # clefs
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "広大な土地です - 少し時間がかかるかもしれません。"
 
 # Daniel
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Generator %d を試みます。"
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Generator 3 は大きな島のいくつかを配置できません。"
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Generator 3 は配置しなかった%liの島を残しました。"
@@ -7799,128 +7845,129 @@ msgstr "設定かパーミションに何か間違いはありませんか?"
 msgid "Cannot find audio file %s"
 msgstr "オーディオフィアル %s が見つかりません。"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX ターン"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "ターン毎に金 %3d"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d ターン"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "なし"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/ターン"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d ターン"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "古い"
 
 # clefs
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "建築済"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "不思議"
 
 # 宮殿とか。どういう意味合いなんでしょう (clefs)
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "ちょっとした不思議"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/ターン"
 
 # clefs
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : 市民\n"
 
 # clefs
 # `Taxed' は税金とは限らない。租庸調みたいな感じ。
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : 交易からの徴収\n"
 
 # clefs
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : %sとの交易路\n"
 
 # clefs
 # 都市一覧での「選択」メニュー
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : 建造物からの十分の一税\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : %s からのボーナス (%+d%%)\n"
 
 # clefs
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : 浪費\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : æ··ä¹±\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : 消費\n"
 
 # 下に`total'とあるからこの部分は日本語では意味がない (clefs)
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : 剰余総計"
@@ -8036,8 +8083,8 @@ msgid "Best defending units"
 msgstr "防御に最も適した部隊"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -8210,8 +8257,8 @@ msgid "?cma:Governor"
 msgstr ""
 
 # 以前CMAと呼んでいたやつ。どう訳したものか (clefs)
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -8492,19 +8539,19 @@ msgstr ""
 "サーバ \"%s\"(ポート %d, ユーザ \"%s\")へ %f 秒毎に %d 回まで自動接続を試みて"
 "います。"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "初心者用"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "簡単"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "普通"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "難しい"
 
@@ -8513,38 +8560,38 @@ msgid "experimental"
 msgstr "実験的"
 
 # clefs
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "サーバを起動しています……"
 
 # clefs
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "サーバを起動できませんでした。"
 
 # clefs
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "申し訳ありませんが,手動で起動してください。"
 
 # clefs
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "サーバと接続できませんでした。"
 
 # clefs
 # サーバをローカルで起動したはずなのに接続できなかったときのメッセージ
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "ここからだと起動できないのかもしれません。"
 
 # clefs
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "我々がサーバを制御しています(コマンドレベルで操作できます)"
 
 # clefs
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "サーバを制御できないので,killしてみます。"
 
@@ -8643,7 +8690,7 @@ msgstr "最低でも大きさ %d が必要です。\n"
 
 # clefs
 # 建造物
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "%s を建設可能にします。"
@@ -8651,22 +8698,22 @@ msgstr "%s を建設可能にします。"
 # clefs
 # XXX "大学 を建設可能にします(大学も必要です)。" 施設/技術
 # "with %s" は「海」とかかもしれないので「技術」と決め打ちもできない
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "%s を建設可能にします(%sも必要です)。"
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " 川"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "すみません。%sのヘルプトピックはありません。\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8678,7 +8725,7 @@ msgstr ""
 "\n"
 
 # Daniel
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
@@ -8687,83 +8734,83 @@ msgstr ""
 "\n"
 
 # Daniel
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* %sが発見されると%sは古くなります。\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "%sを知っている全てのプレイヤーが%sを作れるようになります。\n"
 
 # clefs
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* %s を可能にします(%s も必要です)。\n"
 
 # clefs
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* %s を可能にします。\n"
 
 # Daniel
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* 都市に%sのある時だけ作れます。\n"
 
 # clefs
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* 政治体制%sの時だけ作れます。\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* 都市で作られることはありません。\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* 所属の都市を持ちません。\n"
 
 # clefs
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* このユニットを失うとゲームは負けになります!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* このユニットは各プレイヤーにつき1つしか持つことができません。\n"
 
 # clefs
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* 生産するには人口%dが必要です。\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* %dの航空部隊を運搬・給油できます。\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* %dのミサイルを運搬,給油できます。\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* 海を渡って%d地上部隊を輸送できます。\n"
 
 # clefs XXX
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8771,178 +8818,178 @@ msgstr ""
 "* 交易路を確立できます(本拠地から最低9タイル離れた都市まで行かねばなりません"
 "[距離はグリッド(x+y)で計算します])。\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* 不思議建築を手伝うことができます(生産物%dを加えます)。\n"
 
 # ntaka これでいいとは思うが
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* 解散することはありません。\n"
 
 # clefs
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr "* 都市で解散させると生産コストの50%%を再利用できます。\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* 新しい都市を作ることができます。\n"
 
 # clefs XXX
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "*%2$d以下の規模の都市に%1$dの人口を加えることができます。\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* 道路や鉄道を作ることができます。\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* タイル上で資源化することができます。\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* タイル上で灌漑を行うことができます。\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* 農地を作ることができます。\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* 農地を作ることができます(%sが発見されていれば)。\n"
 
 # clefs
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* 農場を作れます (もし以下のものが知られていれば: %s)。\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* 要塞を作ることができます。\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* 要塞を作ることができます(%sが発見されていれば)。\n"
 
 # clefs
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 "* 要塞を作ることができます(以下のうちいずれかが発見されていれば: %s)。\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* タイル上の汚染を除去することができます。\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* タイル上の死の灰を除去することができます。\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* 地形を変えることができます。\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* 飛行場を作ることができます。\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* 防御態勢をとると,50%% 防御力が増加します。\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* 略奪によりタイル上のインフラを破壊することができます。\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* 外交行為を行え,さらに特別なスパイ能力を持ちます。\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* 外交行為を行えます。\n"
 
 # いまいち (clefs)
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* ユニット間の外交戦で敗れることはありません。\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* 買収されることはありません。\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* 敵の飛行部隊に攻撃できます。\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* 隣りに敵部隊や都市がない限り不可視。\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* 海上にいる部隊にのみ攻撃できます。(地上攻撃不可)\n"
 
 # ama, yasu
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr "* 船上から敵都市や陸上のタイルを攻撃できます。\n"
 
 # yasu, ama
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* 友好都市から落下傘降下できます。(範囲: %d)\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* 「乗馬している」部隊に対して2倍の防御力があります。\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* 「乗馬している」と扱われます。\n"
 
 # yasu, ama, clefs
 # ミサイル
 # was "  * 攻撃開始時に使い切ります。\n"
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "  * ミサイル部隊:攻撃を実行すると消滅します。\n"
 
 # ama, clefs
 # (修正前)msgstr "* ターンの終わりに攻撃します。\n"
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* 攻撃するとそのターンはそれ以上行動できません。\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* この部隊の攻撃は核爆発を引き起こします!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* 都市を攻撃するときは火力が2倍になります。\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* 城壁の効果を無視します。\n"
 
 # clefs
 # 未実装のfeatureなのかな
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8951,35 +8998,35 @@ msgstr ""
 "* 爆撃できます(1ターンに%d回)。爆撃は防御側にダメージを与えるだけ(で,抹殺は"
 "できません)が,攻撃側には全く危険がありません。\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* ミサイルと飛行機に対して5倍の防御力を発揮します。\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* 地形効果を無視します(全ての土地を道路とみなします)。\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* ゾーンコントロールを無視します。\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* 非戦闘部隊です。(攻撃できません。戒厳令は適用されません。)\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "* フィールド部隊です。積極的に戦闘しなくても不幸市民が1生まれます。\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* ベテランになることはありません。\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* 訓練か戦闘を通じてベテランになることができます。\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8989,13 +9036,13 @@ msgstr ""
 "あります。\n"
 
 # clefs
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* %sを発見すると難破の確率は25%%になります。\n"
 
 # clefs
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %sを発見すると難破の確率は12%%になります。\n"
@@ -9004,26 +9051,26 @@ msgstr "* %sを発見すると難破の確率は12%%になります。\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr "か"
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "か"
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* %2$dターン過ぎたら部隊は都市か%1$sにいなければなりません。\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "今%sを開始したら,%d単位必要です。"
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -9033,94 +9080,94 @@ msgstr ""
 "らせるには,%d単位必要です。"
 
 # clefs
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "この技術は研究できません。"
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 " この数は他のプレイヤーが研究している物によっては異なることがあります。\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr "* 最初に%sを発見したプレイヤーは,即座にもう1つ科学を得ます。\n"
 
 # clefs
 # triremeのことだが、boatはboatとして訳しておきましょう
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* 外海で小舟が難破する確率を25%%に抑えます。\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* 外海で小舟が難破する確率を12%%に抑えます。\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* 人口によって引き起こされる公害を増やします。\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* %sで川の上に道路を作れるようになります。\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* %sで要塞を作れるようになります。\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* %sで飛行場を作れるようになります。\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* %sで道路を鉄道へアップグレードできるようになります。\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* %sで灌漑を農地へアップグレードできるようになります。\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* この地形には公害は発生しません。"
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* この地形に都市は建設できません。"
 
 # clefs
 # まだ存在しないが,将来導入されるらしい
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* この地形の海岸線は危険です。"
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* この地形での部隊の移動は危険です。"
 
 # clefs
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* 陸上部隊は海洋地形の上には移動できません。"
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -9132,7 +9179,7 @@ msgstr[0] ""
 "本拠地を離れた軍事部隊,および全てのフィールド部隊は%d市民を不幸にします。\n"
 
 # clefs
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -9142,26 +9189,26 @@ msgstr ""
 
 # clefs
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* 部隊維持に必要な%2$sは通常の%1$d倍になります。\n"
 
 # clefs
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* 部隊維持コストは通常の%d倍になります。\n"
 
 # Daniel
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* 部隊維持に%sの必要はありません。\n"
 
 # Daniel
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* 部隊維持コストはありません。\n"
 
@@ -9169,7 +9216,7 @@ msgstr "* 部隊維持コストはありません。\n"
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr "* 各都市で,%d%sまでの部隊維持コストは免除されます。\n"
@@ -9177,13 +9224,13 @@ msgstr "* 各都市で,%d%sまでの部隊維持コストは免除されます
 # clefs
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr "* 各都市で,%dまでの部隊維持コストは免除されます。\n"
 
 # clefs
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "* 首都を失った場合,%d%%の確率で内戦になります。\n"
@@ -9191,7 +9238,7 @@ msgstr "* 首都を失った場合,%d%%の確率で内戦になります。\n"
 # clefs
 # XXX
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -9202,7 +9249,7 @@ msgstr ""
 
 # clefs
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -9212,18 +9259,18 @@ msgstr ""
 "出現します。\n"
 
 # clefs
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr "科学/現金/贅沢の比率は最大%d%%までです。\n"
 
 # clefs
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "科学/現金/贅沢の比率に制限はありません。\n"
 
 # clefs
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, fuzzy, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -9236,7 +9283,7 @@ msgstr[0] ""
 "制的に満足状態にします。\n"
 
 # clefs
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, fuzzy, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -9244,7 +9291,7 @@ msgstr[0] "* 1つの都市につき最大%dの部隊で戒厳令を強いるこ
 
 # clefs
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -9254,18 +9301,18 @@ msgstr ""
 "上でなければなりません。\n"
 
 # clefs
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* あなたの部隊は買収を受け付けません。\n"
 
 # clefs
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* あなたの都市は煽動を受け付けません。\n"
 
 # clefs
 # 「政府は無政府」いやん
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -9273,48 +9320,48 @@ msgstr ""
 "* 1つの都市が2ターン以上続けて混乱すると,政府は無政府状態に陥ります。\n"
 
 # clefs
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* 上院が内戦の宣戦を防ぎ止めてくれるかもしれません。\n"
 
 # clefs
 # やや意訳
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr "* 都市が敵に占領された際にパルチザンの蜂起があるかもしれません。\n"
 
 # clefs
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr "* 通常では不幸対策となる建造物はかわりに現金をもたらします。\n"
 
 # clefs
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* 熱狂兵の維持にコストがかかりません。\n"
 
 # clefs
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* 不幸な市民は存在しません。\n"
 
 # clefs
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* %s部隊は全てベテランになります。\n"
 
 # clefs
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* 部隊は全てベテランになります。\n"
 
 # clefs
 # XXX %sが"all"だとヘボいことに
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -9325,7 +9372,7 @@ msgstr ""
 
 # clefs
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -9336,7 +9383,7 @@ msgstr ""
 
 # clefs
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
@@ -9345,7 +9392,7 @@ msgstr ""
 
 # Daniel
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* %sの生産は%d%%増やします。\n"
@@ -9353,64 +9400,64 @@ msgstr "* %sの生産は%d%%増やします。\n"
 # clefs
 # 「交易の生産」とかになってしまうのだけれど、まあ仕方ないか
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* %sの生産は相当量が浪費されます。\n"
 
 # clefs
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* %sの生産は多少浪費されます。\n"
 
 # clefs
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* %sの生産は若干量が浪費されます。\n"
 
 # clefs
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* %sの浪費は首都から少し離れると急激に多くなります。\n"
 
 # clefs
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* %sの浪費は首都から離れるにつれ多くなります。\n"
 
 # clefs
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr "* %sの浪費は首都から離れるにつれ少しずつ多くなります。\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* %sを作れるようになります。\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr ""
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d 不幸"
@@ -9900,16 +9947,16 @@ msgstr "サーバの機能: %s"
 msgid "Start of turn %d"
 msgstr "ターン%d の開始"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "AI モードは%sです。"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "オン"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "オフ"
 
@@ -9942,13 +9989,13 @@ msgstr "?Player:名"
 msgid "Username"
 msgstr "ユーザ名"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "æ——"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9963,7 +10010,7 @@ msgstr "国境線"
 msgid "Score"
 msgstr "スコア"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "チーム"
 
@@ -9999,37 +10046,37 @@ msgid "Ping"
 msgstr "Ping"
 
 # このあたりは、人様の都市で出るメッセージなのかな (clefs)
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "建造物の売却はできません。"
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "%dの%sを金%dで売りました"
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "%sは全く売却できませんでした。"
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "部隊の解散はできません。"
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%sは解散させられません。"
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "%dの%sを解散しました。"
 
 # XXX 要チェック (clefs)
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "%sは解散させられませんでした。"
@@ -10348,133 +10395,138 @@ msgstr "金: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "税: %d 贅沢: %d 科学: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "移動中: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "移動中: %s"
 
 # clefs
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(クリックで詳細表示)"
 
 # clefs
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "人口: %s 人"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "ターン: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "金: %d"
 
 # clefs
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "収支: %d"
 
 # Daniel
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "税率: 金:%d%% 贅沢:%d%% 科学:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "研究中 %s: %s"
 
 # clefs
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "地球温暖化の発生確率: %d%% (%+d%%/ターン)"
 
 # clefs
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "核の冬の発生確率: %d%% (%+d%%/ターン)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "政治体制: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
 msgstr[0] "%d 部隊"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
 # clefs
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "目的地までのターン数: %d"
 
 # clefs
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "目的地までのターン数: %d から %d"
 
 # clefs
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d部隊が選択されています"
 
 # clefs
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "部隊が選択されていません"
 
 # clefs
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "その他: %d 民間人; %d 軍人"
 
 # clefs
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "その他: %d 民間人"
 
 # clefs
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "その他: %d 軍人"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "アップグレードされる部隊がいません。"
 
 # clefs
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "アップグレードできる部隊がいません。"
 
 # clefs
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -10487,178 +10539,178 @@ msgstr[0] ""
 "現在の資金は%dです。"
 
 # ntaka
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "現在研究中の科学の進行度"
 
 # clefs
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "研究目標なし"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
 # ntaka
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "地球温暖化の進行度:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "公害レート:   %d"
 
 # clefs
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "各ターンに壊滅的な温暖化が発生する確率: %d%%"
 
 # ntaka
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "核の冬の進行度:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "灰降下レート: %d%%"
 
 # clefs
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "各ターンに壊滅的な核の冬が発生する確率: %d%%"
 
 # ntaka
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "現在の政治体制:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "人口:            %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "サポート:        %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "燃料:            %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
 msgstr[0] "質量:            %5d トン"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "旅行時間:        %5.1f 年"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "旅行時間:           適用不可"
 
 # clefs
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "成功確率:        %5d %%"
 
 # clefs
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "到着予定年:      %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "無限"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "%02d秒"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "%02d分%02d秒"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "%02d時間%02d分"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "%02d日%02d時間"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "オーバーフロー"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr ""
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%sの%s"
 
 # Daniel
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "観察者: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "建造物: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "なし"
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "?clistend:"
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "不思議: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "都市: 合計%1$d, %3$dのしきい値を越える%2$d都市。"
 
 # 超訳 (clefs)
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10667,43 +10719,43 @@ msgstr[0] "%d番目の市民までは最初から基本的に満足していま
 # clefs
 # 都市の総数が増えるとペナルティが課せられます
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
 msgstr[0] "うち%dの市民はペナルティで不幸になります。"
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "戒厳令が有効("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "限度なし,"
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
 msgstr[0] "最大%d部隊"
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "部隊につき%d)"
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "戦場の軍事部隊は不幸の原因になるかもしれません。"
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "軍事部隊は幸福に影響を与えません。"
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "贅沢: 合計 %d"
@@ -10756,12 +10808,12 @@ msgstr ""
 "citizen governorは %s の扱いに混乱してしまいました。チェックしてみた方が良い"
 "でしょう。"
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "なし"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "自在"
 
@@ -10825,11 +10877,13 @@ msgstr "あれれれれ……"
 
 # clefs
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "この部隊は買収できません!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10847,6 +10901,7 @@ msgstr "敵部隊に賄賂を贈る"
 # clefs
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10887,6 +10942,7 @@ msgstr "科学(_A)"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "スパイに任せる"
 
@@ -10911,13 +10967,14 @@ msgstr "建造物(_I)"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "都市の生産物"
 
 # clefs
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "%sでは叛乱は煽動できません。"
@@ -10930,6 +10987,7 @@ msgstr "煽動できない都市です!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10946,6 +11004,7 @@ msgstr "叛乱を煽る!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10955,6 +11014,7 @@ msgstr ""
 "現在の資金は%dです。"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -11025,11 +11085,13 @@ msgid "Subvert Enemy Unit"
 msgstr "敵部隊への工作"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "外交官はあなたのコマンドを待っています"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "スパイはあなたのコマンドを待っています"
@@ -11130,7 +11192,7 @@ msgstr "公害:"
 msgid "_Overview"
 msgstr "概観(_O)"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -11156,11 +11218,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d ターン"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "買う(_B)"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "生産物(_P)"
@@ -11282,7 +11344,7 @@ msgstr "援助されている部隊: %d"
 msgid "Present units %d"
 msgstr "都市にいる部隊: %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "中心へ(_T)"
 
@@ -11373,36 +11435,36 @@ msgstr "都市名の変更"
 msgid "What should we rename the city to?"
 msgstr "新しい都市名を何と名づけますか?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "変更(_G)"
 
 # ntaka
 # 当初、作業リストの、と書いていたが、長いので省略。
 # 元の英語自体省略してあるし。
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "先頭に加える(_F)"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "次の項目として加える(_N)"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "最後に加える(_L)"
 
 # ntaka
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "都市の選択(_S)"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "表示設定(_D)..."
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -11412,13 +11474,13 @@ msgstr "表示設定(_D)..."
 msgid "Cities"
 msgstr "都市"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "ポップ(_I)"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -11427,88 +11489,93 @@ msgstr "ポップ(_I)"
 msgid "Improvements"
 msgstr "建造物"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "不思議"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "全ての都市"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "どれも選択しない"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "反転する"
 
 # clefs
 # 都市一覧での「選択」メニュー
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "部隊を建造中"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "建造物を建築中"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "不思議を建築中"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "部隊を建造中"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "建造物を建築中"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "不思議を建築中"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "沿岸都市"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "同じ島"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "援助されている部隊"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "都市にいる部隊"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "都市の建造物"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "都市の不思議"
 
 # clefs
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "建造できる部隊"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "建設できる建造物"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "建設できる不思議"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "合計経費: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -11574,131 +11641,131 @@ msgstr "新しいプリセットを何と名づけますか?"
 msgid "Remove this preset?"
 msgstr "このプリセットを削除していいですか?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "現場へ移動(_L)"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "都市をポップアップ(_C)"
 
 # XXX J.Lennonのもじりだが…
 # 「カクメイしたいんだって?」
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "革命を宣言しますか?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "革命!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "略奪の対象"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "略奪対象を選択:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "部隊"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "名前"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "部隊の選択"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "全準備(_R)"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "手空き部隊を見張り番へ(_S)"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "民族(_G):"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "あなたがなりたい民族は?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "民族選択"
 
 # clefs
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "ランダムな民族 (_R)"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "民族の選択"
 
 # ntaka 属性より分かり易く設定とすべきか?
 # clefs 民族のpropertiesという文脈ですからねえ。属性のままにしておきましょ
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "指導者(_L):"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "女(_F)"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "ç”·(_M)"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "都市スタイル(_S):"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "伝説(_D)"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "性別を選択して下さい。"
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "都市スタイルをを選択して下さい。"
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "適切な名前を入力して下さい。"
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "新型にする"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11974,66 +12041,72 @@ msgstr ""
 msgid "Not _ready"
 msgstr "準備中(_R)"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "準備完了(_R)"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "開始(_S)"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "プレイヤー(_P)"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "民族を選択する(_N)"
 
 # Daniel
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "観察する(_O)"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "観察を取り止める(_O)"
 
 # 訳さない方がわかりやすい場合もあるものです (clefs)
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "ランダム"
 
 # Daniel
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "観察者"
 
 # clefs XXX
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "未割当"
 
 # Daniel
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "ゲームを終了してよろしいですか?"
 
@@ -12978,244 +13051,244 @@ msgid "Connect to Gaming _Zone"
 msgstr "Gaming _Zoneへ接続"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "パスワードが一致しません。パスワードを入力してください。"
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "サーバ名"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "ポート"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "バージョン"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "状態"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "プレイヤー"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "コメント"
 
 # ntaka, Daniel
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "L_AN"
 
 # Daniel
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "メタサーバ(_M)"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "ホスト(_H):"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "ポート(_P):"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "ログイン(_L):"
 
 # Daniel
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "パスワード(_W):"
 
 # Daniel
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "パスワードの確認(_I):"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "接続(_O)"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "接続名: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "プレイヤー名: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "ホスト: %s"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "プレイヤー/接続情報"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s情報"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "プレイヤーの準備状態をトグル"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "民族選択"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "このプレイヤーを観察する"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "このプレイヤーを操作する"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "接続切断"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "プレイヤーのAI状態を切り替える"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "プレイヤー除去"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "infoレベルのアクセスを与える"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "ctrlレベルのアクセスを与える"
 
 # clefs
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "%s に加える"
 
 # Daniel
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "プレイヤーの数(AIも含む)(_P):"
 
 # Daniel
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "_AIのレベル:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "ルールセット(_V):"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "詳細なゲーム設定..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "記録"
 
 # まだ使われていない関数なのかな
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "レーティング"
 
 # clefs
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "準備完了"
 
 # Daniel
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "指揮"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "ロードするセーブファイルを選択"
 
 # Daniel
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "ロードするセーブファイルを選択(_L):"
 
 # Daniel
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "ブラウズ(_B)..."
 
 # Daniel
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "ロードするシナリオを選択"
 
 # Daniel
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "シナリオを選択(_S):"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "タイプ"
 
 # Daniel
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "なりたい民族を選択してください(_N):"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "保存先を選択してください"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "ゲーム保存"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "保存されたゲーム(_G):"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "保存するファイル名:"
 
@@ -13253,7 +13326,7 @@ msgstr "æ•°"
 # was "経費"
 # ユニットの作成コストも"Cost"なので不都合もあるが如何ともしがたい。
 # いっそ「コスト」にしてしまう方がいいのかな? (clefs)
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -13509,30 +13582,30 @@ msgstr "作業リスト(_W):"
 msgid "Edit Global _Worklists"
 msgstr "グローバル作業リストを編集(_W)"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "ターン"
 
 # "タスクを読み込む(_T):"
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "タスク候補(_T):"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "全表示(_F)"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "作業リスト(_W):"
 
 # clefs
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "グローバル作業リストから追加(_A)"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "生産物の変更(_G)"
 
@@ -13831,8 +13904,8 @@ msgid "City shrinks: %d %s"
 msgstr "都市拡大:"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13938,11 +14011,11 @@ msgstr "ゲーム: 報告"
 msgid "Maintenance Report"
 msgstr "科学報告"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "作業リスト"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -14367,21 +14440,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -15688,7 +15761,7 @@ msgstr "都市スタイル:"
 msgid "Unit Selection"
 msgstr "部隊の選択"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "なし"
 
@@ -29014,9 +29087,6 @@ msgstr "チーム31"
 #~ msgid "_Auto Attack"
 #~ msgstr "自動攻撃(_A)"
 
-#~ msgid "_Player"
-#~ msgstr "プレイヤー(_P)"
-
 #~ msgid "City _Overview"
 #~ msgstr "概観(_O)"
 
diff --git a/po/ko.gmo b/po/ko.gmo
index 7e47022..80e2ae7 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index c13086f..354f930 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-12-10 21:13+0900\n"
 "Last-Translator: Daniel\n"
 "Language-Team: Korean language team\n"
@@ -48,22 +48,22 @@ msgstr "복지"
 msgid "Science"
 msgstr "과학"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?건설:건"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?볼가사의:불"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?폐기:폐"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?건설:건"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?볼가사의:불"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -482,81 +482,81 @@ msgstr "연결/미연결 메세지"
 msgid "AI Debug messages"
 msgstr "AI 디버그 메세지"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "대량 살육"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "증오"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "적대"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "비협조"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "불안"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "중립"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "공손"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "도움"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "ì—´ê´‘"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "찬미"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "숭배"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "휴전"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "전쟁"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "ì •ì „"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "평화"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "동맹"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "미접촉"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "팀"
 
@@ -602,13 +602,13 @@ msgstr "%s 부대"
 msgid "Size %d"
 msgstr "크기 %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "미래기술 %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -620,65 +620,65 @@ msgstr "미래기술 %d"
 msgid "None"
 msgstr "없음"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "미래기술"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(불명)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "도로"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "관개"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "철도"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "관갱"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "공해"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "움막"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "요새"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "ê°•"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "농지"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "공군 기지"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "방사능 낙진"
 
@@ -784,11 +784,11 @@ msgstr "핵병기"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " 그리고 "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr ", "
 
@@ -948,79 +948,79 @@ msgid_plural " (total %d repeats)"
 msgstr[0] "(전체 %d번 반복)"
 msgstr[1] "(전체 %d번 반복)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "\"%s\" 비어있는 인수.\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "\"%s\" 놓친 인수.\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d 기원전"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d 기원후"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH는 배치되 있지만 비어있습니다; 대신 기본경로로 사용합니다"
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "디렉토리 %s에서 데이터를 읽을 수 없습니다: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "데이터 경로는 변경할수 있는 FREECIV_PATH환경을 통해 세팅할수 있습니다."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "현재 데이터 경로는 : \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr " \"%s\"이 요구됩니다... 거부!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s:치명적 에러: 당신은 관리자되려고 시도하려고 했습니다!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "일반계정을 대신 사용하세요\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "정확한 맞음(match)"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "오직 경기"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "애매모한"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "비어있음"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "너무 깁니다"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "맞지 않습니다"
 
@@ -1049,91 +1049,91 @@ msgstr ""
 msgid "%s is selling %s (not needed) for %d."
 msgstr ""
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (AI)* 난 아직 동맹을 할만큼 당신을 신뢰할수 없소, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s(AI)*당신이 언급하는 그 도시는 난 모릅니다"
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (AI)* 미안하지만 시야를  공유하는 건 안전하지 않소."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (AI)* 이 거래는 우리에게 유익하지 않소, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* 우리 동맹국으로 들어온걸 환영하오 %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* 그렇소, 아마 우리는 영원한 연합체로 설 것이오, %s"
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* 맞소, 평화는 우리의 시간이오"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)* 동의하오. 더의상의 적의는 없소, %s"
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr "*%s (AI)* 환영합니다 %s! 서로를 더 알아가는 동안 우리 휴전은 어떻소?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* 우주는 결코 당신의 것이 될수 없어"
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr "*%s (AI)* 나는 당신의 기괴한 사악함은 충분이 묵과했소! 전쟁이다!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (AI)* 평화는....다음에."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1142,17 +1142,17 @@ msgstr ""
 "*%s (AI)* 마침내 당신 주변에 왔소! 정말 당신은 당신의 범죄들로부터멀어질수 있"
 "소?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (AI)*당신의 사악함으로의 전향은 이 전쟁을 불러왔소!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)* %s에 향한 당신의 공격성은 당신의 마지막 실수였소!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1163,14 +1163,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1183,7 +1183,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1194,13 +1194,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1211,12 +1211,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1227,7 +1227,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1238,47 +1238,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
 "intentions, and I will have no more of our alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr ""
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
 "our enemy, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
 "s. Why do I need to remind you of your promises?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1286,26 +1286,26 @@ msgid ""
 "more!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
 "cessation of hostilities?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1313,59 +1313,64 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, c-format
 msgid "Auth option \"%s\":"
 msgstr "권한이 있는 옵션 \"%s\":"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr "설정파일이 없습니다(기본값을 사용합니다)"
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr " (기본값)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr " (편집)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr " (배치)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "권한이있는 편집화일이름 \"%s\"는 허용되지 않습니다!"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "권한있는 편집화일 \"%s\"는 읽을 수 없습니다!"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 "경고 :  '%s'  이름의 손님이름은 이미 있습니다, 사용자  '%s'의 이름을 다시 이"
 "름바꾸세요."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "죄송하지만 손님은 이곳 서버에서 허용하지 않습니다"
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s는 거부당했습니다:손님은 허용되지 않습니다"
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1373,7 +1378,7 @@ msgid ""
 msgstr ""
 "손님 %s로 로그인하여 사용자 데이터베이스를 읽는 도중 에러가 발생했습니다."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1381,41 +1386,41 @@ msgstr ""
 "사용자 데이터베이스를 읽는도중 에러가 발생하고 손님로그인이 허용되지 않습니"
 "다. 죄송합니다"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 "%s는 거부당했습니다 : 데이터베이스 오류, 그리고 손님은 허용되지 않습니다"
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "%s에 대한 암호를 입력하세요:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "새로운 암호를 입력하세요(그리고 기억해두세요)"
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "이 서버는 오직 미리등록한 사용자에게만 허용합니다. 미안합니다"
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s는 거부되었습니다 : 오직 미리등록사용자에게만 허용됩니다."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "미안하지만 잘못된 시도를 너무 많이 하셨습니다"
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 "%s 는 거부당했습니다: 새로운 사용자를 위한 암호검증횟수가 너무 많습니다"
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1423,30 +1428,30 @@ msgstr ""
 "경고: 데이터베이스에 저장하는데 에러가 발생하였습니다. 진행되지만 저장되지 않"
 "습니다."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s번 거부되었습니다: 너무 많은 비밀번호시도를 했습니다"
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "당신의 암호는 정확하지 않습니다. 다시 시도하세요."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "죄송하지만 당신의 연결 시간 초과 되었습니다..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s 이(가) 거부당했음 : 암호에 대한 입력 시간이 초과되었습니다"
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "당신의 암호는 너무 짧습니다, 최소길이는 %d입니다. 다시 시도하세요"
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2183,12 +2188,10 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2196,33 +2199,33 @@ msgstr ""
 "debug [ player <사용자> | city <x> <y> | units <x> <y> | unit <id> | tech <사"
 "용자> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <옵션이름> <값>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "서버 옵션 설정."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "팀 <플레이어> [팀]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr ""
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2230,30 +2233,30 @@ msgid ""
 "to achieve team victory with averaged individual scores."
 msgstr ""
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <디렉토리>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr ""
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <메타라인>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr ""
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2262,19 +2265,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <메타라인>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr ""
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr ""
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2282,33 +2285,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <주소>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <사용자 이름>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr ""
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [접속이름] <사용자 이름>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr ""
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2318,15 +2321,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [접속이름] [사용자 이름]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr ""
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2336,35 +2339,35 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <접속이름>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "사용자로부터 분리"
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <사용자 이름>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr ""
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2372,16 +2375,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2389,11 +2392,11 @@ msgstr ""
 "novice\n"
 "novice <사용자 이름>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "하나 또는 모든 AI 사용자를 '초보'으로 설정"
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2401,7 +2404,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2409,11 +2412,11 @@ msgstr ""
 "easy\n"
 "easy <사용자 이름>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "하나 또는 모든 AI 사용자를 '쉬움'으로 설정"
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2421,7 +2424,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2429,11 +2432,11 @@ msgstr ""
 "normal\n"
 "normal <사용자 이름>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "하나 또는 모든 AI 사용자를 '보통'으로 설정"
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2441,7 +2444,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2449,11 +2452,11 @@ msgstr ""
 "hard\n"
 "hard <사용자 이름>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "하나 또는 모든 AI 사용자를 '어려움'으로 설정"
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2461,7 +2464,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2469,11 +2472,11 @@ msgstr ""
 "experimental\n"
 "experimental <사용자 이름>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "하나 또는 모든 AI 사용자를 '실험적'으로 설정"
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2482,7 +2485,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2496,11 +2499,11 @@ msgstr ""
 "cmdlevel <레벨> first\n"
 "cmdlevel <레벨> <접속 이름>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr ""
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2522,20 +2525,20 @@ msgid ""
 "now takes connection names, not player names."
 msgstr ""
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr ""
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr ""
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2543,46 +2546,46 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "즉시 비기는 것으로 게임끝냄"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "surrender"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "패배인정"
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <사용자 이름>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr ""
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2590,11 +2593,11 @@ msgstr ""
 "save\n"
 "save <파일명>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr ""
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2605,7 +2608,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2613,39 +2616,39 @@ msgstr ""
 "load\n"
 "load <파일명>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr ""
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <파일명>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <파일명>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr ""
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr ""
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr ""
 
@@ -3150,25 +3153,34 @@ msgstr ""
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr ""
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "서기: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr ""
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3211,44 +3223,44 @@ msgstr ""
 msgid "There is no player nor connection by the name %s."
 msgstr ""
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "온난화가 생겼습니다"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "핵 겨울이 일어났습니다!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
 "      Workers spontaneously gather and upgrade all cities with railroads."
 msgstr ""
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr ""
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr ""
@@ -3307,119 +3319,119 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr ""
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr ""
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s는 더이상 시야를 공유하지 않습니다"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr ""
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr ""
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr ""
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr " %s플레이어 없앰"
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "당신은 게임으로 부터 제거 되었습니다"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr ""
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr ""
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr ""
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr ""
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr ""
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr ""
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3652,19 +3664,19 @@ msgstr "번"
 msgid "th"
 msgstr "번"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "인구 통계 보고서:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr ""
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%2$s의 %1$s국가 (서기%3$s)"
@@ -3675,11 +3687,11 @@ msgstr "%2$s의 %1$s국가 (서기%3$s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "읽을 수 있는 \"%s.%s\" 룰세트 파일을 못 찾았습니다"
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "룰세트를 읽는 중"
 
@@ -3691,7 +3703,7 @@ msgid ""
 "risk."
 msgstr ""
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
 
@@ -3709,13 +3721,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3750,7 +3762,7 @@ msgstr "내부"
 msgid "Networking"
 msgstr "네트워킹"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "모두"
@@ -3771,56 +3783,60 @@ msgstr "드문"
 msgid "Changed"
 msgstr "바뀜"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
 msgstr ""
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
 msgstr ""
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr ""
 
-#: server/settings.c:236
+#: server/settings.c:181
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr ""
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr ""
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
 "  size = 20 is a huge map of 20,000 tiles"
 msgstr ""
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr ""
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -3856,11 +3872,11 @@ msgid ""
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 msgstr ""
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr ""
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -3872,11 +3888,11 @@ msgid ""
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr ""
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr ""
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -3889,35 +3905,35 @@ msgid ""
 "of start pos and to the number of players"
 msgstr ""
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr ""
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr ""
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr ""
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "모든 지도는 온화합니다"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr ""
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr ""
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -3935,113 +3951,113 @@ msgid ""
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr ""
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr ""
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr ""
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
 msgstr ""
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr ""
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
 msgstr ""
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr ""
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
 "usually only of interest while debugging the game."
 msgstr ""
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr ""
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr ""
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr ""
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
 msgstr ""
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr ""
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
 msgstr ""
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr ""
 
-#: server/settings.c:419
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr ""
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
 "try to connect will be rejected."
 msgstr ""
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr ""
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
 msgstr ""
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr ""
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4057,27 +4073,27 @@ msgid ""
 "    A   = Strong attack unit (eg., Catapult)\n"
 msgstr ""
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr ""
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "한 플레이어당 시작 금"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr ""
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4085,33 +4101,33 @@ msgid ""
 "next techs really expensive."
 msgstr ""
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
 "determined by the ruleset or other game settings."
 msgstr ""
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr ""
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
 "does not apply when you have just gained a technology this turn."
 msgstr ""
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr ""
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4119,22 +4135,22 @@ msgid ""
 "to gold transfers in diplomatic treaties."
 msgstr ""
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr ""
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
 "this is non-zero, you can end up with negative research points."
 msgstr ""
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr ""
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4143,43 +4159,43 @@ msgid ""
 "points."
 msgstr ""
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr ""
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
 "the size of the city."
 msgstr ""
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr ""
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
 "it has a Granary)."
 msgstr ""
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr ""
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4187,32 +4203,32 @@ msgid ""
 "also notradesize."
 msgstr ""
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr ""
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
 "notradesize and smaller than fulltradesize. See also fulltradesize."
 msgstr ""
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr ""
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
 msgstr ""
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr ""
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4220,11 +4236,11 @@ msgid ""
 "numbers of cities."
 msgstr ""
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr ""
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4232,31 +4248,31 @@ msgid ""
 "(default), the ruleset value will be used."
 msgstr ""
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr ""
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
 msgstr ""
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr ""
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr ""
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr ""
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4265,21 +4281,21 @@ msgid ""
 "\"occupying\" territory."
 msgstr ""
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr ""
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4289,32 +4305,32 @@ msgid ""
 "  8 = air"
 msgstr ""
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr ""
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
 "tiles or tiles within range of more than one nation's cities."
 msgstr ""
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr ""
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr ""
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4323,11 +4339,11 @@ msgid ""
 "4 = diplomacy is disabled for everyone."
 msgstr ""
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "허용된 도시 이름"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4342,11 +4358,11 @@ msgid ""
 "another nations unless it is a default for their nation also."
 msgstr ""
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "미개인의 등장 빈번도"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4355,81 +4371,81 @@ msgid ""
 "4 = raging hordes, lots of barbarians"
 msgstr ""
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "미개인 습격 시작년도"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "미개인들은 이번년도 전에는 나타나지 않을것입니다"
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "혁명의 턴 길이"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
 msgstr ""
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr ""
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
 "cities or terrain changes in tiles not observed."
 msgstr ""
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr ""
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr ""
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "내란을 위한 최소 도시의 수"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
 "civil wars are turned off altogether."
 msgstr ""
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr ""
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
 "players cannot meet unless they have an embassy."
 msgstr ""
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr ""
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4437,21 +4453,21 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr ""
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr ""
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr ""
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4485,122 +4501,124 @@ msgid ""
 "\n"
 msgstr ""
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr ""
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
 msgstr ""
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "게임이 끝나는 년도"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "이 게임은 주어진 마지막 년도에 끝날 것입니다"
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "한 턴당 최대 시간 (초)"
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr ""
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr ""
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
 "connections will be automatically disconnected eventually)."
 msgstr ""
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr ""
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
 "not wait at all."
 msgstr ""
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr ""
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr ""
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr ""
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr ""
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
 msgstr ""
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr ""
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
 msgstr ""
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr ""
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -4622,42 +4640,42 @@ msgid ""
 "The order of characters is not significant, but their capitalization is."
 msgstr ""
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr ""
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
 msgstr ""
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr ""
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
 "this server was not compiled to use zlib."
 msgstr ""
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr ""
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
 msgstr ""
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr ""
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -4668,7 +4686,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr ""
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr ""
@@ -4797,102 +4815,102 @@ msgstr "%s 로 게임저장 실패"
 msgid "Game saved as %s"
 msgstr ""
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "게임은 이미 진행중입니다."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "게임 시작"
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr ""
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "경고 : 오래된 클라이언트 %s 가(이) 거부됨"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr ""
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr ""
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "그 국가는 이미 사용되고 있습니다."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "또다른 플레이어가 이미 %s 이름을 갖고 있습니다. 다른 이름을 사용하세요"
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr ""
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "%s 이름의 나라는 이 시나리오에서 가능하지 않습니다"
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr ""
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s(은)는 %s의 통치자 %s입니다."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "게임시작을 기다립니다: (%d 명 총 %d 명중) 이 이미 시작하였습니다"
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr ""
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "사용자 %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s(은)는 %s(을)를 통치합니다."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr ""
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "게임이 끝났습니다..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr ""
 
@@ -4913,7 +4931,7 @@ msgstr ""
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5087,7 +5105,7 @@ msgstr ""
 msgid "Removed player %s from the game."
 msgstr ""
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5159,693 +5177,717 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr ""
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr ""
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr ""
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "유효하지 않은 인자 %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr ""
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "옵션:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "설명:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "상태: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr ""
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr ""
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr ""
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr ""
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr ""
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr ""
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr ""
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr ""
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr ""
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "이 명령은 오직 클라이언트에서만 됩니다"
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "사용법 : away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s(은)는 외출중입니다."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s(은)는 돌아왔습니다."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr ""
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "모든 옵션들"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "중요한 옵션들"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "상황별 옵션"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "거의 사용되지 않는 옵션들"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr ""
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "옵션"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "묘사"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr ""
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "미개인을 팀으로 할수 없습니다"
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr ""
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr ""
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "관찰자는 투표를 못 합니다."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr ""
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr ""
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr ""
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr ""
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr ""
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr ""
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "여기에 동등한 도시가 없습니다"
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr ""
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr ""
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "값 2는 반드시 정수여야 합니다"
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "부대 %d는 존재하지 않습니다"
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "당신은 이 옵션을 설정하도록 허용되지 않았습니다"
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr ""
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr ""
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr ""
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr ""
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr ""
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "문자열이 너무 깁니다. 사용법 : set <옵션> <값>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr ""
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+msgid "You cannot take a new player at this time."
+msgstr ""
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr ""
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "사용법: observe [접속 이름 [사용자 이름]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "사용법: observe [사용자 이름]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
-msgstr ""
+msgstr "%s는 이미 %s(을)를 관찰하고 있습니다."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
-msgstr ""
+msgstr "%s는 이미 관찰하고 있습니다."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
-msgstr ""
+msgstr "%s는 이제 %s(을)를 관찰합니다"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
-msgstr ""
+msgstr "%s는 이제 관찰합니다"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
-msgstr "사용법: take <접속 이름> <사용자 이름>"
+msgstr "사용법 : take <접속 이름> <사용자 이름>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "사용법 : take <사용자 이름>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "사용법 : take [접속 이름] <사용자 이름>"
 
-#: server/stdinhand.c:2951
+#: server/stdinhand.c:3010
 #, c-format
-msgid "%s already controls %s"
-msgstr ""
+msgid "%s already controls %s."
+msgstr "%s는 이미 %s(을)를 제어합니다."
 
-#: server/stdinhand.c:2965
+#: server/stdinhand.c:3024
 #, c-format
-msgid "There is no free player slot for %s"
+msgid "There is no free player slot for %s."
 msgstr ""
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr ""
 
-#: server/stdinhand.c:3076
+#: server/stdinhand.c:3135
 #, c-format
-msgid "%s now controls %s (%s, %s)"
-msgstr ""
+msgid "%s now controls %s (%s, %s)."
+msgstr "%s는 이제 %s(을)를 제어합니다 (%s, %s)."
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "야만인"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "AI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "인간"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "활약중"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "사망"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, c-format
-msgid "%s failed to attach to any player"
-msgstr ""
+msgid "%s failed to attach to any player."
+msgstr "%s는 사용자와 합체 못 했습니다."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "사용법: detach <접속 이름>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr ""
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr ""
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
-msgstr ""
+msgstr "%s는 %s(으)로부터 분리"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr ""
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
-msgstr ""
+msgstr "%s(으)로부터 분리."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "사용법: load <개임 이름>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr ""
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr ""
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr ""
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "안녕이 가세요"
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr ""
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr ""
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr ""
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr ""
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr ""
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr ""
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr ""
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+msgid "Not enough human players, game will not start."
+msgstr ""
+
+#: server/stdinhand.c:3888
+msgid "No players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 msgid "Not enough nations for all players, game will not start."
 msgstr ""
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr ""
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr ""
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr ""
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -5866,123 +5908,123 @@ msgid ""
 "  quit   -  to exit"
 msgstr ""
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr ""
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr ""
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr ""
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr ""
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr ""
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr ""
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr ""
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "플레이어의 목록:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<플레이어 없음>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "사용자 %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", 사망"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ""
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", 준비 됐슴"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", 준비 안 됐슴"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " 접속수 %d개:"
 msgstr[1] " 접속수 %d개:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr ""
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (관찰자 모드)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "팀의 목록:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : '%s' : 사용자 %d명"
 msgstr[1] "%2d : '%s' : 사용자 %d명"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 사용자 1명 : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "공팀: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr ""
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<접속 없음>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr ""
 
@@ -6049,17 +6091,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr ""
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr ""
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr ""
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr ""
@@ -6566,20 +6608,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr ""
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr ""
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr ""
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr ""
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr ""
@@ -6665,120 +6707,121 @@ msgstr ""
 msgid "Cannot find audio file %s"
 msgstr ""
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr ""
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr ""
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d í„´"
 msgstr[1] "%3d í„´"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "없음"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/í„´"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d í„´"
 msgstr[1] "%s (%d) %d í„´"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr ""
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr ""
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "불가사의"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr ""
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/í„´"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr ""
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr ""
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr ""
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -6890,8 +6933,8 @@ msgid "Best defending units"
 msgstr "최고의 방어부대"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -6952,7 +6995,7 @@ msgstr "도시 이름"
 
 #: client/cityrepdata.c:495
 msgid "Surplus"
-msgstr "과잉"
+msgstr "잉여"
 
 #: client/cityrepdata.c:495
 msgid "?food/production/trade:F/P/T"
@@ -6960,7 +7003,7 @@ msgstr "식/생/무"
 
 #: client/cityrepdata.c:496
 msgid "Surplus: Food, Production, Trade"
-msgstr "과잉: 식량, 생산, 무역"
+msgstr "잉여: 식량, 생산, 무역"
 
 #: client/cityrepdata.c:498
 msgid "?Food surplus [short]:+F"
@@ -6968,7 +7011,7 @@ msgstr "+식"
 
 #: client/cityrepdata.c:498
 msgid "Surplus: Food"
-msgstr "과잉: 식량"
+msgstr "잉여: 식량"
 
 #: client/cityrepdata.c:500
 msgid "?Production surplus [short]:+P"
@@ -6976,7 +7019,7 @@ msgstr "+생"
 
 #: client/cityrepdata.c:501
 msgid "Surplus: Production"
-msgstr "과잉: 생산"
+msgstr "잉여: 생산"
 
 #: client/cityrepdata.c:502
 msgid "?Production loss (waste) [short]:-P"
@@ -6992,7 +7035,7 @@ msgstr "+무"
 
 #: client/cityrepdata.c:504
 msgid "Surplus: Trade"
-msgstr "과잉: 무역"
+msgstr "잉여: 무역"
 
 #: client/cityrepdata.c:506
 msgid "?Trade loss (corruption) [short]:-T"
@@ -7061,8 +7104,8 @@ msgstr "?오염:오"
 msgid "?cma:Governor"
 msgstr "도지사"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7314,19 +7357,19 @@ msgid ""
 "%d times"
 msgstr ""
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "초보"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "쉬움"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "보통"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "어려움"
 
@@ -7334,31 +7377,31 @@ msgstr "어려움"
 msgid "experimental"
 msgstr "실험적인"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "서버를 시작하고 있습니다..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "서버를 시작할수 없습니다"
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr ""
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "서버에 연결할수 없습니다"
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr ""
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr ""
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 
@@ -7443,27 +7486,27 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr ""
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr ""
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr ""
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr ""
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -7471,293 +7514,293 @@ msgid ""
 "\n"
 msgstr ""
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr ""
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr ""
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr ""
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr ""
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr ""
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr ""
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr ""
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr ""
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr ""
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr ""
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr ""
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr ""
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr ""
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr ""
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* 요새를 세울 수 있슴.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* 지형을 개조할 수 있슴.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* 공군 기지를 세울 수 있슴.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr ""
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr ""
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr ""
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr ""
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr ""
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr ""
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr ""
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr ""
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr ""
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr ""
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr ""
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr ""
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr ""
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr ""
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr ""
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
 "at sea.\n"
 msgstr ""
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr ""
@@ -7766,115 +7809,115 @@ msgstr ""
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr ""
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr ""
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr ""
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
 "will require %d bulbs to complete."
 msgstr ""
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr ""
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr ""
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr ""
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr ""
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr ""
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr ""
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr ""
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr ""
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr ""
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr ""
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -7885,7 +7928,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7893,48 +7936,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -7942,23 +7985,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -7969,7 +8012,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -7977,60 +8020,60 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr ""
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr ""
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8038,7 +8081,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8046,71 +8089,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr ""
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr ""
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr ""
@@ -8501,16 +8544,16 @@ msgstr ""
 msgid "Start of turn %d"
 msgstr ""
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr ""
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr ""
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr ""
 
@@ -8541,13 +8584,13 @@ msgstr "이름"
 msgid "Username"
 msgstr "사용자명"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "국기"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -8561,7 +8604,7 @@ msgstr "êµ­ê²½"
 msgid "Score"
 msgstr "득점"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "팀"
 
@@ -8594,36 +8637,36 @@ msgstr "대기"
 msgid "Ping"
 msgstr "í•‘"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr ""
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr ""
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr ""
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr ""
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr ""
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr ""
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr ""
@@ -8930,64 +8973,68 @@ msgstr "금화: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "세금: %d 복지: %d 과학: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+msgid "Moving: Nobody"
+msgstr "활동중: 없음"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "활동중: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(더 많은 정보는 여기 클릭)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "인구: %s"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "í„´: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "금화: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "수지: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "세율: 금화:%d%% 복지:%d%% 과학:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "연구중 %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "지구 온난화 위험: %d%% (%+d%%/턴)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "핵 겨울 위험: %d%% (%+d%%/턴)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "정부 제도: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -8995,55 +9042,55 @@ msgstr[0] "%d 부대"
 msgstr[1] "%d 부대"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr ""
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr ""
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d부대 선택됨"
 msgstr[1] "%d부대 선택됨"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "선택된 부대 없음"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "업그레이드 할수 있는 부대가 없습니다"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr ""
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9054,169 +9101,169 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "연구대상이 없음"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr ""
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "오염도 : %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr ""
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr ""
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "당신의 현재정부 보이기"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
-msgstr "인구:      %5d"
+msgstr "인구 :           %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
-msgstr "지원:         %5d %%"
+msgstr "지원 :           %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
-msgstr "에너지:          %5d %%"
+msgstr "에너지 :         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "질량 :           %5d 톤"
+msgstr[1] "질량 :           %5d 톤"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
-msgstr "여행 시간 :     %5.1f years"
+msgstr "여행 시간 :      %5.1f 년"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
-msgstr "여행 시간:       N/A     "
+msgstr "여행 시간 :      N/A     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
-msgstr ""
+msgstr "성공 율 :        %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
-msgstr ""
+msgstr "도착 할 때 :     %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
-msgstr ""
+msgstr "꺼짐"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "%02dì´ˆ"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "%02d분 %02d초"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "%02d시간 %02d분"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "%02d일 %02d시간"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr ""
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%2$s의 %1$s국가"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "관찰자: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "건물: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "없음."
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "불가사의: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr ""
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9224,7 +9271,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9232,16 +9279,16 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr ""
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "최대 제한 없음, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9249,20 +9296,20 @@ msgstr[0] "최대 부대수 %d, "
 msgstr[1] "최대 부대수 %d, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "한 부대당 %d)."
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "평지상에서 군 부대는 불행을 야기할수 있습니다."
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr ""
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "복지: 총액 %d."
@@ -9303,12 +9350,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "없음"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "관습"
 
@@ -9354,11 +9401,13 @@ msgid "Ooops..."
 msgstr "웁스..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "이 부대는 뇌물을 받을수 없습니다"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -9373,6 +9422,7 @@ msgstr "적 부대를 매수하기"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -9411,6 +9461,7 @@ msgstr "기술:(_A)"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr ""
 
@@ -9435,12 +9486,13 @@ msgstr "건축물:(_I)"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "도시 생산"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr ""
@@ -9452,6 +9504,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -9466,6 +9519,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -9473,6 +9527,7 @@ msgid ""
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -9540,10 +9595,12 @@ msgid "Subvert Enemy Unit"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr "선생님, 외교관이 당신의 명령을 기다리고 있습니다"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr "선생님, 스파이가 당신의 명령을 기다리고 있습니다"
 
@@ -9643,7 +9700,7 @@ msgstr "환경오염:"
 msgid "_Overview"
 msgstr "개관(_O)"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -9668,11 +9725,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d í„´"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "구메(_B)"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr "생산(_P)"
 
@@ -9791,7 +9848,7 @@ msgstr "%d부대 원조됨"
 msgid "Present units %d"
 msgstr "%d부대 있슴"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr ""
 
@@ -9876,31 +9933,31 @@ msgstr "도시이름 바꾸기"
 msgid "What should we rename the city to?"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "변환(_G)"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "선택(_S)"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr "표시(_D)"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -9910,12 +9967,12 @@ msgstr "표시(_D)"
 msgid "Cities"
 msgstr "도시"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr "점검하기(_I)"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -9924,85 +9981,90 @@ msgstr "점검하기(_I)"
 msgid "Improvements"
 msgstr "건축물"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "불가사의한 것들"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "모든 도시"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "도시 없음"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "부대 건설중"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "건축물 건설중"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "불가사의 건설중"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "부대 건설중"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "건축물 건설중"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "불가사의 건설중"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "연안의 도시"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "같은 섬"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "원조하는 부대"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "부대 상태"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "도시의 건축물"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "도시안의 불가사의 "
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "가능한 부대"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "가능한 건축물"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "가능한 불가사의"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, c-format
+msgid "Total Buy Cost: %d"
+msgstr "총비용 : %d"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10023,7 +10085,7 @@ msgstr "ê²°ê³¼"
 #: client/gui-gtk-2.0/cma_fe.c:316 client/gui-sdl/cma_fe.c:887
 #: client/gui-win32/cma_fe.c:215
 msgid "Minimal Surplus"
-msgstr ""
+msgstr "최소 잉여"
 
 #: client/gui-gtk-2.0/cma_fe.c:319 client/gui-sdl/cma_fe.c:890
 #: client/gui-win32/cma_fe.c:216
@@ -10064,121 +10126,121 @@ msgstr ""
 msgid "Remove this preset?"
 msgstr "이 미리설정을 지우시겠습니까?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr "도시 조사(_C)"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "당신이 혁명을 원한다고 하셨습니까?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "혁명!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "약탈하기"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "부대"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "이름"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "부대 선택"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "대기하는 부대 보초시킴(_S)"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
 msgstr "민족 그룹:(_G)"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "어떤 민족으로 합니까?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "민족을 선택"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
 msgstr "무작위의 민족(_R)"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "민족을 선택하세요"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "속성(_P)"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "지도자:(_L)"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "ì—¬(_F)"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "남(_M)"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
 msgstr "도시형:(_S)"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 msgid "_Description"
 msgstr "묘사(_D)"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "성별을 선택하새요."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "도시형을 선택하새요."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "합법적인 이름을 입력하새요."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "부대를 업그레이드 하기"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -10427,60 +10489,65 @@ msgstr ""
 msgid "Not _ready"
 msgstr "준비 안 됐음(_R)"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "준비 됐음(_R)"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "시작(_S)"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+msgid "_Take Player"
+msgstr "이 사용자 데려오기(_T)"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "민족을 선택(_N)"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "관찰하기(_O)"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr "관찰을 취소하기(_O)"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<초보 AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<쉬운 AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<보통 AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<어려운 AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "무작위"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "관찰자"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "붙임"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "정말 끝내시겠습니까?"
 
@@ -10656,7 +10723,7 @@ msgstr "+%d 무역 / %d"
 #: client/gui-xaw/helpdlg.c:1000
 #, c-format
 msgid "no extra / %d"
-msgstr "과잉 없음 / %d"
+msgstr "잉여 없음 / %d"
 
 #: client/gui-gtk-2.0/helpdlg.c:1067 client/gui-gtk-2.0/helpdlg.c:1071
 #: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:598
@@ -10733,7 +10800,7 @@ msgstr ""
 
 #: client/gui-gtk-2.0/menu.c:250
 msgid "Leaving a local game will end it!"
-msgstr ""
+msgstr "로컬 게임으로부터 나가면 종료됩니다!"
 
 #: client/gui-gtk-2.0/menu.c:700 client/gui-win32/menu.c:303
 msgid "_Game"
@@ -10898,7 +10965,7 @@ msgstr "ê´‘ì‚°"
 
 #: client/gui-gtk-2.0/menu.c:802 client/gui-win32/menu.c:346
 msgid "Fortress & Airbase"
-msgstr "요새와 공군 기지"
+msgstr "요새 및 공군 기지"
 
 #: client/gui-gtk-2.0/menu.c:804 client/gui-win32/menu.c:348
 #: client/gui-xaw/menu.c:154
@@ -11387,214 +11454,214 @@ msgstr "네트웍 게임에 연결(_O)"
 msgid "Connect to Gaming _Zone"
 msgstr "Gaming Zone으로 연결(_Z)"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "서버명"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "포트"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "버전"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "상태"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "사용자"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "비평"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "L_AN"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "메타서버(_M)"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "호스트:(_H)"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "포트:(_P)"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "로그인:(_L)"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "암호:(_W)"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "암호 확인:(_I)"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "ì—°ê²°(_O)"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "연결 이름: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "사용자명: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "호스트: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "사용자/접속 정보"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s ì •ë³´"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "민족을 선택"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "이 플레이어를 관찰하기"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "이 사용자 데려오기"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "연결 끊기"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "사용자 제거"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr "플레이어 수(AI 포함):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr "AI 숙련 레벨:(_L)"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
 msgstr "룰세트:(_V)"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "다른 게임 옵션...(_M)"
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "기록"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "비율"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "준비"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "지도자"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "로드하기 위해 저장된 게임을 선택하세요"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "로드하기 위해 저장된 게임을 선택하세요:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "찾아보기(_B)"
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "시나리오 선택"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "시나리오 선택:(_S)"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "형식"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "민족을 선택하세요:(_N)"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "저장하기 위한 장소 선택"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "게임 저장"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "저장된 게임들 :"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "파일이름 저장 :"
 
@@ -11629,7 +11696,7 @@ msgstr "이름"
 msgid "Count"
 msgstr "수"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -11863,28 +11930,28 @@ msgstr "_작업리스트"
 msgid "Edit Global _Worklists"
 msgstr "광역 작업리스트 편집(_W)"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "í„´"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "작업 자료:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "미래 목표 표시(_F)"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "목표 작업리스트:(_W)"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "광역 작업리스트 추가(_A)"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "생산 바뀜(_G)"
 
@@ -12119,17 +12186,17 @@ msgstr "식량: 매턴당 %d"
 #: client/gui-sdl/citydlg.c:2603
 #, c-format
 msgid "?food:Surplus: %d"
-msgstr "과잉: %d"
+msgstr "잉여 : %d"
 
 #: client/gui-sdl/citydlg.c:2651
 #, c-format
 msgid "Production: %d (%d) per turn"
-msgstr "생산: 매턴당 %d (%d)"
+msgstr "생산 : 매턴당 %d (%d)"
 
 #: client/gui-sdl/citydlg.c:2697
 #, c-format
 msgid "?production:Support: %d"
-msgstr "원조: %d"
+msgstr "원조 : %d"
 
 #: client/gui-sdl/citydlg.c:2735
 #, c-format
@@ -12139,12 +12206,12 @@ msgstr "무역 : 매턴당 %d"
 #: client/gui-sdl/citydlg.c:2769
 #, c-format
 msgid "Corruption: %d"
-msgstr "부패: %d"
+msgstr "부패 : %d"
 
 #: client/gui-sdl/citydlg.c:2806
 #, c-format
 msgid "Gold: %d (%d) per turn"
-msgstr "금화: 매턴당 %d (%d)"
+msgstr "금화 : 매턴당 %d (%d)"
 
 #: client/gui-sdl/citydlg.c:2853
 #, c-format
@@ -12175,8 +12242,8 @@ msgid "City shrinks: %d %s"
 msgstr ""
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12276,11 +12343,11 @@ msgstr ""
 msgid "Maintenance Report"
 msgstr ""
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "작업 리스트"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -12311,7 +12378,7 @@ msgstr ""
 
 #: client/gui-sdl/cma_fe.c:999 client/gui-win32/cma_fe.c:490
 msgid "Control city"
-msgstr ""
+msgstr "도시 제어"
 
 #: client/gui-sdl/cma_fe.c:1008 client/gui-win32/cma_fe.c:488
 #: data/Freeciv.in:1470
@@ -12695,21 +12762,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -13266,11 +13333,11 @@ msgstr "도로 및 철도"
 
 #: client/gui-sdl/optiondlg.c:1959 client/gui-xaw/menu.c:153
 msgid "Fortress and Airbase"
-msgstr ""
+msgstr "요새 및 공군 기지"
 
 #: client/gui-sdl/optiondlg.c:1987
 msgid "Civ3 city text style"
-msgstr ""
+msgstr "Civ3식 도시 제목"
 
 #: client/gui-sdl/optiondlg.c:2216
 msgid "Video options"
@@ -13295,7 +13362,7 @@ msgstr "작업 리스트"
 
 #: client/gui-sdl/optiondlg.c:2287
 msgid "Leave Game"
-msgstr "게임 저장"
+msgstr "게임 나가기"
 
 #: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
 #: client/gui-win32/connectdlg.c:1098 client/gui-xaw/menu.c:121
@@ -13983,7 +14050,7 @@ msgstr "도시 스타일 :"
 msgid "Unit Selection"
 msgstr "부대 선택"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "없음"
 
diff --git a/po/lt.gmo b/po/lt.gmo
index 301e129..cbfe33e 100644
Binary files a/po/lt.gmo and b/po/lt.gmo differ
diff --git a/po/lt.po b/po/lt.po
index 91ff8ae..76905a8 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-12-16 11:12+0300\n"
 "Last-Translator: Andrius Å tikonas <stikonas at gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
@@ -46,22 +46,22 @@ msgstr "Prabanga"
 msgid "Science"
 msgstr "Mokslas"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:P"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:s"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:S"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:P"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:s"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -482,81 +482,81 @@ msgstr "Prisijungimo/atsijungimo pranešimai"
 msgid "AI Debug messages"
 msgstr "DI testavimo pranešimai"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:Genocidas"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:Karingas"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:Priešiškas"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:Nekooperatyvus"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:Neramus"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?attitude:Neutralus"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:Pagarbus"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:Paslaugus"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:Entuziastingas"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:Žavisi"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:Garbinantis"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Paliaubos"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Karas"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Laikinos paliaubos"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Taika"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:SÄ…junga"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Niekada nesusitiko"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Komanda"
 
@@ -602,13 +602,13 @@ msgstr "%s dalinių"
 msgid "Size %d"
 msgstr "Dydis %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Ateities technologija. %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -620,65 +620,65 @@ msgstr "Ateities technologija. %d"
 msgid "None"
 msgstr "Jokia"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Ateities technologija"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Nežinoma)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Kelias"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "DrÄ—kinimas"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Geležinkelis"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Kasykla"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Tarša"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Namelis"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "TvirtovÄ—"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "UpÄ—"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Ferma"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Oro bazÄ—"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Radiacijos padidÄ—jimas"
 
@@ -784,11 +784,11 @@ msgstr "Branduolinis_ginklas"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " ir "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?and:, "
 
@@ -949,84 +949,84 @@ msgstr[0] " (iš viso %d pakartojimas)"
 msgstr[1] " (iš viso %d pakartojimai)"
 msgstr[2] " (iš viso %d pakartojimų)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Nenurodytas \"%s\" parametras.\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Trūksta \"%s\" parametro.\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d pr. Kr."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d po Kr."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "FREECIV_PATH yra nustatytas į tuščią reikšmę. Naudojamas standartinis kelio "
 "nustatymas."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Nepavyko perskaityti duomenų katalogo %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "Duomenų katalogas gali būti nustatytas FREECIV_PATH aplinkos kintamuoju."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Dabartinis duomenų kelias yra: „%s“"
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Reikalingas failas „%s“ ... nutraukiama!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 "%s: KritinÄ— klaida: bandoma paleisti programÄ… administracinio vartotojo "
 "teisÄ—mis!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Naudokite neprivilegijuotÄ… vartotojÄ….\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "tiksliai atitinka"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "tikslus atitikmuo"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "dviprasmiškas"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "tuščias"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "per ilgas"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "neatitinka"
 
@@ -1055,23 +1055,23 @@ msgstr "%s pradÄ—jo statyti %s tarp %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s parduoda %s (nereikalinga) už %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 "*%s (DI)* DI esantis nutolusiame režime negali pasirašyti tokios sutarties."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (DI)* Pirma nutrauk sÄ…junga su %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (DI)* Pirmiau nutraukime priešiškus veiksmus, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1079,48 +1079,48 @@ msgid ""
 msgstr ""
 "*%s (DI)* Norėčiau ilgiau išlaikyti esamą ugnies nutraukimo statusą, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 "*%s (DI)* Aš vis dar nepasitikiu jumis, kad galėčiau sudaryti sąjungą, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (DI)* Nežinau miesto, kurį paminėjai."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (DI)* Atsiprašau, dalijimasis regėjimo lauku su Jumis nesaugus."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (DI)* Šis pasiūlymas yra mums per prastas, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (DI)* Sveikas atvykęs į mūsų sąjungą %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (DI)* Taip, amžiams būkime vieningi, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (DI)* Taip, tegyvuoja taika!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (DI)* Sutarta. Jokių priešiškų veiksmų, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1129,23 +1129,23 @@ msgstr ""
 "*%s (DI)* Sveikinimai %s! Gal galÄ—tume sudaryti paliaubas, kol vieni kitus "
 "geriau pažinsime?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (DI)* Kosmosas niekada Jums nepriklausys. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "*%s (DI)* Aš per ilgai toleravau Jūsų ištvirkusį gyvenimo būdą! Į karą!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (DI)* Taika bus ... kada nors vÄ—liau."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1154,17 +1154,17 @@ msgstr ""
 "*%s (DI)* Pagaliau aš Jus pergudravau! Negi manėte, galėsią pasprukti su "
 "savo nusikaltimais?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (DI)* Jūsų slapti kariniai veiksmai sukėlė šį karą!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (DI)* Agresija prieš %s buvo paskutinė Jūsų klaida!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1182,7 +1182,7 @@ msgstr[2] ""
 "*%s (DI)* Mes pradėsime visapusį karą prieš %s per %d ėjimų, kad "
 "sustabdytumÄ—me erdvÄ—laivio paleidimÄ…."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1191,7 +1191,7 @@ msgstr ""
 "*%s (DI)* Šiame reikale tikimasi Jūsų pagalbos. Tegyvuoja mūsų šlovingoji "
 "sÄ…junga!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1214,7 +1214,7 @@ msgstr[2] ""
 "atsakysime jėga per %d ėjimų ir tikimės, kad gerbdamas mūsų sąjungą Jūs "
 "pasielgsite taip pat!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1232,13 +1232,13 @@ msgstr[2] ""
 "*%s (DI)* Mes ketiname apiplÄ—Å¡ti turtingÄ… %s civilizacijÄ…. Mes paskelbisme "
 "karą per %d ėjimų."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr "*%s (DI)* Jei norite grobio dalies, prašome prisijungti!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1256,14 +1256,14 @@ msgstr[2] ""
 "*%s (DI)* Mums jau atsibodo %s. Sunaikinkime Å¡iÄ… apgailÄ—tinÄ… civilizacijÄ…. "
 "Mes skelbiame karą per %d ėjimų."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (DI)* Kaip iš šlovingųjų sąjungininkų mes tikimės Jūsų pagalbos šiame "
 "kare."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1281,7 +1281,7 @@ msgstr[2] ""
 "*%s (DI)* Mes gerbiame mūsų sąjungą ir karą %s paskelbsime per %d ėjimų.  "
 "Laikykitės – mes ateinam!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1299,7 +1299,7 @@ msgstr[2] ""
 "*%s (DI)* Mes  gerbiame mūsų sajungą su %s ir karą %s paskelbsime per %d "
 "ėjimų. Iš Jūsų tikimės to paties."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1308,7 +1308,7 @@ msgstr ""
 "*%s (DI)* Jūsų bandymas užkariauti kosmosą vienam sau atskleidžia tikrus "
 "Jūsų ketinimus, todėl aš nutraukiu su Jumis sąjungą!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1316,7 +1316,7 @@ msgid ""
 msgstr ""
 "*%s (DI)* Jūsų vienašališkas tikslas užvaldyti kosmosą yra labai priešiškas."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1325,14 +1325,14 @@ msgstr ""
 "*%s (DI)* Jei Jūs nebaigsite konstruoti erdvėlaivio, aš būsiu priverstas "
 "panaudoti jÄ—gÄ…!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 "*%s (DI)* Apgailestaujame, tačiau dalijimasis bendro regėjimo lauku su Jumis "
 "nebesaugus."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1341,7 +1341,7 @@ msgstr ""
 "*%s (DI)* Sveikinimai mūsų labiausiai ištikimas sąjungininke. Mes kviečiame "
 "Jus sunaikinti mūsų priešą %s."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1350,7 +1350,7 @@ msgstr ""
 "*%s (DI)* Sveikinimai, sąjungininke, aš matau, kad Jūs dar nepaskelbėte karo "
 "mūsų priešui. %s. Kodėl aš turėčiau Jums priminti Jūsų pažadus?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1361,7 +1361,7 @@ msgstr ""
 "taikoje su mūsų mirtinu priešu %s! Tai nepakenčiama, todėl mūsų sąjunga "
 "nutraukiama!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1370,14 +1370,14 @@ msgstr ""
 "*%s (DI)* Sveikinimai, drauge, gal galėtume pasiūlyti prisijungti prie "
 "bendrų tikslų ir įstoti į sąjungą?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "*%s (DI)* Sveikinimai, kaimyne, gal galėtume Jums pasiūlyti labiau taikius "
 "santykius?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1386,7 +1386,7 @@ msgstr ""
 "*%s (DI)* Mums jau įkyrėjo nuolatinis kraujo liejimas. Gal galėtume "
 "pasiūlyti nutraukti karinius veiksmus?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1396,59 +1396,64 @@ msgstr ""
 "Gerbkite mūsų sąjungą ir Jūsų vardas nebus pamirštas!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Visi nustatymai"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (veteranas)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Šis vardas neleidžiamas"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Nepavyksta įkelti konfigūracinio failo „%s“!"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 "Įspėjimas: svečio vardas „%s“ jau užimtas, vartotojas pervadinamas į „%s“."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Svečiai į šį serverį neįleidžiami. Apgailestaujame"
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s atmestas: Svečiai neįleidžiami."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1457,7 +1462,7 @@ msgstr ""
 "Įvyko klaida skaitant vartotojų duomenų bazę, todėl jungiamasi svečio "
 "vartotoju '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1465,42 +1470,42 @@ msgstr ""
 "Įvyko klaida skaitant vartotojų duomenų bazę ir svečių prisijungimai "
 "negalimi. Apgailestaujame."
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s buvo atmestas: Klaida duomenų bazėje ir svečiai neleidžiami."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Įveskite %s slaptažodį:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Įveskite naują slaptažodį(ir jį prisiminkite)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 "Prie serverio jungtis leidžiama tik registruotiems vartotojams. "
 "Apgailestaujame."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s buvo atmestas, nes leidžiami tik registruoti vartotojai."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Apgailestaujame, per daug blogų bandymų..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 "%s buvo atmestas: Per daug blogų slaptažodžio patvirtinimų naujam vartotojui."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1508,33 +1513,33 @@ msgstr ""
 "Įspėjimas: Saugant į duombazę įvyko klaida. Tęsiama, bet jūsų rezultatai "
 "nebus išsaugomi."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr ""
 "%s buvo atmestas: Per daug blogų bandymų įvedant neteisingą slaptažodį."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Jūsų slaptažodis klaidingas. Bandykite dar kartą."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Deja, Jūsų jungimosi laikas baigėsi."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s buvo atmestas: belaukiant  slaptažodžio baigėsi jungimosi laikas."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 "Jūsų slaptažodis yra per trumpas, mažiausias ilgis yra %d. Pabandykite dar "
 "kartÄ…."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2287,44 +2292,42 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr ""
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr ""
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Nustatyti serverio parinktį."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr ""
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr ""
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2332,30 +2335,30 @@ msgid ""
 "to achieve team victory with averaged individual scores."
 msgstr ""
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr ""
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr ""
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <meta-eilutÄ—>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr ""
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2364,19 +2367,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <meta-eilutÄ—>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr ""
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr ""
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2384,33 +2387,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <adresas>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <žaidėjo-vardas>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr ""
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [ryšio-vardas] <žaidėjo-vardas>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Užimti žaidėjo vietą žaidime."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2420,15 +2423,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [ryšio-pavadinimas] [žaidėjo-vardas]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Stebėti žaidėją arba visą žaidimą."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2438,50 +2441,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <ryšio-pavadinimas>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "atsijungti nuo žaidėjo."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <žaidėjo-vardas>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Sukuria DI žaidėją nurodytu vardu."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
 msgstr ""
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "DI valdys jūsų tautą, bet darys minimalius pakeitimus"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2489,11 +2492,11 @@ msgstr ""
 "novice\n"
 "novice <žaidėjo-vardas>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr ""
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2501,7 +2504,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2509,11 +2512,11 @@ msgstr ""
 "easy\n"
 "easy <žaidėjo-vardas>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr ""
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2521,7 +2524,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2529,11 +2532,11 @@ msgstr ""
 "normal\n"
 "normal <žaidėjo-vardas>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr ""
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2541,7 +2544,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2549,11 +2552,11 @@ msgstr ""
 "hard\n"
 "hard <žaidėjo-vardas>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr ""
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2561,7 +2564,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2569,11 +2572,11 @@ msgstr ""
 "experimental\n"
 "experimental <žaidėjo-vardas>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr ""
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2582,7 +2585,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2596,11 +2599,11 @@ msgstr ""
 "cmdlevel <lygis> first\n"
 "cmdlevel <lygis> <ryšio-pavadinimas>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr ""
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2622,20 +2625,20 @@ msgid ""
 "now takes connection names, not player names."
 msgstr ""
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr ""
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr ""
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2643,46 +2646,46 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Iškart baigti žaidimą lygiosiomis."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "pasiduoti"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr ""
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <žaidėjo-vardas>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Visiškai pašalina žaidėją iš žaidimo."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2690,11 +2693,11 @@ msgstr ""
 "save\n"
 "save <failo-pavadinimas>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Išsaugo žaidimą į failą."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2705,7 +2708,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2713,39 +2716,39 @@ msgstr ""
 "load\n"
 "load <failo-pavadinimas>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Įkelti žaidimą iš failo."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <failo-vardas>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <failo-vardas>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr ""
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr ""
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Paprasčiausiai grąžina serverio identfikacinį numerį."
 
@@ -3258,26 +3261,35 @@ msgstr "JÅ«s sukÄ—lÄ—te incidentÄ… bandydamas sukelti sukilimÄ… mieste %s."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s sukÄ—lÄ— incidentÄ… bandydamas sukelti sukilimÄ… mieste %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr "JÅ«riniai daliniai dar nepalaikomi. Nieks negauna %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Metai: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Ėjimui skirtas laikas viršijo maksimumą, todėl grąžinama maksimali reikšmė"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Laikas, skirtas ėjimui, mažesnis nei nulis. Grąžinama į nulį."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Tik GGZ klientas turi kviesti civ clientą ggz režimu!\n"
 
@@ -3320,26 +3332,26 @@ msgstr "Nėra ryšio pavadinimu %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Nėra nei žaidėjo, nei ryšio vardu %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Įvyko globalinis atšilimas!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr "Pakrantės buvo užlietos ir platūs pievų laukai pavirto dykumomis."
 
 # Kažkaip negražiai skamba „Įvyko“
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Prasidėjo branduolinė žiema!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr "Drėgnos žemės išdžiūvo ir paltūs pievų laukai pavirto tundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3350,7 +3362,7 @@ msgstr ""
 "      Darbuotojai iš karto susirenka ir nutiesia geležinkelius visuose "
 "miestuose."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3361,12 +3373,12 @@ msgstr ""
 "     Darbuotojai iš karto susirenka ir nutiesia geležinkelius visuose "
 "miestuose."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Jūsų %s patrauktas dėl besikeičiančio reljefo."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Jūsų %s panaikintas dėl besikeičiančio reljefo."
@@ -3426,27 +3438,27 @@ msgstr "Revoliucija: grįžtama prie anarchijos."
 msgid "You should choose a new government from the government menu."
 msgstr "Jūs turite pasirinkti naują valdymo formą iš valdymo formų meniu."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Mokesčių norma viršija maksimalią, kuri yra %s; ištaisoma."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Mokslo norma viršija maksimalią, kuri yra %s; ištaisoma."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Prabangos norma viršija maksimalią, kuri yra %s; ištaisoma."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s mums daugiau nebeteikia bendro regÄ—jimo lauko!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3455,13 +3467,13 @@ msgstr ""
 "Senatas neleidžia Jums sulaužyti sutarties su %s.  Jūs privalote arba "
 "išvaikyti senatą arba laukti palankesnio momento."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "Senatas sutinka su Jūsų sprendimu dėl pastovių %s provokacijų."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3470,12 +3482,12 @@ msgstr ""
 "Senatas atsisako sulaužyti sutartį su %s, bet Jums nekyla problemų surandant "
 "naujÄ… senatÄ…."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Diplomatinė būsena tarp %s ir %s dabar yra %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3484,14 +3496,14 @@ msgstr ""
 " %s atšaukė diplomatinį susitarimą! Diplomatinė būsena tarp %s ir %s dabar "
 "yra %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 "%s užpuolė Jūsų sąjungininką %s! Jūs nutraukiate sąjungą su agresoriumi."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3500,26 +3512,26 @@ msgstr ""
 "Jūsų komandos draugas %s paskelbė karą %s. Jūs privalote nutraukti sąjungą "
 "su %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Pašalinamas žaidėjas %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Jūs pašalintas iš žaidimo!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s pašalintas iš žaidimo."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Jus nelauktai sutiko %s ir jų valdovas %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3527,17 +3539,17 @@ msgstr ""
 "%s ir %s susitiko ir vienas kitam paskelbÄ— karÄ…. JÅ«s nutraukiate sÄ…jungÄ… su "
 "abiem."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Negalima įvelti %s į pilietinį karą – per daug žaidėjų"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Negalima įvelti %s į pilietinį karą – per daug žaidėjų"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3546,12 +3558,12 @@ msgstr ""
 "Jūsų valstybėje kilo pilietinis karas,  %s pasiskelbė sukilusių valstijų "
 "vadu."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s paskelbia sÄ…jungÄ… su %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3788,20 +3800,20 @@ msgstr "-čias"
 msgid "th"
 msgstr "-tas"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Demografijos eilutėje rasta negalimų simbolių. Bandykite \"help demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Demografų ataskaita:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Apgailestaujame, tačiau demografinė ataskaita negalima."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr ""
@@ -3812,11 +3824,11 @@ msgstr ""
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr ""
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Įkeliamos taisyklės"
 
@@ -3828,7 +3840,7 @@ msgid ""
 "risk."
 msgstr ""
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Išsaugotas žaidimas per senas. Seniausia palaikoma versija yra 1.9.0."
@@ -3850,13 +3862,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3891,7 +3903,7 @@ msgstr "Vidiniai"
 msgid "Networking"
 msgstr "Tinklo"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Visos"
@@ -3912,34 +3924,34 @@ msgstr "Retas"
 msgid "Changed"
 msgstr "Pakeista"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
 msgstr ""
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
 msgstr ""
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "GGZ režime negalima keisti maksimalaus žaidėjų skaičiaus."
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -3948,23 +3960,28 @@ msgstr ""
 "Žaidėjų skaičius yra didesnis nei reikalaujama reikšmė, todėl paliekama "
 "senoji reikšmė."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Jums neleidžiama nustatyti šios parinkties."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Žemėlapio dydis (tūkstančiais laukelių)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
 "  size = 20 is a huge map of 20,000 tiles"
 msgstr ""
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Žemėlapio topologinis indeksas"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4000,11 +4017,11 @@ msgid ""
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 msgstr ""
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Metodas, naudotas žemėlapio generavimui"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4016,11 +4033,11 @@ msgid ""
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr ""
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Metodas, naudojamas parinkti pradinÄ—ms pozicijoms"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4033,35 +4050,35 @@ msgid ""
 "of start pos and to the number of players"
 msgstr ""
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "1x1 salų buvimas"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = nėra 1x1 salų; 1 = kažkiek 1x1 salų"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr ""
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Visas žemėlapis yra vidutinės temperatūros"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = normali, į Žemę panaši planeta; 1 = vienodos temperatūros planeta"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Vidutinė planetos temperatūra"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4079,113 +4096,113 @@ msgid ""
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr ""
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Sausumos procentas žemėlapyje"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Kalvų/kalnų kiekis"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
 msgstr ""
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Vandens telkinių sausumoje kiekis"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
 msgstr ""
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Žemėlapio generatoriaus atsitiktinės funkcijos pradinis duomuo"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
 "usually only of interest while debugging the game."
 msgstr ""
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Žaidimo atsitiktinė sėkla"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr ""
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "\"Specialių\" resursų laukelių kiekis"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
 msgstr ""
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Namelių (mažų genčių kaimelių) kiekis"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
 msgstr ""
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Mažiausias žaidėjų skaičius"
 
-#: server/settings.c:419
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Didžiausias žaidėjų skaičius"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
 "try to connect will be rejected."
 msgstr ""
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr ""
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
 msgstr ""
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Žaidėjo pradinių dalinių sąrašas"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4201,27 +4218,27 @@ msgid ""
 "    A   = Strong attack unit (eg., Catapult)\n"
 msgstr ""
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Vieta, kurioje išdėstomi pradiniai daliniai"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "Tai yra spindulys, kuriame išsklaidomi pradiniai daliniai."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Pradinis aukso kiekis žaidėjui"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Žaidimo pradžioje kiekvienas žaidėjas gauna tokį aukso kiekį."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Pradinių technologijų skaičius vienam žaidėjui"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4229,33 +4246,33 @@ msgid ""
 "next techs really expensive."
 msgstr ""
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
 "determined by the ruleset or other game settings."
 msgstr ""
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr ""
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
 "does not apply when you have just gained a technology this turn."
 msgstr ""
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr ""
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4263,22 +4280,22 @@ msgid ""
 "to gold transfers in diplomatic treaties."
 msgstr ""
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr ""
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
 "this is non-zero, you can end up with negative research points."
 msgstr ""
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Bauda gaunant nemokamÄ… technologijÄ…"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4287,43 +4304,43 @@ msgid ""
 "points."
 msgstr ""
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Maistas, reikalingas miestui augti"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
 "the size of the city."
 msgstr ""
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr ""
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
 "it has a Granary)."
 msgstr ""
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr ""
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4331,32 +4348,32 @@ msgid ""
 "also notradesize."
 msgstr ""
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr ""
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
 "notradesize and smaller than fulltradesize. See also fulltradesize."
 msgstr ""
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr ""
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
 msgstr ""
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr ""
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4364,11 +4381,11 @@ msgid ""
 "numbers of cities."
 msgstr ""
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Mažiausias atstumas tarp miestų"
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4376,31 +4393,31 @@ msgid ""
 "(default), the ruleset value will be used."
 msgstr ""
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr ""
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
 msgstr ""
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr ""
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr ""
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr ""
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4409,21 +4426,21 @@ msgid ""
 "\"occupying\" territory."
 msgstr ""
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Sumažinti miesto populiaciją po atakos"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4433,32 +4450,32 @@ msgid ""
 "  8 = air"
 msgstr ""
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr ""
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
 "tiles or tiles within range of more than one nation's cities."
 msgstr ""
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Daliniai valstybÄ—s viduje nekelia nepasitenkinimo"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Galimybė vykdyti diplomatiją su kitais žaidėjais."
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4467,11 +4484,11 @@ msgid ""
 "4 = diplomacy is disabled for everyone."
 msgstr ""
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Leidžiami miestų vardai"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4486,11 +4503,11 @@ msgid ""
 "another nations unless it is a default for their nation also."
 msgstr ""
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Barbarų pasirodymo dažnis"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4499,82 +4516,82 @@ msgid ""
 "4 = raging hordes, lots of barbarians"
 msgstr ""
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Barbarų pasirodymo metai"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbarai nepasirodys iki šių metų."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Revoliucijos ilgis Ä—jimais"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
 msgstr ""
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Ar leisti karo rūką"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
 "cities or terrain changes in tiles not observed."
 msgstr ""
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Ar leisti kosminÄ™ rasÄ™"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Jei čia nustatyta 1, žaidėjai gali statyti erdvėlaivius."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Mažiausias miestų skaičius, reikalingas pilietiniam karui"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
 "civil wars are turned off altogether."
 msgstr ""
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Ėjimai, kol prarandamas kontaktas tarp žaidėjų"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
 "players cannot meet unless they have an embassy."
 msgstr ""
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Perstatyti rūmus, jei sostinė užgrobta"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4582,11 +4599,11 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Ar naudoti natūralius miestų pavadinimus."
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -4594,11 +4611,11 @@ msgstr ""
 "Jei įjungta, tai standartiniai miestų pavadinimai bus nustatomi pagal juos "
 "supantį reljefą."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr ""
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4632,122 +4649,124 @@ msgid ""
 "\n"
 msgstr ""
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr ""
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
 msgstr ""
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Metai, kuriais baigiasi žaidimas"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Žaidimas pasibaigs nurodytais metais."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Ä–jimui skirtas maksimalus laikas sekundÄ—mis"
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr ""
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr ""
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
 "connections will be automatically disconnected eventually)."
 msgstr ""
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr ""
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
 "not wait at all."
 msgstr ""
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Sekundės tarp PINGų"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr ""
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Laikas atjungti klientÄ…"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr ""
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
 msgstr ""
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Fiksuoto laiko ėjimų žaidimo režimas"
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
 msgstr ""
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Kas yra demografinÄ—je ataskaitoje"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -4769,11 +4788,11 @@ msgid ""
 "The order of characters is not significant, but their capitalization is."
 msgstr ""
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Kas kelintą ėjimą bus vykdomas automatinis išsaugojimas"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -4781,32 +4800,32 @@ msgstr ""
 "Šis žaidimas bus automatiškai išsaugojamas per šį ėjimų skaičių. Nulis "
 "reiškia, kad žaidimas nebus automatiškai išsaugojamas."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Išsaugotų žaidimų suspaudimo lygis"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
 "this server was not compiled to use zlib."
 msgstr ""
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Auto-išsaugojimo vardo priešdėlis"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
 msgstr ""
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Ar registruoti žaidėjo statistiką"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -4818,7 +4837,7 @@ msgid "Server cannot read standard input. Ignoring input."
 msgstr ""
 "Serveris negali nuskaityti standartinės įvesties. Įvesties ignoruojama."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Serveris: blogas adresas: [%s:%d]."
@@ -4950,102 +4969,102 @@ msgstr "Nepavyko išsaugoti žaidimo kaip %s"
 msgid "Game saved as %s"
 msgstr "Žaidimas išsaugotas kaip %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Žaidimas jau paleistas."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Paleidžiamas žaidimas."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr ""
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "DÄ—mesio: atmetamas senas klientas %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr ""
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Pasirinkite ne tuščią vardą"
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Å i tauta jau pasirinkta."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "Kitas žaidėjas jau turi vardą „%s“. Prašome pasirinkti kitą vardą."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr ""
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "%s tauta yra negalima Å¡iam scenarijuje."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "%s tauta jau pasirinkta."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s yra %s valdovas %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr ""
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr ""
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Žaidėjas %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s valdo %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Informacija siunčiama į metaserverį [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Žaidimas baigtas..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Dabar priimami nauji klientų prisijungimai."
 
@@ -5066,7 +5085,7 @@ msgstr "(dviprasmiškas)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5240,7 +5259,7 @@ msgstr "Žaidėjai negali būti pašalinti prasidėjus žaidimui."
 msgid "Removed player %s from the game."
 msgstr "Žaidėjas %s pašalintas iš žaidimo"
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Vardas \"%s\" neleidžiamas dėl saugumo priežasčių."
@@ -5312,237 +5331,237 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr ""
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr ""
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr ""
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Žaidimo organizatorius jau yra kažkas kitas."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Netinkamas argumentas %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr ""
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Parinktis:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Aprašymas:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "BÅ«sena: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "keičiamas"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fiksuotas"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr ""
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr ""
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Vertė: „%s“, numatyta: „%s“"
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Paaiškinimai galimi šioms serverio parinktims:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Šitam dar nėra paaiškinimo."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Dviprasmiškas parinkties vardas."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Serverio operatorius: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Žaidėjas „%s“ turi DI meistriškumo lygį „%s“."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "DI nekontroliuoja %s."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Numatytas DI meistriškumo lygis nustatytas į „%s“."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Å i komanda skirta tik klientui."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Naudojimas: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Tik žaidėjai gali naudoti away komandą"
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s dabar yra nutolimo režime."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s grįžo į žaidimą."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr ""
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Nežinomas parametras „%s“."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Visos parinktys su nestandartinėmis reikšmėmis"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Visi nustatymai"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Gyvybiškai svarbios nuostatos"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Nuostatos, priklausomos nuo situacijos"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Retai naudojamos nuostatos"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ reiškia, kad Jūs galite keisti parinktį"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= reikškia, kad parinkčiai nustatyta standartinė reikšmė"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr ""
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Nuostata"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "aprašymas"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Negalima pakeisti komandų žaidimui prasidėjus."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr ""
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 "Nėra tokios komandos %s.  Pateikite galiojantį komandos vardą arba numerį."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Negalite sudaryti komandos su barbaru."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Žaidėjas %s priskirtas komandai %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr ""
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "StebÄ—tojai balsuoti negali."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -5550,461 +5569,489 @@ msgstr ""
 "Balsuoti galima tik vykstančiame žaidime.  Įveskite 'first' norėdami tapti "
 "žaidimo organizatoriumi, jei jo dabar nėra."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr ""
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Nevyksta balsavimas."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "NÄ—ra tinkamo paskutinio balso."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Vertė turi būti sveikasis skaičius."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "NÄ—ra tokio balso (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Balsavai už „%s“"
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Balsavai prieš „%s“"
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Vertės 2 ir 3 turi būti sveikieji skaičiai."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Blogos žemėlapio koordinatės."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Nurodytomos koordinatÄ—mis miestas nerastas."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr ""
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr ""
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Vertė 2 turi būti sveikasis skaičius."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Dalinys %d neegzistuoja."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Jums neleidžiama nustatyti šios parinkties."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr ""
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Vertė turi būti sveikasis skaičius."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Reikšmė yra už ribų (minimali: 0, maksimali: 1)"
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Parinktis %s buvo nustatyta į %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Reikšmė yra už ribų (minimali: %d, maksimali: %d)"
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr ""
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Parinktis %s buvo nustatyta į \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr ""
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Rankiniu būdu šiame serveryje žaidmų išsaugoti negalite."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr ""
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr ""
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr ""
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s jau stebi %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s jau stebi."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s dabar stebi %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s dabar stebi"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Naudojimas: take <žaidėjo-vardas>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr ""
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s jau kontroliuoja %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Nėra nei žaidėjo, nei ryšio vardu %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "yra atjungiamas nuo %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s dabar kontroliuoja %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbaras"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "DI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Žmogus"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Gyvas"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Miręs"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s nėra prisijungęs prie jokio žaidėjo."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Naudojimas: detach <ryšio-pavadinimas>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Jūs negalite atjungti kitų žaidėjų."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s nėra prisijungęs prie jokio žaidėjo."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s atsijungia nuo %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s daugiau nebestebi."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "atsijungiama nuo %s"
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Naudojimas: load <žaidimo pavadinimas>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "Neįmanoma įkelti žaidimą, kol kitas veikia."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "Negalima įkelti išsaugoto žaidimo: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr ""
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Viso."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Apgailestaujame, bet Jums neleidžiama naudotis serverio komandomis."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Nežinoma komanda. Bandykite '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Jūsų naujas balsas panaikino ankstesnį jūsų balsą."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Jums neleidžiama naudoti šios komandos."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(serverio žinutė)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Žaidimas baigėsi lygiosiomis."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Baigiamas žaidimas. Serveris pasileis iš naujo, kai visi klientai atsijungs."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Žaidimo baigti negalime, nes nevyksta joks žaidimas."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Å iuo metu negalite pasiduoti."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
+msgstr "Žaidimas neprasidės, nes per mažai žaidėjų."
+
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
 msgstr "Žaidimas neprasidės, nes per mažai žaidėjų."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Žaidimas neprasidės, nes per mažai žaidėjų."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Visi žaidėjai pasiruošę; paleidžiamas žaidimas."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "Negalima paleisti žaidimo, nes žaidimas laukia, kol atsijungs visi klientai."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Negalime paleisti žaidimo, nes jis jau vyksta."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Atjungiamas susijungimas %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6025,77 +6072,77 @@ msgid ""
 "  quit   -  to exit"
 msgstr ""
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Komanda:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "ReziumÄ—: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Lygis: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Å ios serverio komandos yra galimos:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Pagalbos argumentas „%s“ yra dviprasmiškas."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr ""
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr ""
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Žaidėjų sąrašas:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<nėra žaidėjų>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "vartotojas %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Miręs"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", sunkumo lygis %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", pasiruošęs"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", nepasiruošęs"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
@@ -6103,21 +6150,21 @@ msgstr[0] " %d susijungimas:"
 msgstr[1] " %d susijungimai:"
 msgstr[2] " %d susijungimų:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "   %s iš %s (priėjimo lygis yra %s), buferio dydis=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (stebėjimo reežimas)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Komandų sąrašas:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
@@ -6125,25 +6172,25 @@ msgstr[0] "%2d : '%s' : %d žaidėjas"
 msgstr[1] "%2d : '%s' : %d žaidėjai"
 msgstr[2] "%2d : '%s' : %d žaidėjų"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 žaidėjas : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Tuščia komanda: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Prisijungimų prie serverio sąrašas:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<nėra susijungimų>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Galimų scenarijų sąrašas:"
 
@@ -6213,17 +6260,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Tyrimų tikslas yra %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Pavogei %s iš %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%s iš tavęs pavogė %s!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%s pavogė %s iš %s."
@@ -6748,20 +6795,20 @@ msgstr "Pastangos pastatyti stebukla mieste %s žlugo."
 msgid "Your %s has invalid orders."
 msgstr "Jūsų %s gavo klaidingus nurodymus."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Didelis sausumos kiekis, todėl tai gali užtrukti kelias sekundes."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Grįžtama į generatorių %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "3 generatorius nepaskirstė didelių salų."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "3 generatorius paliko %li sausumos nepaskirstęs."
@@ -6847,16 +6894,17 @@ msgstr "Galbūt kalta bloga konfigūracija arba uždrausta prieiga"
 msgid "Cannot find audio file %s"
 msgstr "Negaliu rasti audio failo %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX ėjimų"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d aukso per Ä—jimÄ…"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
@@ -6864,30 +6912,30 @@ msgstr[0] "%3d Ä—jimas"
 msgstr[1] "%3d Ä—jimai"
 msgstr[2] "%3d ėjimų"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "niekada"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/Ä—jimÄ…"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
@@ -6895,74 +6943,74 @@ msgstr[0] "%s (%d) %d Ä—jimas"
 msgstr[1] "%s (%d) %d Ä—jimai"
 msgstr[2] "%s (%d) %d ėjimų"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Pasenęs"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Pastatyta"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Didysis stebuklas"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Mažasis stebuklas"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/Ä—jimÄ…"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Piliečiai\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr ""
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr ""
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Netvarka\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -7075,8 +7123,8 @@ msgid "Best defending units"
 msgstr "Geriausiai besiginantys daliniai"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7252,8 +7300,8 @@ msgstr "?pollution [short]:Tar"
 msgid "?cma:Governor"
 msgstr "?cma:Valdytojas"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7508,19 +7556,19 @@ msgid ""
 "%d times"
 msgstr ""
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "pradedantis"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "lengvas"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "vidutinis"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "sunkus"
 
@@ -7528,31 +7576,31 @@ msgstr "sunkus"
 msgid "experimental"
 msgstr "eksperimentinis"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Paleidžiamas serveris..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Negaliu paleisti serverio."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Jūs turite paleisti vieną rankiniu būdu. Apgailestaujame..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Negalima prisijungti prie serverio."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Mes tikriausiai iš čia negalime jo paleisti."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr ""
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "Mes negalime kontroliuoti serverio, bandome jį išjungti."
 
@@ -7638,27 +7686,27 @@ msgstr "Tinka tik %s.\n"
 msgid "Requires a minimum size of %d.\n"
 msgstr "Reikalauja minimalaus dydžio %d.\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Leidžia %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Leidžia %s (kartu su %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " UpÄ—s"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Apgailestaujame, nÄ—ra pagalbos temai%s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -7669,7 +7717,7 @@ msgstr ""
 "Šis puslapis buvo automatiškai sugeneruotas.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
@@ -7677,58 +7725,58 @@ msgstr ""
 "Reikalauja: Nieko.\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* %s atradimas padarys %s nebenaudingÄ….\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* Leidžia visiems žaidėjams su %s žiniomis statyti %s dalinius.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Leidžia %s (kartu su %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Leidiža %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Gali būti pastatytas tik, kai mieste yra %s.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Gali būti pastatytas tik, kai vyriausybė yra %s.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Negali būti statomas miestuose.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Niekada neturi gimtojo miesto.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Prarasdami šį dalinį Jūs pralaimėsite žaidimą!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "*Kiekvienas žaidėjas gali turėti tik vieną šio tipo dalinį.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Reikalauja %d gyventojų, kad pastatytum.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
@@ -7736,7 +7784,7 @@ msgstr[0] "* Gali nešti ir papildyti degalais %d aviacijos dalinį.\n"
 msgstr[1] "* Gali nešti ir papildyti degalais %d aviacijos dalinius.\n"
 msgstr[2] "* Gali nešti ir papildyti degalais %d aviacijos dalinių.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, fuzzy, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -7746,7 +7794,7 @@ msgstr[1] ""
 msgstr[2] ""
 "* Gali nešti ir papildyti degalais %d aviacijos dalinių iš klasių:\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, fuzzy, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
@@ -7756,220 +7804,220 @@ msgstr[1] ""
 msgstr[2] ""
 "* Gali nešti ir papildyti degalais %d aviacijos dalinių iš klasių:\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Gali padÄ—ti statyti stebuklus (prideda %d gamybos).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Negali būti išformuotas.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr "* Gali būti išformuotas mieste, atgaunant 50%% gamybos kainos.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Gali statyti naujus miestus.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Gali tiesti kelius ir geležinkelius.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Gali statyti kasyklas.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Gali statyti drÄ—kinimo sistemas.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Gali statyti dirbamąsias žemes.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Gali statyti dirbamąsias žemes (jei %s yra žinomas).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 "* Gali statyti dirbamąsias žemes (jei bent 1 iš šių yra žinomas: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Gali statyti fortus.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Gali statyti fortus (jei %s yra žinomas).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Gali statyti fortus (jei bent 1 iš šių yra žinomas: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Iš laukelių gali išvalyti taršą.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Iš laukelių gali išvalyti radioaktyviąsias dulkes.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Gali transformuoti laukelius.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Gali statyti oro bazes.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* galė plėšti ir taip sunakinti laukelių infrastruktūrą.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Gali atlikti diplomatinius veiksmus ir turi specialių šnipinųjimo "
 "gebėjimų.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Gali atlikti diplomatinius veiksmus.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Niekada nepralaimės diplomatas prieš diplomatą kovos.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Negali būti papirktas.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Gali pulti priešo oro dalinius.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* Yra nematomas išskyrus kai būna šalia priešo dalinio arba miesto.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 "* Gali atakuoti tik jūrų dalinius (negali atakuoti sausumos dalinių).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr ""
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Gali būti išmesti parašiutu iš draugiško miesto (Atstumas: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr ""
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr ""
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 #, fuzzy
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "  * Sunaudojamas įvykdžius ataką.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Atakos įvykdymas reiškia šio dalinio ėjimo baigtį.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Šio dalinio ataka sukelia branduolinį sprogimą!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "Puolamoji galia padvigubÄ—ja puolant miestus.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignoruoja miesto sienų efektus.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr ""
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignoruoja valdymo zonas.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Niekada netaps veteranu.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Kovodamas arba treniruodamasis gali tapti veteranu.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
 "at sea.\n"
 msgstr ""
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* %s atradimas sumažina riziką iki 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s sumažina riziką iki 12%%.\n"
@@ -7978,15 +8026,15 @@ msgstr "* %s sumažina riziką iki 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " arba "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
@@ -7994,102 +8042,102 @@ msgstr[0] "* Dalinys turi būti mieste arba ant %s po %d ėjimo.\n"
 msgstr[1] "* Dalinys turi būti mieste arba ant %s po %d ėjimų.\n"
 msgstr[2] "* Dalinys turi būti mieste arba ant %s po %d ėjimų.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Jei dabar pradėtume su %s, mums reikėtų %d lempučių."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
 "will require %d bulbs to complete."
 msgstr ""
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Jūs negalite išrasti šios technologijos."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 " Šis skaičius gali kisti priklausomai nuo to, ką kiti žaidėjai išras.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* Pirmasis žaidėjas, atradęs %s, iš karto gauna papildomą technologiją.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Sumažina riziką iki 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Sumažina riziką iki 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Padidina gyventojų sukuriamą taršą.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* %s gali statyti kelius upių laukeliuose.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Leidžia %s statyti fortus.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Leidžia %s statyti oro bazes.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Leidžia %s patobulinti kelius į geležinkelius.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Leidžia %s patobulinti drėkinimą į dirbamąją žemę.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Toks reljefas negali būti užterštas."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Ant tokio reljefo negalite statyti miestų."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Å io reljefo pakrantÄ— nesaugi."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Å is reljefas nesaugus keliauti daliniams."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "Sausumos daliniai negali keliauti vandenynais."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "SavybÄ—s:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr "?outputlist: Nieko "
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8107,7 +8155,7 @@ msgstr[2] ""
 "* Kariniai daliniai toli nuo namų ir lauko daliniai %d gyventojus padarys "
 "nelaimingÄ….\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8115,23 +8163,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, fuzzy, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* Fanatikams nereikia išlaikymo.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 #, fuzzy
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* Fanatikams nereikia išlaikymo.\n"
@@ -8139,25 +8187,25 @@ msgstr "* Fanatikams nereikia išlaikymo.\n"
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "* Pilietinio karo tikimybÄ— yra %d%%, jei prarasi savo sostinÄ™.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8165,25 +8213,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 "Maksimali norma, kuriÄ… galite nustatyti mokslui, auksui ir prabangai yra %d%"
 "%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "Turi neribotus mokslo/aukso/prabangos tarifus.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8195,7 +8243,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8204,7 +8252,7 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8213,53 +8261,53 @@ msgstr ""
 "* Jūsų miestai gali augti švęsdami.  Miestai turi būti mažiausiai %d dydžio, "
 "kad jie galėtų augti šiuo būdu.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Jūsų daliniai negali būti papirkti.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Jūsų miestai negali būti pakurstyti.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Turi senatÄ…, kuris gali sutrukdyti karo paskelbimui.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr "* Leidžia partizanus, kai miestus užima priešai.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* Fanatikams nereikia išlaikymo.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* Neturi nelaimingų piliečių.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* Veteranų daliniai %s.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Daliniai veteranai.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8267,7 +8315,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8275,71 +8323,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* %s Å¡vaistymas greitai didÄ—s didÄ—jant atstumui nuo sostinÄ—s.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* %s Å¡vaistymas didÄ—s didÄ—jant atstumui nuo sostinÄ—s.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr "* %s Å¡vaistymas lÄ—tai didÄ—s didÄ—jant atstumui nuo sostinÄ—s.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Leidžia tau statyti %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d nepatenkintų"
@@ -8731,16 +8779,16 @@ msgstr "Serverio galimybių eilutė: %s"
 msgid "Start of turn %d"
 msgstr "%d ėjimo pradžia"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "DI režimas dabar yra  %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "Įjungta"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "IÅ¡jungta"
 
@@ -8771,13 +8819,13 @@ msgstr "?Player:Vardas"
 msgid "Username"
 msgstr "Vartotojo vardas"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "VÄ—liava"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -8791,7 +8839,7 @@ msgstr "Siena"
 msgid "Score"
 msgstr "Taškai"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Komanda"
 
@@ -8824,36 +8872,36 @@ msgstr ""
 msgid "Ping"
 msgstr ""
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Jūs negalite parduoti patobulinimų."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Parduota %d %s už %d aukso."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Joks %s negali būti parduotas."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Negali išformuoti dalinių."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s negali būti išformuotas."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "IÅ¡formuotas %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Joks %s negali būti išformuotas."
@@ -9172,64 +9220,68 @@ msgstr "Auksas: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr ""
 
-#: client/text.c:606
+#: client/text.c:607
+msgid "Moving: Nobody"
+msgstr ""
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr ""
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Paspauskite norėdami sužinoti daugiau informacijos)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s žmonių"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Ä–jimas: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Aukso: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr ""
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr ""
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "TyrinÄ—jama %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Globalinio atšilimo tikimybė: %d%% (%+d%%/ėjimą)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Branduolinės žiemos tikimybė: %d%% (%+d%%/ėjimą)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "VyriausybÄ—: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9238,21 +9290,21 @@ msgstr[1] "%d daliniai"
 msgstr[2] "%d dalinių"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Ä–jimai iki tikslo: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr ""
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
@@ -9260,34 +9312,34 @@ msgstr[0] "Pažymėtas %d dalinys"
 msgstr[1] "Pažymėti %d daliniai"
 msgstr[2] "Pažymėti %d dalinių"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Daliniai nepažymėti."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Nėra tobulintinų dalinių!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Nei vienas iš šių dalinių negali būti patobulintas."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9305,72 +9357,72 @@ msgstr[2] ""
 "Patobulinti %d dalinių už %d aukso?\n"
 "Ižde yra %d aukso."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Rodo Jūsų pažangą, beieškant dabar nustatytos technologijos."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "Nėra paieškų tikslo."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Rodo globalinio atšilimo eigą:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Užterštumo norma: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Katastrofinio klimato atšilimo tikimybė kiekvienu ėjimu: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Rodo branduolinės žiemos galimybės progresą:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Radioaktyvių dulkių kritimo norma: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Branduolinės žiemos pasireiškimo tikimybė kiekvienu ėjimu: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Rodo Jūsų dabartinę vyriausybę:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Gyventojai:      %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Palaikymas:      %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energija:        %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9379,97 +9431,97 @@ msgstr[1] "Mass:           %5d tonos"
 msgstr[2] "Mass:            %5d tonų"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "KelionÄ—s laikas: %5.1f years"
 
 # Kaip išvert N/A?
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "KelionÄ—s laikas:     N/A"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "SÄ—kmÄ—s tikim.:   %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Atvykimo metai: %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:išjungta"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dd %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr ""
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr ""
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr ""
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "StebÄ—tojas: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Pastatai: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "NÄ—ra. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Stebuklai: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr ""
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9478,7 +9530,7 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9487,16 +9539,16 @@ msgstr[1] "* Neturi nelaimingų piliečių.\n"
 msgstr[2] "* Neturi nelaimingų piliečių.\n"
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr ""
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "nÄ—ra maksimumo,"
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9505,20 +9557,20 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr ""
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Kariniai daliniai lauke gali kelti nepasitenkinimÄ…."
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Kariniai daliniai neveikia laimingumo efekto. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Prabanga: %d iš viso."
@@ -9559,12 +9611,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "nÄ—ra"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "pasirinktinis"
 
@@ -9610,11 +9662,13 @@ msgid "Ooops..."
 msgstr "Ooops..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Šis dalinys negali būti papirktas!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -9631,6 +9685,7 @@ msgstr "Papirkti priešo dalinį"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -9671,6 +9726,7 @@ msgstr "_Pasiekimai:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Šnipo nuožiūra"
 
@@ -9695,12 +9751,13 @@ msgstr "_Patobulinimai"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Miesto produkcija"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "JÅ«s negalite sukleti revoliucijos mieste %s."
@@ -9712,6 +9769,7 @@ msgstr "Mieste negali būti sukelta revoliucija."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -9728,6 +9786,7 @@ msgstr "Pakurstyti revoliucijÄ…!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -9737,6 +9796,7 @@ msgstr ""
 "Ižde yra %d aukso."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -9806,10 +9866,12 @@ msgid "Subvert Enemy Unit"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr ""
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Pone, šnipas laukia jūsų nurodymų"
@@ -9910,7 +9972,7 @@ msgstr "Tarša:"
 msgid "_Overview"
 msgstr "_Apžvalga"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -9937,11 +9999,11 @@ msgid "%d/%d %d turns"
 msgstr ""
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Pirkti"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr "_Gamyba"
 
@@ -10060,7 +10122,7 @@ msgstr "Palaikomi daliniai %d"
 msgid "Present units %d"
 msgstr "Esantys daliniai %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr ""
 
@@ -10149,31 +10211,31 @@ msgstr "Pervadinti miestÄ…"
 msgid "What should we rename the city to?"
 msgstr "Kaip mes turÄ—tume pervadinti miestÄ…?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_Keisti"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Pašymėti"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr "_Rodyti"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10183,12 +10245,12 @@ msgstr "_Rodyti"
 msgid "Cities"
 msgstr "Miestai"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr ""
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10197,85 +10259,90 @@ msgstr ""
 msgid "Improvements"
 msgstr "Patobulinimai"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Stebuklai"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Visi miestai"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Nėra miestų"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Invertuoti pažymėjimą"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Statomi dalinai"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Statomi patobulinimai"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Statomi stebuklai"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Statomas dalinys"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Statomas patobulinimas"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Statomas stebuklas"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "PakrantÄ—s miestai"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Ta pati sala"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Palaikomi daliniai"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Esantys daliniai"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Miesto patobulinimai"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Stebuklai mieste"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Prieinami daliniai"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Prieinami patobulinimai"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Prieinami stebuklai"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Visa kaina:"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10337,124 +10404,124 @@ msgstr ""
 msgid "Remove this preset?"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "JÅ«s sakote, kad norite revoliucijos?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revoliucija!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "KÄ… plÄ—Å¡ti"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Pasirinkite, kÄ… plÄ—Å¡ti:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Dalinys"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Vardas"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Dalinio pasirinkimas"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_Paruošti visus"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr ""
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
 msgstr "Tautų _grupės:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Kokia tauta Jūs būsite?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Pasirinkite tautÄ…"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "AtsitiktinÄ— tauta"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "IÅ¡sirinkite tautÄ…"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_YpatybÄ—s"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Vadovas"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Moteris"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Vyras"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "_Miestų stilius"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "_Legenda"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Jūs privalote nurodyti savo lytį."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Jūs privalote nurodyti miestų stilių."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Jūs turite įvesti galiojantį vardą."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Patobulinti dalinį!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -10700,61 +10767,67 @@ msgstr ""
 msgid "Not _ready"
 msgstr "_Nepasiruošęs"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Pasiruošęs"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_PradÄ—ti"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Pasiimti šitą žaidėją"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "IÅ¡sirink _tautÄ…"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_StebÄ—ti"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "_NebestebÄ—ti"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<DI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<Pradedantysis DI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<Lengvas DI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<Vidutinis DI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<Sunkus DI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "AtsitiktinÄ—"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "StebÄ—tojas"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Atsijungęs"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Ar tikrai norite išeiti?"
 
@@ -11665,216 +11738,216 @@ msgstr "_Prisijungti prie tinklo žaidimo"
 msgid "Connect to Gaming _Zone"
 msgstr "Prisijungti prie tinklo žaidimo"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Slaptažodžiai nesutampa. Įvesk slaptažodį."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Serverio pavadinimas"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Prievadas"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versija"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "BÅ«sena"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Žaidėjai"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Komentaras"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "_Vietinis tinklas"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Interneto _metaserveris"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Prievadas:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "_Slaptažodis"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "_Patvirtinti slaptažodį"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "'_Prisijungti"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Ryšio pavadinimas: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Žaidėjo vardas: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Mazgas: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s informacija"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Pasirinkite tautÄ…"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Stebėti šį žaidėją"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Pasiimti šitą žaidėją"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Nutraukti susijungimÄ…"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Pašalinti žaidėją"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "Priimti į %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "_Žaidėjų skaičius (įskaitant DI):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "_DI meistriškumo lygis:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Daugiau žaidimo _nustatymų"
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Įrašas"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Reitingas"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Pasiruošęs"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Vadas"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Pasirinkite išsaugotą žaidimą įkėlimui"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Pasirinkite išsaugotą žaidimą į_kėlimui:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Naršyti..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Pasirinkite scenarijų"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Pasirinkite _scenarijų"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Tipas"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Išsaugoti žaidimą"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "_Išsaugoti žaidimai:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr ""
 
@@ -11910,7 +11983,7 @@ msgstr "?Building:Pavadinimas"
 msgid "Count"
 msgstr ""
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12153,28 +12226,28 @@ msgstr "_Darbų sąrašai:"
 msgid "Edit Global _Worklists"
 msgstr "Keisti globalius _darbų sąrašus"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Ä–jimai"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Rodyti _būsimus objektus"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "_Keisti produkcijÄ…"
 
@@ -12469,8 +12542,8 @@ msgid "City shrinks: %d %s"
 msgstr "Miestas mažėja: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12575,11 +12648,11 @@ msgstr "KarinÄ— ataskaita"
 msgid "Maintenance Report"
 msgstr "IÅ¡laikymo ataskaita"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "darbų sąrašas"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -12997,21 +13070,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Naudojama vaizdo išvestis: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Paleidžiamas klientas"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Laukiama žaidimo pradžios"
 
@@ -14302,7 +14375,7 @@ msgstr "Miesto stilius:"
 msgid "Unit Selection"
 msgstr "Dalinio pasirinkimas"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "NÄ–RA"
 
diff --git a/po/nb.gmo b/po/nb.gmo
index 9bf2bc3..faf4892 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index 7e80f31..e277260 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-09-01 22:28+0300\n"
 "Last-Translator: Per I. Mathisen <per at freeciv.org>\n"
 "Language-Team: Norwegian <andrearo at stud.ntnu.no>\n"
@@ -60,22 +60,22 @@ msgstr "Luksus"
 msgid "Science"
 msgstr "Forskning"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:B"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:u"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:f"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:B"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:u"
-
 # problem
 #: common/connection.c:515
 #, c-format
@@ -504,82 +504,82 @@ msgstr "Tilkobling under opprettelse."
 msgid "AI Debug messages"
 msgstr ""
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "Folkemorder"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "Ekstremt fiendtlig"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "Fiendtlig"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "Lite samarbeidsvillig"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "Vanskelig"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "Nøytral"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "Respektfull"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "Hjelpsom"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "Entusiastisk"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "Beundrende"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "Bønnfallende"
 
-#: common/player.c:759
+#: common/player.c:764
 #, fuzzy
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Allianse"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Krig"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Våpenhvile"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Fred"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Allianse"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Aldri møtt"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Lag"
 
@@ -625,13 +625,13 @@ msgstr " enhet"
 msgid "Size %d"
 msgstr "Størrelse"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Forsker på Framtidsteknologi %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -643,67 +643,67 @@ msgstr "Forsker p
 msgid "None"
 msgstr "Ingen"
 
-#: common/tech.c:790
+#: common/tech.c:798
 #, fuzzy
 msgid "Future Tech."
 msgstr "Forsker på Framtidsteknologi %d"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Ukjent)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Vei"
 
 # irrigert er tillatt på norsk, men skulle gjerne hatt et bedre ord
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Irrigert land"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Jernbane"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Gruve"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Forurensning"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Hytte"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Festning"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Elv"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Dyrket land"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Flystripe"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Atomavfall"
 
@@ -813,11 +813,11 @@ msgstr "Atombombe"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " og "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?og:, "
 
@@ -977,79 +977,79 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (totalt %d gjentakelse)"
 msgstr[1] " (totalt %d gjentakelse)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Mangler argument for \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Mangler argument for \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d f.Kr"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d e.Kr"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH er satt til å være tom, benytter standard PATH i stedet."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Klarte ikke å lese fra datakatalogen %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "Datastien kan settes via (environment) miljøvariablen FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Nåværende datasti er: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Den nødvendige filen \"%s\" mangler...   avslutter!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Fatal feil: du forsøker å kjøre meg som superbruker!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Bruk en ikke-priviligert konto istedet.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "eksakt treff"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "eneste treff"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "uklar"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "tom"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "for lang"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "ikke treff"
 
@@ -1078,91 +1078,91 @@ msgstr "%s har startet byggingen av %s i %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s selger %s (ikke nødv.) for %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, fuzzy, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "* %s (AI)* AI kan ikke signere noe avtaler i bortemodus"
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, fuzzy, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (AI)* Bryt først alliansen med %s, %s"
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, fuzzy, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (AI)* La oss først få slutt på fiendtlighetene, %s"
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr "*%s (AI)* Du slipper ikke unna så lett, %s. Avtalen gjelder fortsatt."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, fuzzy, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (AI)* Bryt først alliansen med %s, %s"
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr ""
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (AI)* Beklager, å dele utsyn med deg er ikke lenger trygt."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* Velkommen til vår allianse %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, fuzzy, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* Ja, måtte vi stå sammen for alltid, %s"
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* Ja, fred i vår tid!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, fuzzy, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)* Avtale. Ingen flere fiendtligheter, %s"
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, fuzzy, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* Ja, fred i vår tid!"
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, fuzzy, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (AI)* Fred i .... en annen gang"
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1171,17 +1171,17 @@ msgstr ""
 "*%s (AI)* Endelig får jeg tak i deg! Trodde du virkelig at du skulle slippe "
 "unna med dine forbrytelser?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, fuzzy, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)* Din aggresjon mot min allierte var din siste tabbe!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1192,14 +1192,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1212,7 +1212,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1223,13 +1223,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1240,12 +1240,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1256,7 +1256,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1267,7 +1267,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1276,7 +1276,7 @@ msgstr ""
 "*%s (AI)* Ditt forsøk på å erobre verdensrommet alene har avslørt dine "
 "virkelige motiver, og derfor avbryter jeg alliansen vår!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1284,7 +1284,7 @@ msgid ""
 msgstr ""
 "*%s (AI)* Ditt forsøk på å alene dominere verdensrommet er meget truende."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1293,12 +1293,12 @@ msgstr ""
 "*%s (AI)* Dersom du ikke slutter å bygge ditt romskip, kan jeg måtte ta "
 "aksjon!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr "*%s (AI)* Beklager, å dele utsyn med deg er ikke lenger trygt."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1307,7 +1307,7 @@ msgstr ""
 "*%s (AI)* Vær hilset, vår mest troverdige allierte. Vi trenger din hjelp til "
 "å ødelegge vår fiende, %s"
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1316,7 +1316,7 @@ msgstr ""
 "*%s (AI)* Vær hilset, vår allierte. Jeg ser at du ikke har startet krig mot "
 "vår fiende, %s. Hvorfor må jeg minne deg på dine løfter?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1327,19 +1327,19 @@ msgstr ""
 "fredsavtalen med vår fiende, %s! Dette er uakseptabelt, derfor oppløser jeg "
 "vår allianse!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr "*%s (AI)* Vår venn, kan vi foreslå et samlet angrep mot %s?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, fuzzy, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr "*%s (AI)* Vår nabo, kan vi foreslå et samlet angrep mot %s?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1347,7 +1347,7 @@ msgid ""
 msgstr ""
 "*%s (AI)* %s truer oss begge, skal vi foreslå at fiendtlighetene opphører?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1355,59 +1355,64 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Alle alternativer"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (veteran)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Det navnet er ikke tillat."
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Klarer ikke å finne lydfilen %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr "Advarsel: gjestenavnet '%s' har blitt tatt, bytter navn til '%s'."
 
 #
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Gjester er ikke tillatt på denne tjeneren. Beklager."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, fuzzy, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s ble vist bort. Manglet egenskaper."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1416,7 +1421,7 @@ msgstr ""
 "Det har oppstått en feil ved lesing av bruker-databasen, oppretter "
 "forbindelse som gjest '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1424,39 +1429,39 @@ msgstr ""
 "Det har oppstått en feil ved lesing av bruker-databasen. Gjeste-forbindelser "
 "er ikke lov."
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Skriv inn passord for %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Skriv inn et nytt passord (og husk det)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Denne tjeneren krever forhåndsregistrering. Beklager."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, fuzzy, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "Denne tjeneren krever forhåndsregistrering. Beklager."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Beklager, for mange gale forsøk..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1464,31 +1469,31 @@ msgstr ""
 "Advarsel: Det har oppstått en feil ved lagring til brukerdatabasen. "
 "Fortsetter uten å lagre resultatene."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, fuzzy, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s ble vist bort. Manglet egenskaper."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Passordet er feil. Prøv igjen."
 
-#: server/auth.c:549
+#: server/auth.c:569
 #, fuzzy
 msgid "Sorry, your connection timed out..."
 msgstr "Beklager, luftpatruljering er ikke implementert."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "Passordet er for kort, minimum lengde er %d. Prøv igjen."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2266,16 +2271,14 @@ msgid "Cast a vote."
 msgstr "Stemme."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "En spiller med info tilgangsnivå starter et nytt valg som det må stemmes på "
 "ved hver kommando. /vote kommandoen etterfulgt av \"yes\" eller \"no\", og "
@@ -2286,18 +2289,18 @@ msgstr ""
 "Dersom en hel runde går uten at noen stemmer mot et valg, så blir det "
 "vedtatt automatisk."
 
-#: server/commands.c:122
+#: server/commands.c:121
 #, fuzzy
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr "debug [ spiller <spiller> | by <x> <y> | enhet <x> <y> | enhet <id>]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Slår av eller på AI debugging for en gitt entitet."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2305,23 +2308,23 @@ msgstr ""
 "Skriver ut AI debug informasjon om en gitt entitet og skrur av eller på "
 "kontinuerlig utskrift av denne entiteten."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <alternativsnavn> <verdi>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Sett tjeneralternativ."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <spiller> [lag]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Endre, legg til eller fjerne en spillers lagtilhørighet."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2334,15 +2337,15 @@ msgstr ""
 "og ambassader, og sloss sammen for å oppnå lagseier med snittet av de "
 "individuelle poengsummene."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <katalog>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Velg en ny katalog for regeloppsett."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2351,15 +2354,15 @@ msgstr ""
 "Å kalle denne uten argument vil vise deg det nåværende regeloppsettet."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <metalinje>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Sett metaserver infolinje."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2368,19 +2371,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <metalinje>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Sett metaserver endringslinje."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Kontroller metaserver forbindelse."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2393,33 +2396,33 @@ msgstr ""
 "metaserveren."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <addresse>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Sett adressen (URL) for metaserveren det skal rapporteres til."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <spillernavn>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Bytt spillers AI-status."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [forbindelses-navn] <spillernavn>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Ta over en spillers plass i spillet."
 
-#: server/commands.c:185
+#: server/commands.c:184
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2435,15 +2438,15 @@ msgstr ""
 "tilkoblet som global observatør."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [forbindelses-navn] [spillernavn]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Observere en spiller eller hele spillet."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2458,15 +2461,15 @@ msgstr ""
 "tilkoblet som global observatør."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <forbindelsesnavn>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "Fraskilles fra en spiller."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2475,20 +2478,20 @@ msgstr ""
 "forbindelser til å ta over en spiller. "
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <spillernavn>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Opprett en AI spiller med gitt navn."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "'create' kommandoen er kun tilgjengelig før spillet har startet."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2496,16 +2499,16 @@ msgstr ""
 "borte\n"
 "borte"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Setter deg i borte-modus. AI'en vil holde orden for deg."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "AI styrer din nasjon, men gjør ingen store endringer."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2513,11 +2516,11 @@ msgstr ""
 "novice\n"
 "novice <spillernavn>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Sett en eller alle AI-spillere til 'novice'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2529,7 +2532,7 @@ msgstr ""
 "vanskelighetsgraden kun for en spiller."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2537,11 +2540,11 @@ msgstr ""
 "easy\n"
 "easy <spillernavn>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Sett en eller alle AI spillere til 'lett'."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2553,7 +2556,7 @@ msgstr ""
 "vanskelighetsgraden kun for en spiller."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2561,11 +2564,11 @@ msgstr ""
 "normal\n"
 "normal <spillernavn>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Sett en eller alle AI-spillere til 'normal'."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2577,7 +2580,7 @@ msgstr ""
 "kommandoen vanskelighetsgraden kun for en spiller."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2585,11 +2588,11 @@ msgstr ""
 "hard\n"
 "hard <spillernavn>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Sett en eller alle AI spillere til å være vanskelig (hard)."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2601,7 +2604,7 @@ msgstr ""
 "vanskelighetsgraden kun for en spiller."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2609,11 +2612,11 @@ msgstr ""
 "experimental\n"
 "experimental <spiller-navn>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Setter en eller alle AI spillerne til 'experimental'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2628,7 +2631,7 @@ msgstr ""
 "ingen effekt."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2642,11 +2645,11 @@ msgstr ""
 "cmdlevel <nivå> first\n"
 "cmdlevel <nivå> <forbindelsesnavn>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Be om eller sett kommando tilgangsnivå."
 
-#: server/commands.c:276
+#: server/commands.c:275
 #, fuzzy
 msgid ""
 "The command access level controls which server commands are available\n"
@@ -2686,20 +2689,20 @@ msgstr ""
 "kan koble til med det samme navnet. Legg merke til at denne kommandoen nå "
 "tar imot forbindelsesnavn, ikke spillernavn."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <runde> <rundetillegg> <verdi> <faktor>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Se \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2713,42 +2716,42 @@ msgstr ""
 "Bruk denne kommandoen sammen med \"timeout\". Standardverdiene er 0 0 0 1."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 #, fuzzy
 msgid "endgame"
 msgstr "Endre navn"
 
-#: server/commands.c:311
+#: server/commands.c:310
 #, fuzzy
 msgid "End the game immediately in a draw."
 msgstr "Spillet endte uavgjordt"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr ""
 
-#: server/commands.c:316
+#: server/commands.c:315
 #, fuzzy
 msgid "Concede the game."
 msgstr "Klarte ikke laste inn lagret spill."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <spillernavn>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Fjern spilleren fullstendig fra spillet."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2757,7 +2760,7 @@ msgstr ""
 "enheter.  Brukes med måte!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2765,11 +2768,11 @@ msgstr ""
 "save\n"
 "save <filnavn>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Lagre spill til fil."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2786,7 +2789,7 @@ msgstr ""
 "og bruk 'start' kommandoen når alle spillerne har koblet til på nytt."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2794,11 +2797,11 @@ msgstr ""
 "load\n"
 "load <filnavn>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Fortsette et spill fra fil."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2807,28 +2810,28 @@ msgstr ""
 "spillere, regeloppsett og tjeneralternativ vil forsvinne.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <filnavn>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Utfør tjenerkommandoer fra fil."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <filnavn>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Skriv oppsettet som blir brukt nå til en fil som tjenerkommandoer."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Endre tjener-utskrifter mellom 'RFC-style' og vanlig."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Returnerer identiteten til tjeneren."
 
@@ -3348,26 +3351,35 @@ msgstr "Du har for
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s har forårsaket en skandale ved å oppmuntre til opprør i %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr "Startende sjøenheter er ikke støttet. Ingen får %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "År: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Rundens tidsfrist har oversteget sin maksimale verdi, setter til maksimum"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Rundens tidsfrist er mindre enn null, setter den til null."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3411,11 +3423,11 @@ msgstr "Der er ingen forbindelse med navn %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Der er ingen spiller eller forbindelse med navn %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Det har skjedd en global oppvarming!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
@@ -3423,17 +3435,17 @@ msgstr ""
 "Kyststriper har blitt oversvømt og enorme områder grassland har blitt til "
 "ørken."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Atomvinter har oppstått!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Våtområder har tørket opp og enorme områder med grassland har blitt til "
 "tundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3443,7 +3455,7 @@ msgstr ""
 "jernbanen blir kunngjort.\n"
 "      Arbeiderne samler seg til dugnad og bygger jernbane i samtlige byer."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3453,12 +3465,12 @@ msgstr ""
 "jernbanen.\n"
 "      Arbeiderne samler seg til dugnad og bygger jernbane i samtlige byer."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, fuzzy, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Flyttet din %s på grunn av transformasjon fra sjø til land."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, fuzzy, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Oppløste din %s på grunn av transformasjon fra land til sjø."
@@ -3517,53 +3529,53 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr "Du kan velge en ny regjeringsform fra regjeringsmenyen."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Skattenivået er høyere enn max nivå for %s; justert."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Forskningsnivået er høyere enn maksnivået for %s; justert."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Luksusnivået er høyere enn maksnivået for %s; justert."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s gir oss ikke lengre delt utsyn!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 "Senatet vedtar lovforslaget ditt pga de konstante provokasjonene fra %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Den diplomatiske status mellom %s og %s er nå %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3572,14 +3584,14 @@ msgstr ""
 "%s avbrøt den diplomatiske avtalen! Det diplomatiske forholdet mellom %s og %"
 "s er nå %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 "%s har angrepet din allierte %s! Du avbryter alliansen din med angriperen."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3588,43 +3600,43 @@ msgstr ""
 "Spilleren %s som du er på lag med har erklært krig mot %s. Du må avbryte "
 "alliansen med %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Fjernet spiller %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Du har blitt fjernet fra spillet!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s har blitt fjernet fra spillet."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Du har oppnådd kontakt med %s, styrt av %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, fuzzy, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 "%s har angrepet din allierte %s! Du avbryter alliansen din med angriperen."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Kunne ikke starte borgerkrig for %s - for mange spillere"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Kunne ikke starte borgerkrig for %s - for mange spillere"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3633,12 +3645,12 @@ msgstr ""
 "Din nasjon er splittet i en borgerkrig.\n"
 "       %s er proklamert leder for de opprørske fylkene."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s proklamerer allianse med %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3875,21 +3887,21 @@ msgstr "."
 msgid "th"
 msgstr "."
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Demografi tekststrengen inneholder ugyldige bokstaver. Prøv \"help demography"
 "\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Demografi-rapport:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Beklager, demografirapport er ikke tilgjengelig."
 
-#: server/report.c:746
+#: server/report.c:748
 #, fuzzy, c-format
 msgid "The %s of the %s (%s)"
 msgstr "Styresett: %s  Nasjon: %s"
@@ -3900,11 +3912,11 @@ msgstr "Styresett: %s  Nasjon: %s"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Kunne ikke finne en lesbar regeloppsettfil med navnet \"%s\"."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Laster inn regeloppsett"
 
@@ -3920,7 +3932,7 @@ msgstr ""
 "lagrede spill, eller det kan tyde på feil ved selve filen. Fortsett på eget "
 "ansvar."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
@@ -3945,13 +3957,13 @@ msgstr ""
 "støttet. Bruker '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3987,7 +3999,7 @@ msgstr "Intern"
 msgid "Networking"
 msgstr "Nettverk"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Alle"
@@ -4009,7 +4021,7 @@ msgstr "Usedvanlig"
 msgid "Changed"
 msgstr "Endre"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4017,7 +4029,7 @@ msgstr ""
 "Tekststrengen for tillatte forbindelser inneholder ugyldige bokstaver.\n"
 " Prøv  \"help allowconnect\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4025,7 +4037,7 @@ msgstr ""
 "Tekststrengen for startende enheter inneholder ugyldige bokstaver. Prøv "
 "\"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4034,15 +4046,15 @@ msgstr ""
 "Tekststrengen for startende enheter inneholder ikke minst en bygrunnlegger.\n"
 "Prøv \"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -4051,11 +4063,16 @@ msgstr ""
 "Antallet spillere er høyere enn den ønskede verdien, beholder den gamle "
 "verdien."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Du har ikke lov å sette dette alternativet."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Størrelsen på kartet (i tusen ruter)."
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4065,12 +4082,12 @@ msgstr ""
 "  size = 4 er et normalt kart med 4000 ruter (standard)\n"
 "  size = 20 er et stort kart med 20000 ruter"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Kartets topologi"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4139,11 +4156,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Metode brukt for å generere kart"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4163,11 +4180,11 @@ msgstr ""
 "standardverdien blir brukt, så vil startpos innstillingen bli basert på "
 "generatoren. Se på \"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Metode brukt for å velge startposisjoner"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4189,36 +4206,36 @@ msgstr ""
 "Generatorene forsøker å lage riktig antall kontinent for valget av start "
 "posisjoner og antallet spillere."
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Om 1x1 øyer skal være med"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0=ingen 1x1 øyer; 1=noen 1x1 øyer"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Om polene er separate kontinenter"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = kontinenter kan tilsluttes polene, 1 = polene er vanligvis separate"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Hele kartet er temperert"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = vanlig planet som jorden; 1 = hele planeten er temperert"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Gjennomsnittelig terreng som er temperert på planeten"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4250,21 +4267,21 @@ msgstr ""
 "0 betyr en meget kalt planet med store polarområder og ingen tropiske "
 "områder."
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Prosent av terrenget som er land"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr "Denne innstillingen gir gjennomsnittelig terreng som blir land."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Mengde åser/fjell"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4272,11 +4289,11 @@ msgstr ""
 "Små verdier gir flate kart, høye verdier gir et mer brattere terreng med "
 "flere åser og fjell."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Mengde vann på land"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4284,11 +4301,11 @@ msgstr ""
 "Små verdier innebærer mye tørt ørkenlandskap, mens høye verdier betyr et "
 "våtere landskap mer sump, jungel or elver."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "'Seed' for tilfeldig generering av kart"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4298,21 +4315,21 @@ msgstr ""
 "(standardverdi) vil en verdi velges basert på klokkeslettet for å gi et "
 "tilfeldig kart."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Vanlig 'seed' for tilfeldighetsfunksjon"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr "For 0 (standardverdi) vil 'seed' bli valgt basert på klokkeslett."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Mengde felt med \"spesielle\" ressurser"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4320,11 +4337,11 @@ msgstr ""
 "Spesielle ressurser forbedrer terrenget de er på. Serverens variabelskala er "
 "deler pr. tusen."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Mengde hytter (mindre stammelandsbyer)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4332,23 +4349,24 @@ msgstr ""
 "Denne innstillingen sier hvor mange hytter som vil bli plassert på kartet. "
 "Hyttene er små stamme-landsbyer som kan utforskes med enheter."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Minimum antall spillere"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Der må være minimum så mange spillere (tilkoblede spillere eller AIer)før "
 "spillet kan starte."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Maksimalt antall spillere"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4358,11 +4376,11 @@ msgstr ""
 "spillet. Når så mange spillere er tilkoblet under forspillet avvises alle "
 "ytterligere spillere som forsøker å tilkoble."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Totalt antall spillere (inkludert datastyrte spillere)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 #, fuzzy
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
@@ -4371,11 +4389,11 @@ msgstr ""
 "Hvis der er færre enn dette antallet spillere når spillet starter, vil "
 "ekstra AI-spillere bli supplert."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Liste over spillerens opprinnelige enheter"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4403,28 +4421,28 @@ msgstr ""
 "  a = Rask angrepsenhet (f.eks. ryttere)\n"
 "  A = Sterke angrepsenhet (f.eks. katapult)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Området hvor startenheter er"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "Dette er radien innenfor hvor startenhetene er fordelt i starten av spillet."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Antall gull pr spiller ved start"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Hver spiller får denne mengden gull utlevert i starten av spillet."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Antall teknologier i starten av spillet tildelt hver spiller"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4436,11 +4454,11 @@ msgstr ""
 "tech_cost_style i regeloppsettet, så vil en stor verdi for techlevel kan "
 "gjøre de neste teknologiene veldig dyre."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 #, fuzzy
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
@@ -4448,11 +4466,11 @@ msgid ""
 "determined by the ruleset or other game settings."
 msgstr "Dette påvirker hvor fort spillere kan forske fram ny teknologi."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Prosentvis \"straff\" ved endring av forskning"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4462,12 +4480,12 @@ msgstr ""
 "overskudd av forskningsverdi mister man denne prosentandelen av det. Dette "
 "gjelder ikke om man akkurat har gjort et fremskritt denne omgangen."
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Tap ved anskaffelse av teknologi fra diplomati"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4480,11 +4498,11 @@ msgstr ""
 "forske på et nytt fremskritt. Forskningsverdien kan bli negativ dersom dette "
 "er ulik null."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Tap ved anskaffelse av teknologi fra erobring"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4495,11 +4513,11 @@ msgstr ""
 "utvikle en ny teknologi. Forskningsverdien kan bli negativ dersom dette er "
 "ulik null."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Tap av forskningspoeng når du får gratis teknologi"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4513,11 +4531,11 @@ msgstr ""
 "å utvikle et nytt fremskritt. Forskningsverdien kan bli negativ dersom dette "
 "er ulik null."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Mat nødvendig for å få vekst i en by"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4527,12 +4545,12 @@ msgstr ""
 "verdien er multiplisert med en faktor som kommer fra regeloppsettet og som "
 "er avhengig av størrelsen på byen."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Prosentandel mat som går tapt når det er behov for akvedukt"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4542,21 +4560,21 @@ msgstr ""
 "Kloakksystem),  mister den dette antallet prosent av sin mat (eller "
 "halvparten dersom den har Kornlager)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Miste størrelse på by for å få full handel"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4568,11 +4586,11 @@ msgstr ""
 "gradvis til 0% (ingen begrensning utenom normal korrupsjon) for byer med "
 "størrelse fulltradesize. Se også notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Største størrelse på en by uten handel"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4582,11 +4600,11 @@ msgstr ""
 "gradvis for byer større enn notradesize og mindre enn fulltradesize. Se også "
 "fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Bystørrelse før folk blir ulykkelige"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4594,11 +4612,11 @@ msgstr ""
 "Før andre faktorer har innvirkning er de første unhappysize innbyggerne i en "
 "by fornøyde, deretter er innbyggerne ulykkelige. Se også cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Antall byer for øket ulykkelighet"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4610,11 +4628,11 @@ msgstr ""
 "også unhappysize. Dette forutsetter Demokrati, for andre regjerninger er "
 "effekten mindre."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Minste avstand mellom byer"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4627,11 +4645,11 @@ msgstr ""
 "2 ruter mellom 2 byer. Hvis det er satt til 0 (standard) så benyttes verdien "
 "i regelsettet i stedet."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Antallet runder mellom hver feiring"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4639,11 +4657,11 @@ msgstr ""
 "Setter antallet runder mellom vekst fra feiring i en by. Når satt til n vil "
 "byen vokse etter å ha feiret i n+1 runder."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Sjanse for ødeleggelse av bygning ved erobring"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4651,11 +4669,11 @@ msgstr ""
 "Når en spiller erobrer en by, så har hver byforbedring denne prosentsjansen "
 "for å bli ødelagt."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Sjanse for å flytte inn i felt etter angrep"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4668,11 +4686,11 @@ msgstr ""
 "blir angrepet om de vinner over den siste fiendtlige enheten. Verdier mellom "
 "0 og 100 gir varierende sannsynlighet for at området blir \"okkupert\"."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Slå av/på auto-angrep på tjeneren."
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4680,11 +4698,11 @@ msgstr ""
 "Dersom denne er satt på, så vil enheter med tilgjengelig flyttpoeng "
 "automatisk vurdere å angripe fiendtlige enheter som beveger seg i nærheten."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Reduser bybefolkning etter angrep"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4700,11 +4718,11 @@ msgstr ""
 "  4 = heli\n"
 "  8 = luft"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Nasjonale grensers radius"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4714,11 +4732,11 @@ msgstr ""
 "angitte radiusen til en by bli eid av den nasjonen. Det er spesielle regler "
 "for sjøruter og ruter som er innenfor radiusen til flere enn en nasjons byer."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Militære enheter innenfor dine grenser fører ikke til ulykkelighet. "
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4726,11 +4744,11 @@ msgstr ""
 "Dersom denne er satt, så vil enheter ikke forårsake ulykkelighet så lenge de "
 "er innenfor dine egne landegrenser."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Mulighet for å utøve diplomati med andre spillere"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4744,11 +4762,11 @@ msgstr ""
 "Ved verdi 3 er diplomati kun lov innen etablerte lag.\n"
 "Ved verdi 4 er diplomati ikke tilgjengelig for noen."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Tillatte bynavn"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4772,11 +4790,11 @@ msgstr ""
 "standardnavnet til en by som tilhører en annen nasjon, med unntak av dersom "
 "det navnet er standardnavnet for den spillerens nasjon også."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Hvor ofte barbarene dukker opp"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4790,19 +4808,19 @@ msgstr ""
 "3 - høy mengde barbarer \n"
 "4 - vandrende horder, massevis av barbarer"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "År for barbarer"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbarer vil ikke dukke opp før dette året"
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Lengen på revolusjoner i antall turer"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4811,11 +4829,11 @@ msgstr ""
 "antall runder. Dersom denne innstillingen er satt til 0, så blir lengden "
 "tilfeldig valgt mellom 1 og 6 runder."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Hvorvidt 'fog of war' skal tillates"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4825,30 +4843,30 @@ msgstr ""
 "til sine egne enheter og byer. Man kan ikke se nye byer, byer som har vokst "
 "eller landskapsforandringer."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Hvorvidt romkappløp tillates"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Hvis dette alternativet er 1, kan spillerne bygge romskip."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Minimum antall byer for borgerkrig"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4858,11 +4876,11 @@ msgstr ""
 "hovedstaden faller. Hvis dette alternativet er satt til sin største verdi "
 "blir det aldri borgerkrig."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Antall turer til kontakt med spiller er tapt"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4872,12 +4890,12 @@ msgstr ""
 "enheter møttes, selv om de ikke har en ambassade. Sett denne verdien til "
 "null for å hindre at spillere kan møtes uten å ha ambassade."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Bygg nytt palass dersom hovedstaden er erobret"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4889,21 +4907,21 @@ msgstr ""
 "de byene som er igjen. Dette er viktig fordi teknologikravet for å bygge et "
 "palass blir ignorert."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Hvorvidt naturlige bynavn skal benyttes"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr "Om dette er valgt styrer bynavnene etter landskapet rundt byen."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Spillere som har lov til å bruke kommandoen take"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4957,11 +4975,11 @@ msgstr ""
 "4 = Ingen kontroller tillatt, overvatør tillatt.\n"
 
 # Adopterer tysk oversettelse
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Automatisk AI-status"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -4969,24 +4987,27 @@ msgstr ""
 "Dersom denne er satt til 1 stenges datastyring av en tilkoblet spillet, og "
 "settes på når en spiller kobler fra."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "År spillet slutter"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Spillet vil avsluttes når dette året utløper."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Maksimalt antall sekunder pr runde"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Hvis ikke alle spillerne har trykket på \"Runde over\" før tidsbegrensningen "
 "er gått ut, vil runden slutte automatisk. Null betyr ingen tidsbegrensning. "
@@ -4994,32 +5015,32 @@ msgstr ""
 "testmodus. Benytt dette med kommandoen \"timeoutincrease\" for å få en "
 "dynamisk tidsbegrensning på rundene."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 #, fuzzy
 msgid "Whether to have simultaneous player phases."
 msgstr "Hvorvidt spillerstatistikk skal logges"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Maksimal klient-blokkering (sekunder)"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5029,11 +5050,11 @@ msgstr ""
 "verdien, så stenges den. Null betyr at det ikke finnes noen tidsbegrensning, "
 "men forbindelser vil bli automatisk frakoblet til slutt."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Maks sekunder for tømming av nettverksbuffer."
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5043,11 +5064,11 @@ msgstr ""
 "forbindelsers buffere skal ublokkeres. Null betyr at serveren ikke kommer "
 "til å vente."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Sekunder mellom PING"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5055,22 +5076,22 @@ msgstr ""
 "Tjeneren kommer til å kontakte klientene med PING forespørsler etter dette "
 "tids intervallet."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Tidsfrist for å koble fra en klient"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Dersom en klient ikke svarer på en PING innen denne tiden vil den bli koblet "
 "fra."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Rundeblokkerende spillmodus"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
@@ -5079,11 +5100,11 @@ msgstr ""
 "Hvis denne er satt til 1 spillet så går ikke spillet videre til alle\n"
 "spillerne har avsluttet deres runde, inkludert avkoblede spillere."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Fast-lengde runder (spill-modus)"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5092,11 +5113,11 @@ msgstr ""
 "Hvis denne er satt til 1 så går ikke spillrunden videre før tiden har gått "
 "ut, uansett om alle spillere har trykket på \"Runde over\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Hva er i demografirapporten"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5133,11 +5154,11 @@ msgstr ""
 "    b = vis kolonnen \"beste stat\"\n"
 "Rekkefølgen betyr ingenting, men størrelsen på bokstavene gjør det."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Runder pr auto-lagring"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5145,11 +5166,11 @@ msgstr ""
 "Spillet vil automagisk lagres med så mange runders mellomrom. Null betyr at "
 "en ikke ønsker auto-lagring."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Komprimeringsnivå på lagret spill"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5159,11 +5180,11 @@ msgstr ""
 "Høyere tall vil gi høyere komprimering, men ta lenger tid. Dersom maksimum "
 "er null så var ikke tjeneren kompilert for å bruke zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Autolagrings prefiks"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5171,11 +5192,11 @@ msgstr ""
 "Automatisk lagrede spill vil ha navnet \"<forstavelse><år>.sav\". Denne "
 "innstillingen endrer <forstavelse> delen."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Hvorvidt spillerstatistikk skal logges"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5189,7 +5210,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Serveren kan ikke lese fra tastaturet. Ignorerer det."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Server: addressefeil: [%s: %d]."
@@ -5321,102 +5342,102 @@ msgstr "Klarte ikke 
 msgid "Game saved as %s"
 msgstr "Spill lagret som %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Spillet er allerede i gang."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Starter spillet."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "forespørsel etter ukjent rapport (type: %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Advarsel: forkastet gammel klient %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Mottok en nettpakke av type %d fra en død eller observatør spiller"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Vennligst velg et ikke-blankt navn."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Den nasjonen er allerede i bruk."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "En annen spiller kalt '%s' deltar allerede.  Velg et annet navn."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Vennligst velg et navn som kun inneholder ASCII bokstaver."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, fuzzy, c-format
 msgid "%s nation is already in use."
 msgstr "Den nasjonen er allerede i bruk."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s er den %se herskeren %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, fuzzy, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Kan ikke starte spill: det er allerede startet."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, fuzzy, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s ble lagt til som en AI-styrt spiller."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Spiller %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s styrer %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Sender info til metaserver [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Spillet er over..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Aksepterer nå nye klientforbindelser."
 
@@ -5438,7 +5459,7 @@ msgstr "(uklar)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5615,7 +5636,7 @@ msgstr "Spillere kan ikke fjernes etter at spillet har startet."
 msgid "Removed player %s from the game."
 msgstr "Fjernet spiller %s fra spillet."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5692,203 +5713,203 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr "Kan ikke øke kommando tilgangsnivå til '%s'; du har kun '%s' selv."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Kommando tilgangsnivå satt til '%s' for forbindelse %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "Kommando tilgangsnivå kunne ikke settes til '%s' for forbinselse %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Kommando tilgangsnivå satt til '%s' for nye spillere."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "Kommando tilgangsnivå tildeles '%s' første spiller som kobler til."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 #, fuzzy
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "'Førstenivå'-kommandoen gir ikke mening på server-kommandolinje."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Du har allerede tilgangsnivå '%s' eller bedre."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 #, fuzzy
 msgid "Someone else already is game organizer."
 msgstr "Noen andre har allerede tilgangsnivå '%s' eller bedre."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Ugyldig argument %d"
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Bruk: timeoutincrease <runde> <rundetillegg> <verdi> <faktor>"
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Dynamisk rundetidsbegrensning satt til %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Alternativ:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "kan endres"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fastsatt"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Verdi: %d, Minimum: 0, Std.verdi: %d, Maksimum: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Verdi: %d, Minimum: %d, Std.verdi: %d, Maksimum: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Verdi: \"%s\", Std.verdi: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Forklaringer er tilgjengelige for følgende serveralternativ:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Ingen forklaring på det ennå."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Alternativet har flere betydninger."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Server Operatør: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Spiller '%s' har nå AI vanskelighetsgrad '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s er ikke kontrollert av AI'en."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Standard AI vanskelighetsgrad er satt til '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Denne kommandoen er kun for klienten."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Bruk: borte"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s satt til borde-modus."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s har returnert til spillet."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Beklager, du har ikke tilgang til å se alternativ '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Ukjent alternativ '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 #, fuzzy
 msgid "All options with non-default values"
 msgstr "= betyr at alternativet har standardverdi"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Alle alternativer"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Viktige alternativer"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Situasjonsbetingede alternativer"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Sjeldent brukte innstillinger"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ betyr at du kan endre alternativet"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= betyr at alternativet har standardverdi"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s verdi  (min,maks)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Alternativ"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "beskrivelse"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 #, fuzzy
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
@@ -5896,76 +5917,76 @@ msgid ""
 msgstr ""
 "Prøv 'show situational' eller 'show rare' for å vise flere alternativer."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Kan ikke endre lagene når spillet er startet."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 #, fuzzy
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Udefinert argument.  Bruk: team <spiller> [lag]."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Kan ikke tilordne lag til en barbar."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Spiller %s er med i laget %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Udefinert argument.  Bruk: vote yes|no [valgnummer]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Observatører kan ikke stemme."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Valg %d \"%s\": %d for, %d mot"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Det er ingen aktive valg."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Ingen tidligere gyldige valg."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Verdien må være et heltall."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Ingen slik avstemning (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Du stemte for \"%s\""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Du stemte mot \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 #, fuzzy
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
@@ -5974,435 +5995,462 @@ msgstr ""
 "Udefinert argument. Bruk: debug <diplomacy <spiller> | by <x> <y> | enhet "
 "<x> <y> | enhet <id> | tech <spiller>>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Du kan kun benytte denne kommandoen når spillet er i gang."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "%s diplomati blir ikke lenger feilsøkt"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "%s diplomati feilsøking"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "%s tech blir ikke lenger feilsøkt"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "%s tech feilsøking"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Verdi 2 og 3 må være heltall."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Ugyldige kart koordinater."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Ingen by på dette koordinatet."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s er ikke lenger debugget."
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "%ss %s er ikke lenger debugget."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "%ss %s debugget."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Verdi 2 må være heltall"
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Enhet %d eksisterer ikke."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Udefinert argument.  Bruk: set <alternativ> <verdi>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Du har ikke lov å sette dette alternativet."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Denne innstillingen kan ikke endres etter at spillet har startet."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Verdien må være heltall"
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Verdi utenfor område (minimum: 0, maksimum: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Alternativ: %s har blitt satt til %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Verdi utenfor område (minimum: %d, maksimum: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Streng verdi for lang.  Bruk: set <alternativ> <verdi>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Alternativ: %s har blitt satt til \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Beklager, man kan ikke være global observatør i dette spillet."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 "Beklager, man kan styre en global observatør. Prøv å observere den i stedet."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Beklager, man kan ikke overta menneskelige spillere i dette spillet."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Beklager, man kan ikke observere barbarer i dette spillet."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Beklager, man kan ikke styre barbarer i dette spillet."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Beklager, man kan ikke observere døde spillere i dette spillet."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Beklager, man kan ikke styre døde spillere i dette spillet."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Beklager, man kan ikke ovservere AI spillere i dette spillet."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Beklager, man kan ikke styre AI spillere i dette spillet."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 "Beklager, man kan ikke observere menneskelige spillere i dette spillet."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "Beklager, man kan ikke overta menneskelige spillere i dette spillet."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Beklager, man kan ikke observere i dette spillet."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Beklager, man kan ikke overta spillere i dette spillet."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 "Beklager, man kan ikke overta spillere som allerede er tilkoblet i dette "
 "spillet."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Bruk: observe [forbindelses-navn] <spillernavn>"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Bruk: observe <spillernavn>"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s styrer allerede %s. Ved å bruke 'observe' ville det fjerne %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s observerer allerede %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, fuzzy, c-format
 msgid "%s is already observing."
 msgstr "%s observerer allerede %s."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s observerer nå %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, fuzzy, c-format
 msgid "%s now observes"
 msgstr "%s observerer nå %s"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Bruk: take <forbindelsesnavn> <spillernavn>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Bruk: take <spillernavn>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Bruk: take [forbindelsesnavn] <spillernavn>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s styrer allerede %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Der er ingen spiller eller forbindelse med navn %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "kobles fra %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s styrer nå %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "barbarsk"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "AI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Menneske"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Levende"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Død"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s er ikke tilordnet en spillet."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Bruk: detach <forbindelsesnavn>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Du kan ikke fjerne andre brukere."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s er ikke tilordnet en spillet."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s kobler fra %s."
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, fuzzy, c-format
 msgid "%s no longer observing."
 msgstr "%s er ikke lenger debugget."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "fjernes fra %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 #, fuzzy
 msgid "Usage: load <game name>"
 msgstr "Bruk: load <filnavn>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 #, fuzzy
 msgid "Cannot load a game while another is running."
 msgstr "Kan ikke fortsette et spill mens et annet er i gang."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, fuzzy, c-format
 msgid "Could not load savefile: %s"
 msgstr "Klarte ikke laste inn lagret spill i: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Nåværende katalog for regeloppsettet er: \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Kunne ikke finne regeloppsettskatalogen \"%s\""
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, fuzzy, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Regeloppsettkatalogen er \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Regeloppsettkatalogen er \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Adjø."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Beklager, du har ikke lov å benytte kommandoer på serveren."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Advarsel: '%s' tolket som '%s', men dette er ikke nødv. riktig.  Forsøk '%"
 "shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Ukjent kommando.  Forsøk '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Din nye stemme endret din tidligere stemme."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, fuzzy, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Ny stemme, nei. %d, av %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Du har ikke lov å bruke denne kommandoen."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(server kommandolinje)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 #, fuzzy
 msgid "Game ended in a draw."
 msgstr "Spillet endte uavgjordt"
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Avslutter spillet. Serveren vil starte på nytt når alle klienter har koblet "
 "fra."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Kan ikke avslutte spill: det er ikke noe spill igang."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 #, fuzzy
 msgid "You cannot surrender now."
 msgstr "Du kan ikke oppløse enheter."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Ikke nok spillere, spillet vil ikke starte."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Ikke nok spillere, spillet vil ikke starte."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Ikke nok spillere, spillet vil ikke starte."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 #, fuzzy
 msgid "All players are ready; starting game."
 msgstr "Der finnes allerede en spiller med det navnet."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "Kan ikke starte spillet: det venter på at alle klienter skal koble fra."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Kan ikke starte spill: det er allerede i gang."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Avbryter forbindelse til %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6441,126 +6489,126 @@ msgstr ""
 "  save   -  lagre det nåværende spillet\n"
 "  quit   -  avslutte"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Kommando:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Betydning:"
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Nivå: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Følgende serverkommandoer er tilgjengelige:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Hjelpeargument '%s' er ikke entydig."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Ingen treff funnet for hjelpeargument '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Ulovlig listeargument: '%s'.  Forsøk '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Liste over spillere:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<ingen spillere>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "bruker %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Død"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", vanskelighetsgrad %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 #, fuzzy
 msgid ", ready"
 msgstr ", Død"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ""
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d forbindelse:"
 msgstr[1] " %d forbindelse:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s fra %s (kommando tilgangsnivå: %s), buffer størrelse=%dkb"
 
 # heter AI på norsk.. ingen skjønner KI
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (observatør modus)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 #, fuzzy
 msgid "List of teams:"
 msgstr "Liste over spillere:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr ""
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "List opp forbindelser til server:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<ingen forbindelser>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 #, fuzzy
 msgid "List of scenarios available:"
 msgstr "Ingen enheter tilgjengelige"
@@ -6632,17 +6680,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Teknologimålet er %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Du stjeler %s fra %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%s stjal %s fra deg!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "Din %s stjal %s fra %s."
@@ -7166,20 +7214,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr "Din %s har ugyldige ordre."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Mye landmasse - dette kan ta noen sekunder."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Faller tilbake på generator %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Generator 3 plasserte ikke alle de store øyene."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Generator 3 forlot %li landmasse uplassert."
@@ -7271,122 +7319,123 @@ msgstr "Kanskje det er feil ved konfigurasjonen"
 msgid "Cannot find audio file %s"
 msgstr "Klarer ikke å finne lydfilen %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX runder"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d gull per runde"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d runde"
 msgstr[1] "%3d runde"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "aldri"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/runde"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d runde"
 msgstr[1] "%s (%d) %d runde"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Foreldet"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Bygget"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 #, fuzzy
 msgid "Great Wonder"
 msgstr "Underverk"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 #, fuzzy
 msgid "Small Wonder"
 msgstr "Tilgjengelige underverker"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/runde"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, fuzzy, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%s - %s innbyggere"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, fuzzy, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "Handelsruter"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, fuzzy, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "Bygger enheter"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -7499,8 +7548,8 @@ msgid "Best defending units"
 msgstr "Beste forsvarende enheter"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7683,8 +7732,8 @@ msgstr "?pollution [short]:For"
 msgid "?cma:Governor"
 msgstr "Sysselmann"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 #, fuzzy
@@ -7949,19 +7998,19 @@ msgstr ""
 "Auto-tilkobler server \"%s\" på port %d som \"%s\" hvert %f sekund i %d "
 "ganger"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "nybegynner"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "lett"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "vanskelig"
 
@@ -7969,31 +8018,31 @@ msgstr "vanskelig"
 msgid "experimental"
 msgstr "eksperimentell"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Starter tjeneren..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Klarte ikke å starte tjeneren."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Du må starte en tjener selv. Beklager..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Klarte ikke å koble til tjeneren."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Vi kunne sannsynligvis ikke starte herfra."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Vi har kontroll over tjeneren (hack tilgangsnivå)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "Vi kan ikke ta kontroll over tjeneren, forsøker å avslutte den."
 
@@ -8079,27 +8128,27 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, fuzzy, c-format
 msgid "Allows %s."
 msgstr "Tillater %s.\n"
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, fuzzy, c-format
 msgid "Allows %s (with %s)."
 msgstr "Tillater %s (med %s).\n"
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Elver"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Beklager, ikke noe hjelpeemne for %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8110,86 +8159,86 @@ msgstr ""
 "Denne siden ble auto-generert.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr "Du kan ikke forske på denne teknologien."
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Oppdagelsen av %s vil forelde %s.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* Tillater alle spillere med kunnskap om %s å bygge %s enheter.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Tillater %s (med %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Tillater %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Kan ikke bygges i byer.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Har aldri en hjemby.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Å miste denne enheten gjør at du taper spiller!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Hver spiller kan kun ha en av denne enheten.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Krever befolkningstall på %d for å kunne bygges.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Kan frakte og fylle drivstoff på %d flyenhet.\n"
 msgstr[1] "* Kan frakte og fylle drivstoff på %d flyenhet.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Kan transportere og fylle drivstoff på %d rakettenhet.\n"
 msgstr[1] "* Kan transportere og fylle drivstoff på %d rakettenhet.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Kan transportere %d landenhet over vann.\n"
 msgstr[1] "* Kan transportere %d landenhet over vann.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8197,166 +8246,166 @@ msgstr ""
 "* Kan etablere handelsruter (må reise til en annen by som er minst 9 ruter "
 "[i Manhattan avstand] fra denne enhetens hjemby). \n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Kan hjelpe til å bygge underverk (legger til %d produksjon).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Kan ikke oppløses.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Kan oppløses i en by for å få tilbake 50%% av produksjonskonstnadene.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Kan bygge nye byer.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Kan legge til %d innbyggere til byer på størrelse mindre enn %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Kan bygge veier og jernbaner.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Kan bygge gruver.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Kan bygge irrigasjon.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "- Kan bygge dyrket mark.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Kan bygge dyrket mark (dersom %s er kjent).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Kan bygge dyrket mark (dersom en av %s er kjent).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Tillater å bygge fort.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Tillater å bygge fort (dersom %s er kjent).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Tillater å bygge fort (dersom en av følgende er kjent: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Kan fjerne forurensing. \n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Kan fjerne atomavfall.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Kan transformere kartruter.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Kan bygge flyplasser.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Kan befeste, som git 50%% forsvarsbonus.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Kan plyndre for å ødelegge infrastrukturen på kartruter.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Kan utføre diplomatiske forhandlinger, samt spesielle spion-egenskaper.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Kan utføre diplomatiske forhandlinger.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Vil aldri tape en diplomat-mot-diplomat kamp.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Denne enheten kan ikke bestikkes.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Kan angripe fiendtlige luftenheter.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* Er usynlig unntatt når den er ved siden av en fremmed enhet eller by.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Kan kunne angripe enheter på havet (ingen angrep mot land).\n"
 
 # dumbo translation
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr "* Kan fra sjøenheter angripe fiendens byer og enheter på land.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Kan gjøre fallskjermhopp fra vennligsinnet by (Rekkevidde: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Får dobbelt forsvar mot enheter som er 'til hest'.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Teller som 'til hest' mot enkelte forsvarere.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* En rakettenhet: blir brukt opp idet den angriper.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Et angrep avslutter denne enhetens runde.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Denne enhetens angrep skaper en atomeksplosjon!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Får dobbel ildkraft ved angrep på byer.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Bryr seg ikke om bymurer.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8366,36 +8415,36 @@ msgstr ""
 "(aldri drepe) den forsvarende enheten, men innebærer ingen risiko for "
 "angriper.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Får femdoblet forsvar mot raketter og fly.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Bryr seg ikke om terreng (alle felt tilsvarer veier).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Bryr seg ikke om kontrollsoner.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* En ikke-militær enhet (kan ikke angripe; ingen unntakstilstand).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 "* En kampenhet: medfører 1 ulykkelig selv når den er ikke-aggressiv. \n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Oppnår aldri status som veteran.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Kan bli oppnå veteran status gjennom trening eller kamp.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8404,12 +8453,12 @@ msgstr ""
 "* Må avslutte runden i en by eller ved kysten, ellers har den en 50%% sjanse "
 "for å gå tapt på havet.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* Oppdagelsen av %s reduserer risikoen til 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s reduserer risikoen til 12%%.\n"
@@ -8418,27 +8467,27 @@ msgstr "* %s reduserer risikoen til 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " eller "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?eller:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* Enheten må være i en by, eller på en %s etter %d runde.\n"
 msgstr[1] "* Enheten må være i en by, eller på en %s etter %d runde.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Dersom vi hadde startet med %s ville vi trengt %d forskningspoeng."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8447,91 +8496,91 @@ msgstr ""
 "For å nå %s trenger vi å anskaffe %d andre teknologier først. Hele "
 "prosjektet krever %d forskningspoeng for å fullføres."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Du kan ikke forske på denne teknologien."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr "Nummeret kan variere i forhold til hva andre spillere forsker på. \n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* Den første spilleren som forsker på %s får et umiddelbart fremskritt.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 "* Reduserer sannsynligheten for å miste en enhet på dypt hav til 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 "* Reduserer sannsynligheten for å miste en enhet på dypt hav til 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Øker forurensningen skapt av befolkningen.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Tillater %s å bygge veier på elve-felt\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Tillater %s å bygge fort.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Tillater %s å bygge flybaser.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Tillater %s å oppgradere veier til jernbane.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Tillater %s å oppgradere irrigert land til jordbruksland.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Dette terrenget kan ikke bli forurenset."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Kan ikke bygge byer på slikt terreng."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Kystlinja til dette terrenget er utrygg."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Dette terrenget er utrygt for ferdsel."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Landenheter kan ikke ferdes over havterreng."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8542,7 +8591,7 @@ msgid_plural ""
 msgstr[0] "Militære enheter i felten kan føre til ulykkelighet. "
 msgstr[1] "Militære enheter i felten kan føre til ulykkelighet. "
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8550,48 +8599,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8599,23 +8648,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8626,7 +8675,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8634,64 +8683,64 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 #, fuzzy
 msgid "* Your units cannot be bribed.\n"
 msgstr "Denne enheten kan ikke bestikkes."
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 #, fuzzy
 msgid "* Your cities cannot be incited.\n"
 msgstr "Byen kan ikke bli infiltrert!"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 #, fuzzy
 msgid "* Has no unhappy citizens.\n"
 msgstr "%d ulykkelige innbyggere."
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 #, fuzzy
 msgid "* Veteran units.\n"
 msgstr "Sjøenheter"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8699,7 +8748,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8707,71 +8756,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, fuzzy, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Tillater %s å bygge flybaser.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, fuzzy, c-format
 msgid "%s%d %s"
 msgstr "%3d/%3d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d ulykkelig"
@@ -9183,16 +9232,16 @@ msgstr "Server egenskapsstreng: %s"
 msgid "Start of turn %d"
 msgstr "Runden begynner %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "AI modus er nå %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "PÅ"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "AV"
 
@@ -9224,13 +9273,13 @@ msgstr "Navn"
 msgid "Username"
 msgstr "Brukernavn"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Flagg"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9244,7 +9293,7 @@ msgstr "Grense"
 msgid "Score"
 msgstr "Poengsum"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Lag"
 
@@ -9277,36 +9326,36 @@ msgstr "Ledig"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Du kan ikke selge byforbedringer."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Solgte %d %s for %d gull."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Ingen %s kunne selges."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Du kan ikke oppløse enheter."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s kan ikke oppløses."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Oppløste %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Ingen %s kan oppløses."
@@ -9624,64 +9673,70 @@ msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Skatt:%d Luksus:%d Fors:%d"
 
 # problem
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "i %s"
+
+# problem
+#: client/text.c:609
 #, fuzzy, c-format
 msgid "Moving: %s"
 msgstr "i %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr ""
 
-#: client/text.c:625
+#: client/text.c:629
 #, fuzzy, c-format
 msgid "%s People"
 msgstr "%s Velkommen"
 
-#: client/text.c:629
+#: client/text.c:633
 #, fuzzy, c-format
 msgid "Turn: %d"
 msgstr "Terreng: %s"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Gull: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr ""
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, fuzzy, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Skatt:%d Luksus:%d Fors:%d"
 
-#: client/text.c:639
+#: client/text.c:643
 #, fuzzy, c-format
 msgid "Researching %s: %s"
 msgstr "Forsker på %s: %d/%d"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Styreform: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, fuzzy, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9689,58 +9744,58 @@ msgstr[0] " enhet"
 msgstr[1] " enhet"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Runder til mål: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, fuzzy, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Runder til mål: %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, fuzzy, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "Valg av enheter"
 msgstr[1] "Valg av enheter"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 #, fuzzy
 msgid "No units selected."
 msgstr "Nasjon valgt"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 #, fuzzy
 msgid "No units to upgrade!"
 msgstr "Ingen enheter kunne oppgraderes."
 
-#: client/text.c:860
+#: client/text.c:864
 #, fuzzy
 msgid "None of these units may be upgraded."
 msgstr "Ingen enheter kunne oppgraderes."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9755,14 +9810,14 @@ msgstr[1] ""
 "Oppgrader %s til %s for %d gull?\n"
 "Skattkammeret har %d gull."
 
-#: client/text.c:887
+#: client/text.c:891
 #, fuzzy
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 "Viser fremgangen på det nåværende forskningsprosjektet.\n"
 "%s: %d/%d."
 
-#: client/text.c:893
+#: client/text.c:897
 #, fuzzy
 msgid "no research target."
 msgstr ""
@@ -9770,46 +9825,46 @@ msgstr ""
 "(ingen forskning)"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 #, fuzzy
 msgid "Shows the progress of global warming:"
 msgstr ""
 "Viser endringen i global oppvarming:\n"
 "%d."
 
-#: client/text.c:917
+#: client/text.c:921
 #, fuzzy, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Forurensning:  %3d"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 #, fuzzy
 msgid "Shows the progress of nuclear winter:"
 msgstr ""
 "Viser endringen i atomvinter:\n"
 "%d."
 
-#: client/text.c:936
+#: client/text.c:940
 #, fuzzy, c-format
 msgid "Fallout rate: %d%%"
 msgstr "%s maks nivå: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 #, fuzzy
 msgid "Shows your current government:"
 msgstr ""
@@ -9817,25 +9872,25 @@ msgstr ""
 "%s."
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Befolkning:     %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Støtte:           %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energi:           %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9843,96 +9898,96 @@ msgstr[0] "Masse:  %5d tonn"
 msgstr[1] "Masse:  %5d tonn"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Reisetid:        %5.1f år"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Reisetid:           N/A     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Suksess sanns.:      %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Ankomstår: %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:av"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dt %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dd %02dt"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:overflod"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "Styresett: %s  Nasjon: %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, fuzzy, c-format
 msgid "Observer: %s"
 msgstr "Observatør"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Bygninger:"
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Ingen. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Underverk: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Byer: %d totalt, %d over terskelen %d byer."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9940,7 +9995,7 @@ msgstr[0] "%d forn
 msgstr[1] "%d fornøyd før straff med "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9948,16 +10003,16 @@ msgstr[0] "%d ulykkelige innbyggere."
 msgstr[1] "%d ulykkelige innbyggere."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Unntakstilstand ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "ingen maksimum, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9965,20 +10020,20 @@ msgstr[0] "%d enhet maksimalt, "
 msgstr[1] "%d enhet maksimalt, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d per enhet)."
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Militære enheter i felten kan føre til ulykkelighet. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Militære enheter har ingen innvirkning på lykkeligheten."
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luksus: %d totalt"
@@ -10027,12 +10082,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "ingen"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "egendefinert"
 
@@ -10086,11 +10141,13 @@ msgid "Ooops..."
 msgstr "Oops..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Denne enheten kan ikke bestikkes."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10107,6 +10164,7 @@ msgstr "Bestikk fiendens enhet"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10147,6 +10205,7 @@ msgstr "_Fremskritt:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "La spionen velge"
 
@@ -10171,13 +10230,14 @@ msgstr "For_bedringer:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Byproduksjon"
 
 # problem
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Du kan ikke starte opprør i %s."
@@ -10189,6 +10249,7 @@ msgstr "Byen kan ikke bli infiltrert!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10205,6 +10266,7 @@ msgstr "Start oppr
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10214,6 +10276,7 @@ msgstr ""
 "Skattkammeret har %d gull."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10283,11 +10346,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Vend om fiendtlig enhet"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Deres høyhet, diplomaten avventer deres ordre"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Deres høyhet, spionen avventer deres ordre"
@@ -10388,7 +10453,7 @@ msgstr "Forurensning:"
 msgid "_Overview"
 msgstr "_Byoversikt"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10413,11 +10478,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d runder"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Kjøp"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "_Produksjon"
@@ -10540,7 +10605,7 @@ msgstr "St
 msgid "Present units %d"
 msgstr "Enheter tilstede %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Sen_trer"
 
@@ -10629,32 +10694,32 @@ msgstr "Omd
 msgid "What should we rename the city to?"
 msgstr "Hva skal vi omdøpe byen til?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_Endre"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "_Legg til forhåndsvalg"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "_Legg til forhåndsvalg"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "_Legg til forhåndsvalg"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Velg"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "V_is"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10664,13 +10729,13 @@ msgstr "V_is"
 msgid "Cities"
 msgstr "Byer"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "Vis _By"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10679,85 +10744,90 @@ msgstr "Vis _By"
 msgid "Improvements"
 msgstr "Forbedringer"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Underverk"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Alle byer"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Ingen byer"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Snu valg"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Bygger enheter"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Bygger byforbedringer"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Bygger underverk"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Bygger enhet"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Bygger byforbedring"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Bygger underverk"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Byer ved kysten"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Samme øy"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Støttede enheter"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Enheter tilstede"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Forbedringer i by"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Underverk i byen"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Tilgjengelige enheter"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Tilgjengelige Forbedringer"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Tilgjengelige underverker"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Total kostnad:"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 #, fuzzy
 msgid ""
@@ -10826,128 +10896,128 @@ msgstr "Hva skal vi kalle forh
 msgid "Remove this preset?"
 msgstr "Fjern denne innstillingen?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "_Gå til"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "_Vis by"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Så du vil ha revolusjon?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revolusjon!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Hva skal plyndres"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Velg hva som skal plyndres:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Enhet"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Navn"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Valg av enheter"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_Klargjør alle"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "Inaktive enheter hold _stand"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Nasjoner:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Hvilken nasjon vil du være?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 #, fuzzy
 msgid "Pick Nation"
 msgstr "Politistasjon"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Forente Nasjoner"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Velg en nasjon"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Alternativer"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Leder:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Kvinne"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Mann"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "_Bystil:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "_Forklaring"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Du må velge kjønn."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Du må velge stil for byene din."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Du må skrive et gyldig navn."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Oppgrader enhet!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11196,70 +11266,76 @@ msgstr ""
 msgid "Not _ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 #, fuzzy
 msgid "_Ready"
 msgstr "_Klargjør alle"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Start"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Byer"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 #, fuzzy
 msgid "Pick _Nation"
 msgstr "Politistasjon"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 #, fuzzy
 msgid "_Observe"
 msgstr "_Observatør"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "_observerer nå"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 #, fuzzy
 msgid "<AI>"
 msgstr "AI"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 #, fuzzy
 msgid "<Easy AI>"
 msgstr "AI"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 #, fuzzy
 msgid "<Hard AI>"
 msgstr "AI"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 #, fuzzy
 msgid "Random"
 msgstr "Radio"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Observer"
 msgstr "Observatør"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Detached"
 msgstr "Død"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Er du sikker på at du vil avslutte?"
 
@@ -12194,227 +12270,227 @@ msgstr "K_oble til nettverksspill"
 msgid "Connect to Gaming _Zone"
 msgstr "Koble til nettverksspill"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Passordene stemmer ikke, skriv inn passord."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Servernavn"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versjon"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Status"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Spillere"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Kommentar"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Lok_alt Nettverk"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Internett _Metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Tjener"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Portnummer"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Navn:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "_Gjenta passord:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 #, fuzzy
 msgid "C_onnect"
 msgstr "Koble til"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, fuzzy, c-format
 msgid "Connection name: %s"
 msgstr "Tilkobling under opprettelse."
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, fuzzy, c-format
 msgid "Player name: %s"
 msgstr "Navn"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, fuzzy, c-format
 msgid "Host: %s"
 msgstr "Tjener:"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, fuzzy, c-format
 msgid "%s info"
 msgstr "By info"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 #, fuzzy
 msgid "Toggle player ready"
 msgstr "aitoggle <spillernavn>"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 #, fuzzy
 msgid "Pick nation"
 msgstr "Politistasjon"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 #, fuzzy
 msgid "Take this player"
 msgstr "Byer"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 #, fuzzy
 msgid "Cut connection"
 msgstr "Avbryter forbindelse til %s."
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 #, fuzzy
 msgid "Aitoggle player"
 msgstr "aitoggle <spillernavn>"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 #, fuzzy
 msgid "Remove player"
 msgstr "Fjernet spiller %s."
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, fuzzy, c-format
 msgid "Put on %s"
 msgstr "Befolkning: %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "_Antall spillere (inkludert datastyrte spillere):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "Datastyrte spilleres _vanskelighetsgrad:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "Hersker:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "_Flere valg..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 #, fuzzy
 msgid "Record"
 msgstr "Handelsrapport"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 #, fuzzy
 msgid "Rating"
 msgstr "Skrivekunst"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 #, fuzzy
 msgid "Ready"
 msgstr "Klargjør alle"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Leder"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Velg lagrefil å laste"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Velg lagrefil å _laste:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Let etter fil..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Velg et ferdiglagd oppsett"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Velg et ferdiglagd _oppsett:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Type"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Velg en _nasjon å spille:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Velg plassering for å lagre spillet"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Lagre spill"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "_Lagrede spill:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Lagre _filnavn:"
 
@@ -12451,7 +12527,7 @@ msgstr "Bygning"
 msgid "Count"
 msgstr "Antall"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12696,28 +12772,28 @@ msgstr "_Arbeidslister:"
 msgid "Edit Global _Worklists"
 msgstr "Endre globale _arbeidslister"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Runder"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "_Kilde oppgaver:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Vis _framtidige mål"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "_Mål arbeidsliste:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "_Ny arbeidsliste"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "_Endre produksjon"
 
@@ -13022,8 +13098,8 @@ msgid "City shrinks: %d %s"
 msgstr "By: %s (%s)"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13139,12 +13215,12 @@ msgstr "Endelig rapport:"
 msgid "Maintenance Report"
 msgstr "Forskningsrapport"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 #, fuzzy
 msgid "worklist"
 msgstr "(arbeidsliste)"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13583,21 +13659,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -14912,7 +14988,7 @@ msgstr "_Bystil:"
 msgid "Unit Selection"
 msgstr "Valg av enheter"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "INGEN"
 
diff --git a/po/nl.gmo b/po/nl.gmo
index c7b14fb..1bc5d0f 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 00c0b37..3686bad 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-09-01 22:18+0300\n"
 "Last-Translator: Jelle Pelfrene <jelle.pelfrene at student.kuleuven.ac.be>\n"
 "Language-Team: Nederlands <nl at li.org>\n"
@@ -48,22 +48,22 @@ msgstr "Luxe"
 msgid "Science"
 msgstr "Wetenschap"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?gebouwd:B"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wereldwonder:w"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?verouderd:O"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?overtollig:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?gebouwd:B"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wereldwonder:w"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -483,81 +483,81 @@ msgstr "Verbind/verbreek boodschappen"
 msgid "AI Debug messages"
 msgstr "KI debug boodschappen"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:Moordzuchtig"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:Oorlogszuchtig"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:Vijandig"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:Tegendraads"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:Ongemakkelijk"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?attitude:Neutraal"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:Respectvol"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:Behulpzaam"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:Geestdriftig"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:Bewonderend"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:Aanbiddend"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Staakt-het-vuren"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Oorlog"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Wapenstilstand"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Vrede"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Alliantie"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Nooit ontmoet"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Team"
 
@@ -605,13 +605,13 @@ msgstr "%s-eenheden"
 msgid "Size %d"
 msgstr "Grootte %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Toekomst Tech. %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -623,65 +623,65 @@ msgstr "Toekomst Tech. %d"
 msgid "None"
 msgstr "Geen"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Toekomst Tech."
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Onbekend)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Weg"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Irrigatie"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Spoorlijn"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Mijn"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Verontreiniging"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Hut"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Fort"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Rivier"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Luchthaven"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Radioactief"
 
@@ -792,11 +792,11 @@ msgstr "Kernraket"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " en "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?en:, "
 
@@ -956,79 +956,79 @@ msgid_plural " (total %d repeats)"
 msgstr[0] "(totaal %d herhaling)"
 msgstr[1] "(totaal %d herhalingen)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Leeg argument voor \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Ontbrekend argument voor \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d VC"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d AD"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH is ingesteld maar leeg; gebruik standaardpad."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Kon gegevensmap %s niet lezen: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "Het data pad mag met de shellvariabele FREECIV_PATH opgegeven worden."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Huidig data pad is: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Het \"%s\" bestand is nodig ... breek af!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Fatale fout: u probeert me als superuser te starten!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Gebruik inplaats daarvan een normaal account.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "exacte overeenkomst"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "komt alleen overeen met"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "dubbelzinnig"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "leeg"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "te lang"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "niet overeenkomend met"
 
@@ -1057,22 +1057,22 @@ msgstr "Spel: De %s zijn begonnen met het bouwen van %s in %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s verkoopt %s (niet nodig) voor %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (KI)* In afwezig modus kan de KI zo'n verdrag niet tekenen."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (AI)* Verbreek eerst de alliantie met %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (AI)* Laat ons eerst onze vijandelijkheden staken, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1080,48 +1080,48 @@ msgid ""
 msgstr ""
 "*%s (AI)* Ik wil eerst zien of je ons staakt-het-vuren nog wat volhoudt, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (AI)* Ik vertrouw je nog niet genoeg voor een alliantie, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, fuzzy, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s·(AI)*·I·ken de stad die je noemt niet."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 "%s (AI)* Sorry, het delen van mijn gezichtsveld met jou is me te gevaarlijk"
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, fuzzy, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s·(AI)*·Deze zaak was niet zo goed voor ons,·%s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* Welkom in onze alliantie %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* Ja, mogen we voor altijd verenigd blijven, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* Ja, vrede in onze tijd!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)* Akkoord. Geen vijandelijkheden meer, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1130,23 +1130,23 @@ msgstr ""
 "*%s·(AI)*·Gegroet %s!·Mogen we een staakt-het-vuren voorstellen terwijl we "
 "elkaar leren kennen?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* De ruimte zal je nooit kunnen beheersen."
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, fuzzy, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "*%s·(AI)*·Ik heb uw gemene streken lang genoeg getolereerd! Ten oorlog!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "* %s (AI)* Vrede ... maar niet nu."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1155,18 +1155,18 @@ msgstr ""
 "*%s (AI)* Eindelijk kom ik aan jou toe! Dacht je nu echt dat je weg kon "
 "komen met je misdaden?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, fuzzy, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 "*%s·(AI)*·Uw achterbakse vijandelijkheden hebben u in deze oorlog geduwd!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)* Je agressie tegen %s was je laatste vergissing!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1181,14 +1181,14 @@ msgstr[1] ""
 "*%s (AI)* We gaan volle oorlog verklaren tegen %s binnen %dbeurten om de "
 "lancering te stoppen."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr "*%s (AI)* Uw hulp wordt verwacht. Lang leve onze alliantie!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1207,7 +1207,7 @@ msgstr[1] ""
 "dat betaald zetten binnen %d beurten. We verwachten dat u onze alliantie "
 "respecteert en hetzelfde doet!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1222,13 +1222,13 @@ msgstr[1] ""
 "*%s (AI)* We gaan het rijke land van %s overvallen en leegroven. We "
 "verklaren de oorlog binnen %d beurten."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr "*%s (AI)* Als je een deel van de plunderingen wil, kom gerust meedoen!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1243,13 +1243,13 @@ msgstr[1] ""
 "*%s (AI)* We hebben het helemaal gehad met %s. Laat ons dit belachelijke "
 "landje kapotmaken. We verklaren de oorlog binnen %d beurten."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (AI)* Als onze geallieerden verwachten we dat u meehelpt in deze oorlog."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1264,7 +1264,7 @@ msgstr[1] ""
 "*%s (AI)* We zullen onze alliantie in eer houden en oorlog verklaren aan %s "
 "binnen %d beurten. Hou vol, we komen eraan!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1279,7 +1279,7 @@ msgstr[1] ""
 "*%s (AI)* We zullen onze alliantie met %s in eer houden en oorlog verklaren "
 "aan %s binnen %d beurten. We verwachten van u hetzelfde."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1288,7 +1288,7 @@ msgstr ""
 "*%s (AI)* Je poging om de ruimte voor jezelf te veroveren verraden je "
 "werkelijke bedoelingen. Ik heb genoeg van onze alliantie!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1296,7 +1296,7 @@ msgid ""
 msgstr ""
 "*%s (AI)* Uw poging om eenzijdig de ruimte te domineren is zeer offensief."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1305,13 +1305,13 @@ msgstr ""
 "*%s (AI)* Als je niet stopt met het bouwen van je ruimteschip, dwing je me "
 "om in actie te komen!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 "%s (AI)* Sorry, het delen van mijn gezichtsveld met jou is nu te gevaarlijk"
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1320,7 +1320,7 @@ msgstr ""
 "*%s (AI)* Gegroet, onze meest vertrouwde geallieerde. We roepen u op onze "
 "vijand %s te vernietigen."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1329,7 +1329,7 @@ msgstr ""
 "*%s (AI)* Gegroet geallieerde, ik zie dat je nog geen oorlog hebt verklaart "
 "aan onze vijand %s. Waarom moet ik je aan je beloften herinneren?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1339,7 +1339,7 @@ msgstr ""
 "*%s (AI)* Eerloze, we sloten een alliantie en toch blijf je in vrede met "
 "onze doodsvijand %s! Dit is onacceptabel gedrag: onze alliantie is ongedaan!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1348,13 +1348,13 @@ msgstr ""
 "*%s (AI)* Gegroet vriend, wat vind je ervan mochten we samen sterk staan in "
 "een alliantie?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "*%s (AI)* Gegroet buurman, zullen we ons aan vredelievender termen houden?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1363,7 +1363,7 @@ msgstr ""
 "*%s (AI)* We worden het gedurige bloedvergieten langzaam beu. Wat vind je "
 "van een einde aan het gevecht?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1373,59 +1373,64 @@ msgstr ""
 "alliantie in ere en uw naam zal nooit vergeten worden!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Alle opties"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (veteraan)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Die naam is niet toegelaten"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Kan audiobestand %s niet vinden"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 "Waarchuwing: de gastnaam '%s' is al in gebruik, hernoem tot gebruiker '%s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Gasten zijn niet toegestaan op deze server. Sorry."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s is geweigerd: Gasten niet toegelaten."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1434,7 +1439,7 @@ msgstr ""
 "Er trad een fout op bij het lezen van de gebruikersdatabase, log in als gast-"
 "verbinding '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1442,39 +1447,39 @@ msgstr ""
 "Er trad een fout op bij het lezen van de gebruikersdatabase en gast-logins "
 "zijn niet toegestaan. Sorry"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s afgewezen: Database fout en gasten niet toegelaten."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Geef wachtwoord voor %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Geef een nieuw wachtwoord (en onthoud het)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Deze server staat alleen vooraf geregistreerde gebruikers toe. Sorry."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s afgewezen: Alleen vooraf geregistreerde gebruikers toegelaten.."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Sorry, teveel mislukte pogingen..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr "%s afgewezen: Te veel verkeerde paswoorden voor nieuwe gebruiker."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1482,30 +1487,30 @@ msgstr ""
 "Waarschuwing: Er trad een fout op bij het opslaan in de database. Ik ga "
 "door, maar uw statistieken zullen niet bewaard worden."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s afgewezen: Afwijkende mogelijkheden."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Uw wachtwoord is onjuist. Probeer opnieuw."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Sorry, timeout voor uw verbinding..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s afgewezen: Verbinding timeout bij wachten op wachtwoord."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "Uw wachtwoord is te kort, de minimum lengte is %d. Probeer opnieuw."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2287,16 +2292,14 @@ msgid "Cast a vote."
 msgstr "Breng uw stem uit."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Een speler met info-niveau toegang die een opdracht start met command-niveau "
 "toegang start een stemming voor de opgegeven opdracht. /vote gevolgd door "
@@ -2306,7 +2309,7 @@ msgstr ""
 "volledige beurt zonder tegenstemmen of nadat meer dan 50% van de stemmen "
 "voor of tegen is."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2314,11 +2317,11 @@ msgstr ""
 "debug [ player <speler> | city <x> <y> | units <x> <y> | unit <id> | tec "
 "<spelers> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Zet KI-debugging aan of uit voor gegeven entiteit."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2326,23 +2329,23 @@ msgstr ""
 "Toon KI-debug informatie over gegeven entiteit en zet doorlopende debugging "
 "uitvoer voor deze entiteit aan of uit."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <optie-naam> <waarde>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Stel server-optie in."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <naam van de speler> [team]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Wijzig, voeg toe aan of verwijder van een spelers teamdeelname."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2355,15 +2358,15 @@ msgstr ""
 "en samen vechten om een teamoverwinning te behalen met gemiddelde "
 "individuele scores."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <map>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Kies nieuwe spelregelmap of modpack."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2372,15 +2375,15 @@ msgstr ""
 " argumenten gebruikt zal het de in gebruik zijnde spelregelset tonen."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <meta-regel>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Stel metaserver-informatieregel in."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2389,19 +2392,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <meta-regel>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Stel metaserver-patches-regel in."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Beheer verbinding met metaserver."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2412,33 +2415,33 @@ msgstr ""
 "'metaconnection up' of 'metac u' maakt/herstelt de verbinding met metaserver."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <adres>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Stel metaserver adres in voor rapportering."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <naam van de speler>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Verwissel de KI-modus van deze speler."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [verbindingsnaam] <naam van de speler>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Neem een spelers plaats in in het spel."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2453,15 +2456,15 @@ msgstr ""
 "nieuwe speler aangemaakt en aan de verbinding toegewezen."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [verbindingsnaam] [naam van de speler]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Neem een speler of het hele spel waar"
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2476,15 +2479,15 @@ msgstr ""
 "verbonden met een globale waarnemer."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <naam van de verbinding>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "ontkoppel van een speler"
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2493,22 +2496,22 @@ msgstr ""
 "verbindingen dwingen om van een speler los te koppelen."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <naam van de speler>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Maak een KI-speler met deze naam."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 "De 'create' opdracht is alleen beschikbaar zolang het spel nog niet is "
 "begonnen."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2516,16 +2519,16 @@ msgstr ""
 "away\n"
 "afwezigheidsboodschap"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Zet uzelf in afwezig-modus. De KI zal u rugdekking geven."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "De KI zal uw natie regeren maar slechts met minimale aanpassingen."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2533,11 +2536,11 @@ msgstr ""
 "novice\n"
 "novice <spelernaam>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Maak één of alle KI-spelers 'novice' (=beginner)."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2549,7 +2552,7 @@ msgstr ""
 "speler ingesteld."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2557,11 +2560,11 @@ msgstr ""
 "easy\n"
 "easy <naam van de speler>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Maak één of alle KI-spelers 'easy' (=gemakkelijk)."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2573,7 +2576,7 @@ msgstr ""
 "ingesteld."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2581,11 +2584,11 @@ msgstr ""
 "normal\n"
 "normal <naam van de speler>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Maak één of alle KI-spelers 'normal' (=normaal)."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2597,7 +2600,7 @@ msgstr ""
 "speler ingesteld."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2605,11 +2608,11 @@ msgstr ""
 "hard\n"
 "hard <naam van de speler>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Maak één of alle KI-spelers 'hard' (=moeilijk)."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2621,7 +2624,7 @@ msgstr ""
 "ingesteld."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2629,11 +2632,11 @@ msgstr ""
 "experimental\n"
 "experimental <naam van de speler>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Maak één of alle KI-spelers 'experimental' (=experimenteel)."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2647,7 +2650,7 @@ msgstr ""
 "MOGELIJKHEDEN! Voor normale servers heeft deze optie geen effect."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2661,11 +2664,11 @@ msgstr ""
 "cmdlevel <niveau> first\n"
 "cmdlevel <niveau> <naam van de verbinding>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Bekijk of wijzig opdrachtniveau toegang."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2710,20 +2713,20 @@ msgstr ""
 "misbruiken om opnieuw verbinding te maken onder dezelfde naam. Merk op dat "
 "deze opdracht nu namen van verbindingen verwacht, niet van spelers."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "Als er geen is, wordt dan de spelleider met extra mogelijkheden."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <beurt> <beurtmeerwaarde> <waarde> <waardemult>."
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Zie \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2735,24 +2738,24 @@ msgstr ""
 "Standaardwaarde is 0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "speleinde"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Eindig het spel nu in een gelijkspel."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "geef uzelf over"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Geef dit spel gewonnen."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2761,15 +2764,15 @@ msgstr ""
 "behalve 1 dit doen eindigt het spel."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <naam van de speler>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Verwijder deze speler volledig uit het spel."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2778,7 +2781,7 @@ msgstr ""
 "eenheden, enz.. Gebruik dit voorzichtig!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2786,11 +2789,11 @@ msgstr ""
 "save\n"
 "save <bestandsnaam>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Bewaar spel in bestand."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2810,7 +2813,7 @@ msgstr ""
 "en gebruik de opdracht 'start' wanneer de spelers weer verbinding hebben."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2818,11 +2821,11 @@ msgstr ""
 "load\n"
 "load <bestandsnaam>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Laad spel vanuit bestand."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2831,28 +2834,28 @@ msgstr ""
 "spelregels en server-opties, gaan verloren.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <bestandsnaam>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Verwerk server opdrachten uit bestand."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <bestandsnaam>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Schrijf huidige instellingen als server opdrachten naar bestand."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Wissel de server uitvoerstijl tussen 'RFC-stijl en de normale stijl."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Geeft gewoon het kenteken van de server terug."
 
@@ -3376,25 +3379,34 @@ msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr ""
 "%s heeft een schandaal veroorzaakt met het ontketenen van een opstand in %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr "Zeewaardige starteenheden nog niet ondersteund. Niemand krijgt %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Jaar: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr "De tijdslimiet van de beurt is te groot, ingesteld op maximum"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "De tijdslimiet van de beurt is kleiner dan nul, ingesteld op nul."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Alleen de GGZ client moet civclient in ggz modus oproepen!\n"
 
@@ -3437,11 +3449,11 @@ msgstr "Er is geen verbinding met de naam %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Er is geen speler of verbinding met de naam %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Wereldwijde opwarming is opgetreden!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
@@ -3449,16 +3461,16 @@ msgstr ""
 "Kustlijnen zijn overstroomd en grote gebieden grasland zijn woestijn "
 "geworden."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Nucleaire winter is opgetreden!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Moerassen zijn opgedroogd en grote gebieden grasland zijn toendra geworden."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3469,7 +3481,7 @@ msgstr ""
 "      Arbeiders verzamelen zich spontaan en voorzien alle steden van "
 "spoorwegen."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3480,12 +3492,12 @@ msgstr ""
 "      Arbeiders verzamelen zich spontaan en voorzien alle steden van "
 "spoorwegen."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Verplaatste uw %s vanwege de terreinsverandering."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Ontbond uw %s vanwege de terreinsverandering."
@@ -3548,27 +3560,27 @@ msgstr "Revolutie: terug naar anarchie."
 msgid "You should choose a new government from the government menu."
 msgstr "U zou een nieuwe regeringsvorm moeten kiezen in het menu regering."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Belastingswaarde overschreidt het maximum voor %s; aangepast."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Wetenschapswaarde overschreidt het maximum voor %s; aangepast."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Waarde voor luxe overschreidt het maximum voor %s; aangepast."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s geven ons niet langer gedeelde waarneming!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3577,7 +3589,7 @@ msgstr ""
 "De senaat laat niet toe het verdrag met %s te breken. Ofwel moet je wachten "
 "op een beter moment, ofwel de senaat ontbinden."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
@@ -3585,7 +3597,7 @@ msgstr ""
 "De senaat accepteert uw voorstel vanwege de aanhoudende provocaties van de %"
 "s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3594,12 +3606,12 @@ msgstr ""
 "De senaat weigert het verdrag met %s te verbreken, maar het was niet "
 "moeilijk om een nieuwe senaat te vormen."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "De diplomatieke toestand tussen de %s en de %s is nu %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3608,7 +3620,7 @@ msgstr ""
 "%s beëindigde de politieke overeenkomst! De diplomatieke toestand tussen de %"
 "s en de %s is nu %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
@@ -3616,7 +3628,7 @@ msgstr ""
 "%s heeft uw geallieerde %s aangevallen! Uw alliantie met de aanvaller is nu "
 "verbroken."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3625,26 +3637,26 @@ msgstr ""
 "Uw teamgenoot %s verklaarde de oorlog aan %s. U bent gehouden aan het "
 "afbreken van uw alliantie met %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Verwijder speler %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "U bent uit het spel verwijderd!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s is uit het spel verwijderd."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "U hebt contact gemaakt met de %s, geregeerd door %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, fuzzy, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3652,17 +3664,17 @@ msgstr ""
 "%s heeft uw geallieerde %s aangevallen! Uw alliantie met de aanvaller is nu "
 "verbroken."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Kon %s niet in burgeroorlog storten - te veel spelers"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Kon %s niet in burgeroorlog storten - te veel spelers"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3671,12 +3683,12 @@ msgstr ""
 "Uw natie is verzonken in burgeroorlog, %s is benoemd als de leider van de "
 "rebellerende staten."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s verklaart alliantie aan %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3913,20 +3925,20 @@ msgstr "de"
 msgid "th"
 msgstr "de"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Volkenkundig formaat bevat ongeldige tekens. Probeer \"help demografie\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Volkenkundig Rapport:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Sorry, het Volkenkundig rapport is niet beschikbaar."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "De %s van de %s (%s)"
@@ -3937,11 +3949,11 @@ msgstr "De %s van de %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Kon geen leesbaar spelregelbestand \"%s.%s\" vinden."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Laad spelregels"
 
@@ -3957,7 +3969,7 @@ msgstr ""
 "oudere opgeslagen spelen of het kan een beschadigd spelbestand betekenen. Ga "
 "verder op eigen risico."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Opgeslagen spel te oud; tenminste versie 1.9.0 is nodig."
@@ -3981,13 +3993,13 @@ msgstr ""
 "langer ondersteund. Gebruik '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4024,7 +4036,7 @@ msgstr "Intern"
 msgid "Networking"
 msgstr "Netwerk"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Alle "
@@ -4045,7 +4057,7 @@ msgstr "Zeldzaam"
 msgid "Changed"
 msgstr "Veranderd"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4053,7 +4065,7 @@ msgstr ""
 "Toegestane take-optiestring bevat ongeldige\n"
 "tekens. Probeer \"help allowtake\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4061,7 +4073,7 @@ msgstr ""
 "Starteenhedenlijst bevat ongeldige\n"
 "tekens. Probeer \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4070,26 +4082,31 @@ msgstr ""
 "De lijst met eenheden bij de start bevat \n"
 "geen stadsstichter. Probeer \"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "Kan maximum aantal spelers niet aanpassen in GGZ modus."
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr "Aantal spelers is groter dan gevraagde waarde, oude waarde behouden"
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "U mag deze optie niet instellen."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Kaartgroote in duizend vakjes"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4099,12 +4116,12 @@ msgstr ""
 "  size = 4 geeft een normale kaart van 4,000 vakjes (standaard)\n"
 "  size = 20 geeft een gigantische kaart van 20,000 vakjes"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "De kaarttopologie-index"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 #, fuzzy
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
@@ -4165,11 +4182,11 @@ msgstr ""
 "···|·|·|·|·|·|·|············/·\\_/·\\_/·\\_/·\\_/·\\······\n"
 "···\\/\\/\\/\\/\\/\\/·············\\_/·\\_/·\\_/·\\_/·\\_/····\n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Methode om de kaart te maken"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4189,11 +4206,11 @@ msgstr ""
 "bij startpos de standaard is gebruikt dan verwijst die naar de "
 "generatorgekozen waarde. Zie \"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Methode om startposities te kiezen"
 
-#: server/settings.c:302
+#: server/settings.c:293
 #, fuzzy
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
@@ -4215,36 +4232,36 @@ msgstr ""
 "Noot: generators proberen de juiste hoeveelheid continenten te generenen "
 "voor de gegeven startposities en spelersaantal"
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Aan- of afwezigheid van 1x1 eilanden"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = geen 1x1 eilanden; 1 = enige 1x1 eilanden"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Of de polen zelfstandige continenten zijn"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = continenten mogen aan de polen vastzitten; 1 = polen zijn zelfstandig"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Heel de kaart heeft een gematigd klimaat"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = normaal Aarde-achtig; 1 = volledig gematigd "
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Gemiddelde temperatuur van de planeet"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4274,21 +4291,21 @@ msgstr ""
 "\n"
 "0 geeft een heel koude planeet: grote polen en geen tropen"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Percentage van de kaart dat land is"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr "Deze waarde geeft het percentage van de kaart dat droog land zal zijn."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Hoeveelheid heuvels/bergen"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4296,11 +4313,11 @@ msgstr ""
 "Kleinere waarden geven vlakkere kaarten, hogere waarden geven meer heuvels "
 "en bergen."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Hoeveelheid water op het land"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4308,11 +4325,11 @@ msgstr ""
 "Kleine waarden geven veel droog, woestijnerig land, hogere geven een nattere "
 "kaart met meer moerassen, jungles en rivieren."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Kaartgenerator startwaarde"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4322,11 +4339,11 @@ msgstr ""
 "(standaard) zal een waarde gekozen worden op basis van de tijd om een "
 "willekeurige kaart te genereren. Normaal alleen nuttig bij het debuggen."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Random generator voor spel"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4334,11 +4351,11 @@ msgstr ""
 "Voor nul (standaard) zal een waarde gekozen worden op basis van de tijd. "
 "Normaal alleen nuttig bij het debuggen."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Aantal \"bijzondere\" hulpbron-vlakken"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4346,11 +4363,11 @@ msgstr ""
 "Bijzondere hulpbronnen verbeteren het basisterreintype waarop ze zich "
 "bevinden. De schaal van de server is aantallen per duizend."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Aantal hutten (kleine inboorlingendorpen)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4358,23 +4375,24 @@ msgstr ""
 "Deze waarde is het precies aantal hutjes dat op de kaart zal voorkomen. "
 "Hutten zijn kleine dorpen die door eenheden kunnen onderzocht worden."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Minimum aantal spelers"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Er moet tenminste dit aantal spelers zijn (verbonden of KI's) voordat het "
 "spel kan beginnen."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Maximum aantal spelers"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4384,11 +4402,11 @@ msgstr ""
 "Wanneer dit aantal spelers is verbonden voordat het spel is begonnen, zullen "
 "alle nieuwe spelers die verbinding zoeken geweigerd worden."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Totaal aantal spelers (KI inbegrepen):"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4396,11 +4414,11 @@ msgstr ""
 "Als dit een positief getal is, zullen er automatisch KI spelers gemaakt of "
 "verwijderd worden om het aantal spelers in het spel op dit peil te houden."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Lijst met starteenheden"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4428,27 +4446,27 @@ msgstr ""
 "    a   = Snelle aanvaller (vb. Ruiters)\n"
 "    A   = Sterke aanvaller (vb. Katapult)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Gebied waar de eerste eenheden zich bevinden"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "Dit is de straal waarbinnen de starteenheden beginnen."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Hoeveelheid goud per speler aan het begin van het spel"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Bij het begin van het spel krijgt elke speler deze hoeveelheid goud."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Aantal vooruitgangen per speler aan het begin van het spel"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4460,11 +4478,11 @@ msgstr ""
 "waarde van tech_cost_style in de regelset, kan een grote waarde voor "
 "techlevel de volgende uitvindingen heel erg duur maken."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Technologie kost hefboom percentage."
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4474,11 +4492,11 @@ msgstr ""
 "waarde werkt als percentage waarmee de kost wordt vermenigvuldigd. De "
 "basiskost wordt bepaald door de regelset of andere spelinstellingen."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Percentage boete bij veranderen van technologische doelen"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4488,11 +4506,11 @@ msgstr ""
 "onderzoekspunten, dan verliest u dit percentage van die punten. Dit geldt "
 "niet als u zojuist in deze beurt een technologie hebt bereikt."
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Boete wanneer technologie of geld door verdrag wordt verkregen"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4505,11 +4523,11 @@ msgstr ""
 "nieuwe vooruitgang. U kunt eindigen met negatieve wetenschapspunten als deze "
 "waarde niet nul is. Deze belasting wordt ook geheven op goud overdrachten."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Boete voor technologie verkregen door verovering"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4520,11 +4538,11 @@ msgstr ""
 "voor het onderzoeken van een nieuwe vooruitgang. U kunt eindigen met "
 "negatieve wetenschapspunten als deze waarde niet nul is."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Boete voor het verkrijgen van gratis technologie"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4538,11 +4556,11 @@ msgstr ""
 "onderzoeken van een nieuwe vooruitgang. U kunt eindigen met negatieve "
 "wetenschapspunten als deze waarde niet nul is."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Benodigde voeding voor het laten groeien van een stad"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4552,12 +4570,12 @@ msgstr ""
 "waarde wordt vermenigvuldigd met een factor afhankelijk van de regels en "
 "hangt af van de grootte van de stad."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Percentage voedingsverlies wanneer een aquaduct nodig is"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4567,11 +4585,11 @@ msgstr ""
 "Riolering) nodig is), dan verliest het dit percentage van zijn "
 "voedingsvoorraad (of de helft daarvan als er een Graansilo aanwezig is)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Hefboom percentage voor productiekosten."
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4579,11 +4597,11 @@ msgstr ""
 "Dit bepaalt hoe snel eenheden en gebouwen geproduceerd kunnen worden. De "
 "basiskosten worden met deze waarde als percentage vermenigvuldigd."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Minimale stadsgrootte voor volledige handel"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4595,11 +4613,11 @@ msgstr ""
 "geleidelijk af tot 0% (geen beperking afgezien van de normale corruptie) "
 "voor grootte=fulltradesize. Zie ook notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Maximum grootte van een stad zonder handel"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4610,11 +4628,11 @@ msgstr ""
 "steden groter dan notradesize en kleiner dan fulltradesize. Zie ook "
 "fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Stadsgrootte voordat inwoners ontevreden worden"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4622,11 +4640,11 @@ msgstr ""
 "Zonder verdere aanpassingen zijn de eerste unhappysize inwoners van een stad "
 "tevreden en alle volgende inwoners ontevreden. Zie ook cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Aantal steden voor grotere ontevredenheid"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4638,11 +4656,11 @@ msgstr ""
 "Dit veronderstelt Democratie; voor andere regeringsvormen treedt het effect "
 "op bij een kleiner aantal steden."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Minimale afstand tussen steden"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4656,11 +4674,11 @@ msgstr ""
 "richting.  Als het op 0 gesteld is (standaard), wordt het overschreven door "
 "de huidige spelregelset wanneer het spel start."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Aantal beurten tussen extase-effect"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4669,11 +4687,11 @@ msgstr ""
 "ingesteld op N, dan zal een stad groeien na een periode van extase van N+1 "
 "beurten."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Kans op het vernietigen van veroverde gebouwen"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4681,11 +4699,11 @@ msgstr ""
 "Wanneer een speler een stad verovert heeft elke stadsverbetering deze kans "
 "om vernietigd te worden."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Kans op het verplaatsen naar een vlak na een aanval"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4700,11 +4718,11 @@ msgstr ""
 "100 is dan zal dit gebruikt worden als de kans op het \"innemen\" van "
 "terrein."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Auto-aanval bestuurd door de server aan/af zetten"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4712,11 +4730,11 @@ msgstr ""
 "Als dit aan staat zullen eenheden die nog kunnen bewegen zelf overwegen een "
 "vijandelijke eenheid die ernaast komt aantal te vallen."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Verminder de stedelijke bevolking na een aanval"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4733,11 +4751,11 @@ msgstr ""
 "  4 = heli\n"
 "  8 = lucht"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Straal van de rijksgrenzen"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4747,11 +4765,11 @@ msgstr ""
 "stad eigendom van die natie. Er zijn speciale regels voor oceaan of vakjes "
 "waarop meer dan 1 natie aanspraak heeft."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Militaire eenheden in het binnenland wekken geen protest op"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4759,11 +4777,11 @@ msgstr ""
 "Als dit aanstaat, geven militaire eenheden binnen de landsgrenzengeen "
 "ontevreden burgers."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "De mogelijkheid om diplomatie met andere spelers te hebben"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4778,11 +4796,11 @@ msgstr ""
 "3 = diplomatie alleen mogelijk binnen teams.\n"
 "4 = dan is diplomatie niet mogelijk."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Toegestane stadsnamen"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4805,11 +4823,11 @@ msgstr ""
 "3 = dan wordt het een speler niet toegestaan de standaard stadsnamen van "
 "andere naties te gebruiken. (tenzij die ook voor deze natie standaard is)."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Verschijningsfrequentie barbaren"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4823,19 +4841,19 @@ msgstr ""
 "3 = frequente verschijning van barbaren\n"
 "4 = razende horden, heel veel barbaren"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Opkomstjaar barbaren"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbaren zullen niet voor dit jaartal verschijnen."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Duur in beurten van een revolutie/opstand"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4844,11 +4862,11 @@ msgstr ""
 "opgegeven aantal beurten in. Indien deze waarde 0 is, dan wordt een "
 "willekeurig getal uit het interval 1-6 gekozen."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Of er oorlogsmist gebruikt moet worden"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4858,11 +4876,11 @@ msgstr ""
 "uw eigen eenheden en steden aan u worden getoond. U zult geen steden en "
 "terreinwijzigingen in niet bekeken vlakken zien."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Basiskans dat een actie van diplomaten en spionnen lukt."
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4871,19 +4889,19 @@ msgstr ""
 "De kans dat een spion van een gelukte missie terugkeert, en de basiskans op "
 "succes voor diplomaten en spionnen."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Of er wel of geen ruimterace wordt toegestaan"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Als deze optie 1 is dan kunnen spelers ruimteschepen bouwen."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Minimum aantal steden voor burgeroorlog"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4893,11 +4911,11 @@ msgstr ""
 "de spelers hoofdstad verovert wordt. Als deze waard op de maximale waarde "
 "wordt ingesteld, dan worden burgeroorlogen in zijn geheel uitgeschakeld."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Beurten dat communicatie met andere spelers mogelijk is."
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4907,12 +4925,12 @@ msgstr ""
 "hun eenheden contact hebben gehad, zonder ambassade. Zet deze op nul om "
 "enkel met ambassade ontmoetingen toe te laten."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Herbouw paleis indien hoofdstad is veroverd"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4923,11 +4941,11 @@ msgstr ""
 "automatisch en gratis een nieuw paleis gebouwd in een andere willekeurige "
 "stad, onafhankelijk van het bezitten van de nodige kennis."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Of er wel of geen natuurlijke stadsnamen worden gebruikt"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -4935,11 +4953,11 @@ msgstr ""
 "Indien aan, dan worden de standaard stadsnamen gebaseerd op het omliggende "
 "terrein."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Type spelers dat gebruikers toegestaan is te 'take'-en"
 
-#: server/settings.c:835
+#: server/settings.c:826
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
@@ -5007,11 +5025,11 @@ msgstr ""
 "\n"
 "4 = Bestuurders niet toegestaan, waarnemers toegestaan;\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Of de KI-status wijzigt bij verbinding"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5020,24 +5038,27 @@ msgstr ""
 "speler verbinding maakt en aangezet worden als een speler de verbinding "
 "verbreekt."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Jaar waarin het spel eindigt"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Het spel zal stoppen op het einde van het gegeven jaar."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Maximum aantal seconden per beurt"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Als niet alle spelers \"Beurt Klaar\" aanklikken voordat deze tijd op is, "
 "dan eindigt de beurt automatisch. Nul betekent geen tijdslimiet. In DEBUG "
@@ -5045,11 +5066,11 @@ msgstr ""
 "Gebruik dit met de opdracht \"timeoutincrease\" voor een dynamische "
 "tijdslimiet."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "Timeout tenminste n seconden wanneer de vijand bewoog"
 
-#: server/settings.c:896
+#: server/settings.c:889
 #, fuzzy
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
@@ -5058,11 +5079,11 @@ msgstr ""
 "Elke keer een eenheid beweegt , zichtbaar door een vijand, krijgt de "
 "overblijvende timeout terug deze waarde als ze al lager was."
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Of er wel of niet gedeelde spelersbeurten gebruikt worden."
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5070,11 +5091,11 @@ msgstr ""
 "Als dit waar is gebeurt de beweging van alle spelers tegelijk. Anders "
 "wisselen de spelers af wie kan bewegen."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Aantal seconden dat een client verbinding mag blokkeren"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5084,11 +5105,11 @@ msgstr ""
 "deze waarde dan wordt deze verbinding gesloten. Nul betekent dat er geen "
 "maximum is los van die die in de protocol implementatie zelf wordt opgelegd."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Maximum aantal seconden voordat de netwerk buffers leeg zijn"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5098,11 +5119,11 @@ msgstr ""
 "seconden tot de buffers van alle verbindingen gedeblokkeerd worden.  Nul "
 "betekent 'niet wachten'."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Aantal seconden tussen PING's"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5110,22 +5131,22 @@ msgstr ""
 "De civserver zal telkens na verloop van dit aantal seconden de clients "
 "controleren met een PING verzoek."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Tijd om een client af te breken"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Als een client niet antwoord op een PING in dit tijdsbestek dan zal de "
 "client verbroken worden."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Wisselbeurt spelmodus"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5133,11 +5154,11 @@ msgstr ""
 "Als dit op 1 wordt gezet, dan zal de beurt niet voorbij zijn totdat alle "
 "spelers dit hebben aangegeven, inclusief de niet-verbonden spelers."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Vaste lengte beurten spel modus"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5147,11 +5168,11 @@ msgstr ""
 "tijdspanne is verlopen, zelfs als alle spelers op \"Beurt Klaar\" gedrukt "
 "hebben."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Wat er in het Volkenkundig Rapport staat"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5192,11 +5213,11 @@ msgstr ""
 "(De volgorde waarin deze tekens staan heeft geen betekenis, maar hun grootte "
 "wel.)"
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Beurten per auto-bewaar"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5204,11 +5225,11 @@ msgstr ""
 "Het spel zal na dit aantal beurten automatisch worden bewaard.\n"
 "Nul betekent niet automatisch bewaren."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Savegame compressieniveau"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5219,11 +5240,11 @@ msgstr ""
 "langere compressietijden. Als het maximum nul is, dan is deze server niet "
 "gecompileerd voor gebruik van zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Auto-bewaar bestandsnaam prefix"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5231,11 +5252,11 @@ msgstr ""
 "Automatisch bewaarde spelen dragen de naam \"<prefix><jaar>.sav\".\n"
 "Deze optie stelt het <prefix> gedeelte in."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Of er wel of niet spelersstatistieken moeten worden bijgehouden"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5249,7 +5270,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Server kan standaard invoer niet lezen. Negeer invoer."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Server: verkeerd adres: [%s:%d]."
@@ -5385,103 +5406,103 @@ msgstr "Kon spel niet als %s bewaren"
 msgid "Game saved as %s"
 msgstr "Spel bewaard als %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Het spel is al begonnen."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr "%s is de spelleiding verloren. Vanaf nu wordt er gestemd."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Spel begint."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "verzoek om onbekend rapport (type %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Waarschuwing: weiger oude client %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Ontving een pakket van type %d van een dode speler of observator"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Kies alstublieft een niet-lege naam."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Die natie wordt al gespeeld."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr ""
 "Er is al een speler met de naam '%s'. Kies alstublieft een andere naam."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Kies alstublieft een naam met alleen ASCII tekens."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "%s natie niet beschikbaar in dit scenarie."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "De %s natie wordt al gespeeld."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s is de %s heerser %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Wacht op start spel: %d van de %d spelers zijn klaar om te beginnen."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s is toegevoegd als een niveau %s KI-gestuurde speler."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Speler %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s regeert de %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Zend info naar metaserver [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Het spel is voorbij..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Accepteer nu nieuwe client-verbindingen."
 
@@ -5502,7 +5523,7 @@ msgstr "(dubbelzinnig)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5676,7 +5697,7 @@ msgstr "Spelers kunnen niet worden verwijderd nadat het spel begonnen is."
 msgid "Removed player %s from the game."
 msgstr "Speler %s verwijderd uit het spel."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Naam \"%s\" verboden wegens veiligheidsredenen"
@@ -5756,202 +5777,202 @@ msgstr ""
 "Kan opdrachttoegangsniveau niet opwaarderen naar '%s'; u hebt zelf slechts '%"
 "s'."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Opdrachttoegangsniveau op '%s' gezet voor verbinding %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 "Opdrachttoegangsniveau kon niet op '%s' gezet worden voor verbinding '%s'."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Opdrachttoegangsniveau op '%s' gezet voor nieuwe spelers."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "Opdrachttoegangsniveau op '%s' gezet voor eerste speler die het neemt."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "De 'first' opdracht heeft geen zin vanaf de server opdrachtregel."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "U hebt al opdrachttoegangsniveau '%s' of beter."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Iemand anders is al spel leider."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "Verbinding %s heeft gekozen om spelleider te worden."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Ongeldige parameter %d"
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 "Gebruik: timeoutincrease <beurt> <beurtmeerwaarde> <waarde> <waardemult>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Dynamische timeout ingesteld op %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Optie:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Beschrijving:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "veranderbaar"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "vast"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Waarde: %d, Minimaal: 0, Standaard: %d, Maximaal: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Waarde: %d, Minimaal: %d, Standaard: %d, Maximaal: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Waarde: \"%s\", Standaard: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Uitleg is beschibaar voor de volgende server-opties:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Nog geen uitleg daarvoor."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Dubbelzinnige optienaam."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Server Operator: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Speler '%s' heeft nu KI-vaardigheidsniveau '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s wordt niet gestuurd door een KI."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Standaard KI-vaardigheidsniveau op '%s' gezet."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Deze opdracht is alleen voor een client."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Gebruik: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Alleen spelers kunnen het away commando gebruiken."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s ingesteld op afwezig-modus."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s is terug in het spel."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Sorry, u hebt geen toegang om optie '%s' te bekijken."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Onbekende optie '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Alle opties met aangepaste waarden"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Alle opties"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Belangrijke opties"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Plaatsafhankelijke opties"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Weinig gebruikte opties"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ betekent u mag deze optie wijzigen"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= betekent de optie is op zijn standaard waarde"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s waarde  (min,max)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Optie"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "beschrijving"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -5959,37 +5980,37 @@ msgstr ""
 "Probeer 'show situational' of 'show rare' om meer opties te zien\n"
 "Probeer 'show changed' om opties met aangepaste waarden te zien."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Kan geen teams meer wijzigen als het spel al begonnen is."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Ongedefiniëerd argument. Gebruik: team <spelernaam> <team>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr "Er is geen team %s. Geef aub een geldige naam of nummer."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Een barbaarse speler kan niet aan een team worden toevoegd."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Speler %s is toegewezen aan team %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Ongedefiniëerde argumenten. Gebruik: vote yes|no [stemnummer]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Waarnemers kunnen niet stemmen."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -5997,39 +6018,39 @@ msgstr ""
 "Je kan alleen stemmen in een draaiend spel. Gebruik 'first' om spelleider te "
 "worden als er nu geen is."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Stemming %d \"%s\": %d voor, %d tegen"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Er zijn geen stemmingen gaande."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Geen geldige laatste stem."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Waarde moet een geheel getal zijn."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Stemming bestaat niet (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "U stemde voor \"%s\""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "U stemde tegen \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6037,427 +6058,454 @@ msgstr ""
 "Ongedefinieerde argumenten. Gebruik: debug <diplomacy <player> | city <x> "
 "<y> | units <x> <y> | unit <id> | tech <player> | timing | info>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Kan deze opdracht alleen gebruiken als het spel al begonnen is."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "%s diplomatie wordt niet langer gedebugged"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "%s diplomatie wordt gedebugged"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "%s tech wordt niet langer gedebugged"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "%s tech wordt gedebugged"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Waarde 2 & 3 moet een geheel getal zijn."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Verkeerde kaart-coördinaten"
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Geen stad op deze coördinaten."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s niet langer debugged"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "%s's %s niet langer debugged."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "%s's %s debugged"
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Waarde 2 moet een geheel getal zijn."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Eenheid %d bestaat niet."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Ongedefiniëerd argument. Gebruik: set <optie> <waarde>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "U mag deze optie niet instellen."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Deze instelling kan niet veranderd worden nadat het spel begonnen is."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Waarde moet een geheel getal zijn."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Waarde buiten bereik (minimaal: 0, maximaal: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Optie: %s is op %d gezet."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Waarde buiten bereik (minimaal: %d, maximaal: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Stringwaarde te lang. Gebruik: set <option> <value>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Optie: %s is ingesteld op \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Sorry, men kan niet globaal waarnemen in dit spel."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr "Sorry, men kan geen dode spelers 'take'-en. Probeer te observeren."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Sorry, men kan geen menselijke spelers 'take'-en in dit spel."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Sorry, men kan geen barbaren waarnemen in dit spel."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Sorry, men kan geen barbaren 'take'-en in dit spel."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Sorry, men kan geen dode spelers waarnemen in dit spel."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Sorry, men kan geen dode spelers 'take'-en in dit spel."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Sorry, men kan geen KI-spelers waarnemen in dit spel."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Sorry, men kan geen KI-spelers 'take'-en in dit spel."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Sorry, men kan geen menselijke spelers waarnemen in dit spel."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "Sorry, men kan geen menselijke spelers 'take'-en in dit spel."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Sorry, men kan niet waarnemen in dit spel."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Sorry, men kan geen spelers 'take'-en in dit spel."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "Sorry, men kan geen spelers met een verbinding 'take'-en in dit spel."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Gebruik: observe [verbindingsnaam] <naam van de speler>"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Gebruik: observe <naam van de speler>"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s bestuurt %s al. Het gebruik van 'observe' zou %s verwijderen"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s observeert %s al"
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s is al een waarnemer."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s neemt nu %s waar"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s neemt nu waar"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Gebruik: take <verbindingsnaam> <naam van de speler>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Gebruik: take <naam van de speler>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Gebruik: take [verbindingsnaam] <naam van de speler>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s bestuurt %s al"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Er is geen speler of verbinding met de naam %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "wordt ontkoppeld van %s"
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s bestuurt nu %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbaars"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "KI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Menselijk"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Actief"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Dood"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s is niet gekoppeld aan enige speler."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Gebruik: detach <naam van de verbinding>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "U kunt andere spelers niet loskoppelen."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s is niet gekoppeld aan enige speler."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s verbreekt verbinding vanaf %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s neemt niet langer waar."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "ontkoppelen van %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Gebruik: load <spelnaam>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "Kan een spel niet laden terwijl een ander spel actief is."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "Kan bewaard spel of scenario met de naam '%s' niet vinden."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "Kon opgeslagen spel niet laden: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Huidige spelregelfolder is \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Spelregelfolder \"%s\" niet gevonden"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Spelregelfolder is al \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Spelregelfolder ingesteld op \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Tot ziens."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Sorry, u mag geen serveropdrachten geven."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Waarschuwing: '%s' opgevat als '%s', maar het is dubbelzinnig. Probeer '%"
 "shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Onbekende opdracht. Probeer '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Uw nieuwe stem annuleerde uw vorige stem."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Nieuwe stem (nummer %d) door %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "U mag deze opdracht niet gebruiken."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(server prompt)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Spel eindigde in een gelijkspel."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Einde van het spel. De server zal herstarten zodra alle clients de "
 "verbinding hebben verbroken."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Kan spel niet beëindigen: geen spel actief."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s heeft opgegeven en kan niet langer winnen."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "U kan uzelf nu niet overgeven."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Niet genoeg spelers, spel zal niet beginnen."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Niet genoeg spelers, spel zal niet beginnen."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Niet genoeg spelers, spel zal niet beginnen."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Alle spelers zijn klaar;het spel wordt gestart."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "Kan spel niet starten: het wachten is tot alle clients de verbinding hebben "
 "verbroken."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Kan spel niet starten: het is al begonnen."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Verbreek verbinding met %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6497,123 +6545,123 @@ msgstr ""
 "  save   - om het huidige spel te bewaren\n"
 "  quit   - om de server te verlaten"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Opdracht:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Beknopt: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Niveau: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "De volgende serveropdrachten zijn beschikbaar:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Help argument '%s' is dubbelzinnig."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Geen overeenkomst voor help argument '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Verkeerd argument voor list: '%s'. Probeer '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Lijst van spelers:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<geen spelers>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "gebruiker %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Dood"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", moeilijkheidsniveau %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", klaar"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", niet klaar"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d verbinding:"
 msgstr[1] " %d verbindingen:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s van %s, (opdrachttoegangsniveau %s), buffergrootte=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (waarnemers modus)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Lijst van teams:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : %s : %d speler"
 msgstr[1] "%2d : %s' : %d spelers"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, fuzzy, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d·:·'%s'·:·1·speler·:·%s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Leeg team: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Lijst met verbindingen met server:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<geen verbindingen>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Lijst van beschikbare scenario's:"
 
@@ -6684,17 +6732,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Technologisch doel is %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "U steelt %s van de %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "De %s stalen %s van u!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "De %s hebben %s gestolen van de %s."
@@ -7217,20 +7265,20 @@ msgstr "Poging om wonder te bouwen voor %s mislukt."
 msgid "Your %s has invalid orders."
 msgstr "Uw %s heeft ongeldige orders."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Grote landmassa - dit kan een paar seconden duren."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Val terug op generator %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Generator 3 kon niet alle grote eilanden plaatsen."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Generator 3 liet %li landmassa ongeplaatst."
@@ -7322,120 +7370,121 @@ msgstr "Misschien is er sprake van misconfiguratie of verkeerde permissies"
 msgid "Cannot find audio file %s"
 msgstr "Kan audiobestand %s niet vinden"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX beurten"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d goud per beurt"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d beurt"
 msgstr[1] "%3d beurten"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "nooit"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/beurt"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d beurt"
 msgstr[1] "%s (%d) %d beurten"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Verouderd"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Gebouwd"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Wereldwonder"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Klein Wonder"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/beurt"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, fuzzy, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d·:·Stedelingen\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Handelsbelasting\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, fuzzy, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d·:·Handelsroute met %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, fuzzy, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d·: In belastingen\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : Bonus van %s (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Verspilling\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Onrust\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Gebruikt\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : In totaal\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Totaal overschot"
@@ -7548,8 +7597,8 @@ msgid "Best defending units"
 msgstr "Beste verdedigende eenheden"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7731,8 +7780,8 @@ msgstr "?verontreiniging:Ver"
 msgid "?cma:Governor"
 msgstr "?cma:Gouverneur"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7999,19 +8048,19 @@ msgstr ""
 "Maak automatisch verbinding met server \"%s\" op poort %d als \"%s\" elke %f "
 "seconden voor %d keren"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "beginner"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "gemakkelijk"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normaal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "moeilijk"
 
@@ -8019,31 +8068,31 @@ msgstr "moeilijk"
 msgid "experimental"
 msgstr "experimenteel"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Start server op ..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Kon de server niet opstarten."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "U zal manueel een server moeten opstarten. Sorry..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Kon niet verbinden met de server."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "We zouden het waarschijnlijk niet van hieruit kunnen starten."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "We hebben serverbeheer (toegangsniveau hack)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "We kunnen de server niet beheren, proberen hem nu af te sluiten."
 
@@ -8146,27 +8195,27 @@ msgstr ""
 "Vereist minimum grootte van %d.\n"
 "\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Staat %s toe."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Staat %s toe (met %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Rivieren"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Sorry, geen help onderwerp voor %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8177,7 +8226,7 @@ msgstr ""
 "Deze pagina is auto-gegenereerd.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
@@ -8186,79 +8235,79 @@ msgstr ""
 "Dit heeft het %s gebouw nodig.\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* De ontdekking van %s zal %s overbodig maken.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* Staat alle spelers met kennis van %s toe om %s eenheden te bouwen.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Staat %s toe (met %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Staat %s toe.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, fuzzy, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Kan alleen gebouwd worden met %s als overheid.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Kan alleen gebouwd worden met %s als overheid.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Kan niet in steden gebouwd worden.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Heeft nooit een thuisstad.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Deze eenheid verliezen is het spel verliezen!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Elke speler mag maar een eenheid van dit type hebben.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Vereist %d bevolking om te bouwen.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Kan %d luchteenheid vervoeren en van brandstof voorzien.\n"
 msgstr[1] "* Kan %d luchteenheden vervoeren en van brandstof voorzien.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Kan %d raketeenheid vervoeren en van brandstof voorzien.\n"
 msgstr[1] "* Kan %d raketeenheden vervoeren en van brandstof voorzien.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Kan %d landeenheid over water vervoeren.\n"
 msgstr[1] "* Kan %d landeenheden over water vervoeren.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8266,125 +8315,125 @@ msgstr ""
 "* Kan handelsroutes maken (moet naar doelstad gaan, minstens 9 vakjes [in "
 "Manhattan afstand] van de thuisstad].\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Kan wonderen helpen bouwen (levert %d productie).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Kan niet ontbonden worden.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr "* Kan ontbonden worden in een stad, recupereert de halve kostprijs.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Kan nieuwe steden bouwen.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Kan %d bevolking bij een stad niet groter dan %d toevoegen.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Kan wegen en spoorwegen helpen bouwen.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Kan mijnen bouwen.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Kan irrigatie aanleggen.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "Kan landbouwgrond maken.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Kan landbouwgrond maken (als %s bekend is).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Kan landbouwgrond maken (als een van %s bekend is).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Kan forten bouwen.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Kan forten bouwen (als %s bekend is).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "Kan forten bouwen (als een van %s bekend is).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Kan vervuiling opruimen.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Kan radioactieve besmetting opruimen.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Kan terreintransformaties uitvoeren.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Kan vliegvelden bouwen.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Kan zich ingraven, geeft 50%% defensiebonus.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Kan infrastructuur afbreken.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Kan diplomatieke diensten verrichten, en speciale spionage mogelijkheden.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Kan diplomatieke diensten verrichten.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "*Zal nooit een diplomaat vs diplomaat gevecht verliezen.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Kan niet worden omgekocht.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Kan vijandelijke luchteenheden aanvallen.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* Is onzichtbaar tenzij direct naast een vijandelijke eenheid of stad.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Kan alleen eenheden op zeevlakken aanvallen (geen landaanvallen).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
@@ -8392,41 +8441,41 @@ msgstr ""
 "* Kan aanvallen vanaf zee-eenheden: tegen vijandelijke steden en op "
 "landvlakken.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Kan geparadropt worden vanaf een bevriende stad (Bereik: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr ""
 "* Levert dubbele verdediging tegen eenheden aangegeven als 'bereden'.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Telt als 'bereden' tegen bepaalde verdedigers.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Een raketeenheid: wordt verbruikt in de aanval.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Een aanval beëindigt de beurt voor deze eenheid.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* De aanval van deze eenheid veroorzaakt een nucleaire explosie!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Krijgt dubbele vuurkracht tegen steden.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Negeert de effecten van stadswallen.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8435,37 +8484,37 @@ msgstr ""
 "* Kan bombarderen (%d per beurt). Deze aanvallen kunnen wel beschadigenmaar "
 "de verdediger nooit doden en zijn geen enkel risico voor de aanvaller.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Levert vijfvoudige verdediging tegen raketten en vliegtuigen.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Negeert terreineffecten (ziet alle vlakken als wegen).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Negeert invloedssferen.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* Een niet-militaire eenheid (kan niet aanvallen, geen krijgstucht).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 "* Een veldeenheid: één ontevredenheid is van toepassing zelfs wanneer niet "
 "agressief.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Kan nooit een veteraan worden.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Kan door oefening of gevechtservaring een veteraan worden.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8474,12 +8523,12 @@ msgstr ""
 "* Moet beurt in een stad of naast land eindigen, of heeft 50%% kans op "
 "vergaan.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* De ontdekking van %s vermindert het risico tot 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s vermindert het risico tot 12%%.\n"
@@ -8488,27 +8537,27 @@ msgstr "* %s vermindert het risico tot 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " of "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?of:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* Eenheid moet in een stad zijn of op een %s na %d beurt.\n"
 msgstr[1] "* Eenheid moet in een stad zijn of op een %s na %d beurten.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Als we nu zouden starten met %s zouden we %d lampen nodig hebben."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8517,91 +8566,91 @@ msgstr ""
 "Om %s te bereiken moeten we eerst %d andere technologieën verwerven. Het "
 "hele project zal in totaal %d lampen nodig hebben."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "U kunt deze technologie niet onderzoeken."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 "Dit aantal kan variëren afhankelijk van wat andere spelers zullen "
 "onderzoeken.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* De eerste speler die %s onderzoekt krijgt een onmiddelijke voorsprong.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Vermindert de kans op vergaan op de oceaan met 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Vermindert de kans op vergaan op de oceaan met 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Verhoogt de vervuiling die de bevolking maakt.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Staat %s toe wegen te bouwen over riviervlakken.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Staat %s om forten te bouwen.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Staat %s toe om luchtbases te bouwen.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Staat %s toe om wegen op te waarderen naar spoorwegen.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Staat %s toe om irrigatie op te waarderen naar landbouwgrond.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Op dit terrein kan geen vervuiling optreden."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* U kan op dit terrein geen steden stichten."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* De kustlijn van dit terrein is niet veilig."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Op dit terrein kunnen eenheden zich niet veilig verplaatsen."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Land eenheden kunnen niet over zee reizen."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Mogelijkheden:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8614,7 +8663,7 @@ msgstr[0] ""
 msgstr[1] ""
 "* Militaire eenheden in het veld zullen %d ontevreden bewoners veroorzaken.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8624,23 +8673,23 @@ msgstr ""
 "zou veroorzaakt worden.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* U betaalt %d keer normale %s onderhoudskost voor uw eenheden.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* U betaalt %d keer normale onderhoudskost voor uw eenheden.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, fuzzy, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* U betaalt %d keer normale %s onderhoudskost voor uw eenheden.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 #, fuzzy
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* U betaalt %d keer normale onderhoudskost voor uw eenheden.\n"
@@ -8648,25 +8697,25 @@ msgstr "* U betaalt %d keer normale onderhoudskost voor uw eenheden.\n"
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr "* Elk van uw steden zal vermijden %d %s voor onderhoud te betalen.\n"
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr "* Elk van uw steden zal vermijden %d voor onderhoud te betalen.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "De kans op burgeroorlog is %d%% als u uw hoofdstad kwijtraakt.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8676,7 +8725,7 @@ msgstr ""
 "land zal verschijnen als u %d steden heeft.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8685,18 +8734,18 @@ msgstr ""
 "* Na de eerste ongelukkige burger door stadsgrootte, komt er nog 1 bij per %"
 "d extra steden.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 "De maximum hoeveelheid die u kan instellen voor wetenschap, goud of "
 "luxegoederen is %d%%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "Heeft onbeperkte wetenschap/goud/luxegoederen normen.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, fuzzy, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8711,7 +8760,7 @@ msgstr[1] ""
 "* U mag krijgswet toepassen.  Elke militaire eenheid in een stad zal %d "
 "ontevreden burgers dwingen tevreden te zijn.\n"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, fuzzy, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8719,7 +8768,7 @@ msgstr[0] "* Maximaal %d eenheden kunnen in een stad krijgswet opleggen.\n"
 msgstr[1] "* Maximaal %d eenheden kunnen in een stad krijgswet opleggen.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8728,15 +8777,15 @@ msgstr ""
 "* U kan uw steden laten groeien door te vieren.  Uw steden moeten tenminste "
 "grootte %d hebben voor ze met deze techniek kunnen snelgroeien.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Uw eenheden kunnen niet worden omgekocht.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Uw eenheden en steden kunnen niet in oproer gebracht worden.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8744,16 +8793,16 @@ msgstr ""
 "* De overheid vervalt tot anarchie wanneer eender welke stad meer dan twee "
 "beurten op rij burgerlijke onrust kent.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Heeft een senaat die oorlogsverklaringen kan tegenhouden.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 "* Partisanen verschijnen wanneer steden door de vijand ingenomen worden.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
@@ -8761,25 +8810,25 @@ msgstr ""
 "* Gebouwen die normaal bonussen tegen ontevredenheid geven , geven nu extra "
 "goud.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "*  Betaalt geen onderhoudskost voor fanatici.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* Heeft geen ontevreden burgers.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, fuzzy, c-format
 msgid "* Veteran %s units.\n"
 msgstr "*·Veteraan·%s·eenheden.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Veteranen.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8789,7 +8838,7 @@ msgstr ""
 "wanneer er niet gevierd wordt.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, fuzzy, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8799,71 +8848,71 @@ msgstr ""
 "gevierd wordt.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, fuzzy, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr "* Elk bewerkt vakje met tenminste 1 %s zal %d bijkomende %s geven.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, fuzzy, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* %s productie wordt rampzalig verspild.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* %s productie wordt rampzalig verspild.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* %s productie wordt zwaar verspild.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* %s productie wordt een beetje verspild.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* %s verspilling neemt snel toe met afstand tot hoofdstat.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* %s verspilling neemt toe met afstand tot hoofdstad.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr "* %s verspilling neem langzaam toe met afstand tot hoofdstad.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Maakt het mogelijk om %s te bouwen.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d ontevreden"
@@ -9322,16 +9371,16 @@ msgstr "Server capaciteits string: %s"
 msgid "Start of turn %d"
 msgstr "Begin van beurt %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "KI-modus is nu %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "AAN"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "UIT"
 
@@ -9362,13 +9411,13 @@ msgstr "?Player:Naam"
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Vlag"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9382,7 +9431,7 @@ msgstr "Grens"
 msgid "Score"
 msgstr "Score"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Team"
 
@@ -9415,36 +9464,36 @@ msgstr "?Player_dlg:Geen Reactie"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "U kan geen verbeteringen verkopen."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "%d %s verkocht voor %d goud."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Kon geen %s verkopen."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "U kan geen eenheden ontbinden."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s kan niet ontbonden worden."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Ontbond %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Kon geen %s ontbinden."
@@ -9752,64 +9801,69 @@ msgstr "Goud: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Bel: %d Lux: %d Wet: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Beweging: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Beweging: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Klik voor meer info}"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s Mensen"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Beurt : %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Goud: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Netto inkomen: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Belastingen: %d; Luxe: %d; Wetenschap: %d"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Onderzoek: %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Broeikas effect kans: %d%% (% +d %%/beurt)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Nucleaire winter kans: %d%% (%+d%%/beurt)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Regering: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9817,55 +9871,55 @@ msgstr[0] " eenheid"
 msgstr[1] " %d eenheden"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Beurten tot doel bereikt: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Beurten tot doel bereikt: %d tot %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "Eenheid keuze"
 msgstr[1] "%d eenheden gekozen"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Geen eenheden gekozen."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Andere: %d burgerlijk, %d militair"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Andere: %d burger"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Andere: %d militair"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Geen op te waarderen eenheden!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Geen van deze eenheden kan opgewaardeerd worden."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9880,72 +9934,72 @@ msgstr[1] ""
 "Waardeer %d eenheden op voor %d goud?\n"
 "Schatkist bevat %d goud."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Toont uw vooruitgang in het onderzoek van de huidige technologie."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "geen onderzoeksdoel."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Toont de vordering van wereldwijde opwarming:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Vervuiling : %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Kans op rampzalige opwarming per beurt: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Toont de vorderingen van de nucleaire winter:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Nucleaire Fallout waarde: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Kans op rampzalige winter per beurt: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Toont uw huidige staatsvorm:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Bevolking:        %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Ondersteuning:   %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Massa:             %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9953,96 +10007,96 @@ msgstr[0] "Massa:             %5d ton"
 msgstr[1] "Massa:             %5d ton"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Reistijd:        %5.1f jaar"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Reistijd:          N/B     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Kans op succes: %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Aankomstjaar:   %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:uit"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconden:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?min/sec:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?uur/min:%02du %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dagen/uren:%02dd %02du"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duur:overschrijding"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "De %s van de %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Waarnemer: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Gebouwen: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Geen."
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Wereldwonderen: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Steden: %d totaal, %d boven drempelwaarde van %d steden."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10050,7 +10104,7 @@ msgstr[0] "%d tevreden voor bezwaring met "
 msgstr[1] "%d tevreden voor bezwaring met "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10058,16 +10112,16 @@ msgstr[0] "%d toegevoegde ontevreden burgers."
 msgstr[1] "%d toegevoegde ontevreden burgers."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Krijgswet van toepassing ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "geen maximum, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10075,20 +10129,20 @@ msgstr[0] "%d eenheid maximaal, "
 msgstr[1] "%d eenheden maximaal, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d per eenheid). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Militaire eenheden in het veld kunnen ontevredenheid veroorzaken. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Militaire eenheden kunnen geen ontevredenheid veroorzaken. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luxe: %d totaal."
@@ -10139,12 +10193,12 @@ msgstr ""
 "De burgemeester is in de war geraakt ivm %s.  U wil er waarschijnlijk zelf "
 "eens naar kijken."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "geen"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "anders"
 
@@ -10198,11 +10252,13 @@ msgid "Ooops..."
 msgstr "Oeps..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Spel: Deze eenheid kan niet worden omgekocht!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10219,6 +10275,7 @@ msgstr "Koop Vijandelijke Eenheid Om"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10259,6 +10316,7 @@ msgstr "Vooruitg_angen:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Naar Spions Eigen Inzicht"
 
@@ -10283,12 +10341,13 @@ msgstr "Verbeter_ingen:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Stads Productie"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "U kunt geen opstand ontketenen in %s."
@@ -10300,6 +10359,7 @@ msgstr "Stad kan niet in opstand komen!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10316,6 +10376,7 @@ msgstr "Ontketen een Opstand!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10325,6 +10386,7 @@ msgstr ""
 "Schatkist bevat %d goud."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10394,11 +10456,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Werp Vijandelijke Eenheid Omver"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Sire, de diplomaat wacht op uw orders"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Sire, de spion wacht op uw orders"
@@ -10499,7 +10563,7 @@ msgstr "Verontreiniging:"
 msgid "_Overview"
 msgstr "_Overzicht"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10524,11 +10588,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d beurten"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Koop"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "Pro_ductie"
@@ -10648,7 +10712,7 @@ msgstr "Ondersteunde eenheden %d"
 msgid "Present units %d"
 msgstr "Aanwezige eenheden %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Cen_treer"
 
@@ -10737,32 +10801,32 @@ msgstr "Hernoem Stad"
 msgid "What should we rename the city to?"
 msgstr "Waarin zullen we de stadsnaam veranderen?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_Wijzig"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Toevoegen _Eerst"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Toevoegen Volge_nd"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Toevoegen _Laatst"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "Kie_s"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "_Toon..."
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10772,13 +10836,13 @@ msgstr "_Toon..."
 msgid "Cities"
 msgstr "Steden"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "Pop_up"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10787,85 +10851,90 @@ msgstr "Pop_up"
 msgid "Improvements"
 msgstr "Verbeteringen"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Wereldwonder"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Alle Steden"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Geen Steden"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Draai Keuze Om"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Bouw Eenheden"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Bouw Stadsverbeteringen"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Bouw Wonderen"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Bouw Eenheid"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Bouw Stadsverbetering"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Bouw Wonder"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Kuststeden"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Zelfde Eiland"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Ondersteunde Eenheden"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Aanwezige Eenheden"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Verbeteringen in Stad"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Wonderen in Stad"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Beschikbare Eenheden"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Beschikbare Verbeteringen"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Beschikbare Wonderen"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Totale Kosten: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10931,127 +11000,127 @@ msgstr "Hoe zullen we de snelkeuze noemen?"
 msgid "Remove this preset?"
 msgstr "Deze snelkeuze verwijderen?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "Ga naar _locatie"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "Pop_up Stad"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "U zegt dat u een revolutie wilt?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revolutie!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Wat Te Plunderen"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Kies wat te plunderen:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Eenheid"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Naam"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Eenheid keuze"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "Activee_r alle"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "Zet ongebruikte eenheden op _wacht"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Naties:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Welke Natie Wilt U Zijn?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Kies Natie"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Willekeurig land"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Kies een natie"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "Eigenschappen"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Leider:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Vrouwelijk"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Mannelijk"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "_Stadsstijlen:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "L_egenda"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "U moet uw geslacht kiezen."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "U moet uw bouwstijl kiezen."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "U moet een geldige naam opgeven."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Waardeer Eenheid Op!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11312,62 +11381,68 @@ msgstr ""
 msgid "Not _ready"
 msgstr "Niet klaa_r"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "Klaa_r "
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "Begin (_S)"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Neem de controle over deze speler over"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Kies _Natie"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_Observeer"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "_Niet Waarnemen"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<KI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<Beginneling KI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<Makkelijke KI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<Normale KI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<Moeilijke KI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Willekeurig"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Observer"
 msgstr " (waarnemer)"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Losgekoppeld"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Ben je zeker dat je het spel wil verlaten?"
 
@@ -12283,217 +12358,217 @@ msgstr "Verbind met netwerkspel (_O)"
 msgid "Connect to Gaming _Zone"
 msgstr "Verbind met Gaming _Zone"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Wachtwoorden komen niet overeen, geef wachtwoord."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Servernaam"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Poort"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versie"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Status"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Spelers"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Commentaar"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Lok_aal netwerk"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Internet _Metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Host:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Login:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Wacht_woord:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Bevest_ig Wachtwoord:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "Maak verbinding (o)"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Verbindingsnaam: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Spelersnaam :%s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Server: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Speler/verbinding info"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s info"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Schakel speler wel/niet klaar"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Kies natie"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Observeer deze speler"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Neem de controle over deze speler over"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Verbreek verbinding"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "Kitoggle speler"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Verwijder speler"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Geef info toegang"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "Geef bestuur toegang"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "Zet op %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "Aantal spelers (KI inbegrepen): (_P)"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "KI sterkte: (_L)"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "Regelset: (_V)"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "_Meer Spel Opties"
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Record"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Score"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Klaar"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Leider"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Kies opgeslagen spel om te laden"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Kies opgeslagen spel om te _Laden"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Bladeren..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Kies een Scenario"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Kies een _Scenario:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Type"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Kies een natie om te spelen:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Kies opslag locatie"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Bewaar Spel"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Bewaarde Spelen: (_g)"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Bewaar Spel in Bestand: (_f)"
 
@@ -12529,7 +12604,7 @@ msgstr "?Building:Naam"
 msgid "Count"
 msgstr "Tel"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12770,28 +12845,28 @@ msgstr "_Werklijsten:"
 msgid "Edit Global _Worklists"
 msgstr "_Wijzig Algemene Werklijst"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Beurten"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "Brontaken:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Toon toekomstige doelen"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Doel_werklijst:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "_Nieuwe algemene werklijst"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Verander Productie"
 
@@ -13098,8 +13173,8 @@ msgid "City shrinks: %d %s"
 msgstr "Stadsslinking : %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13205,11 +13280,11 @@ msgstr "Garnizoensrapport"
 msgid "Maintenance Report"
 msgstr "Onderhoudsrapport"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "werklijst"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13637,21 +13712,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Gebruik video output: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Initialiseer client"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Wacht op het begin van het spel"
 
@@ -14977,7 +15052,7 @@ msgstr "Stadsstijlen:"
 msgid "Unit Selection"
 msgstr "Eenheid keuze"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "GEEN"
 
diff --git a/po/no.gmo b/po/no.gmo
index 9bf2bc3..faf4892 100644
Binary files a/po/no.gmo and b/po/no.gmo differ
diff --git a/po/no.po b/po/no.po
index 7e80f31..e277260 100644
--- a/po/no.po
+++ b/po/no.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-09-01 22:28+0300\n"
 "Last-Translator: Per I. Mathisen <per at freeciv.org>\n"
 "Language-Team: Norwegian <andrearo at stud.ntnu.no>\n"
@@ -60,22 +60,22 @@ msgstr "Luksus"
 msgid "Science"
 msgstr "Forskning"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:B"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:u"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:f"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:B"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:u"
-
 # problem
 #: common/connection.c:515
 #, c-format
@@ -504,82 +504,82 @@ msgstr "Tilkobling under opprettelse."
 msgid "AI Debug messages"
 msgstr ""
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "Folkemorder"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "Ekstremt fiendtlig"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "Fiendtlig"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "Lite samarbeidsvillig"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "Vanskelig"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "Nøytral"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "Respektfull"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "Hjelpsom"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "Entusiastisk"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "Beundrende"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "Bønnfallende"
 
-#: common/player.c:759
+#: common/player.c:764
 #, fuzzy
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Allianse"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Krig"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Våpenhvile"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Fred"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Allianse"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Aldri møtt"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Lag"
 
@@ -625,13 +625,13 @@ msgstr " enhet"
 msgid "Size %d"
 msgstr "Størrelse"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Forsker på Framtidsteknologi %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -643,67 +643,67 @@ msgstr "Forsker p
 msgid "None"
 msgstr "Ingen"
 
-#: common/tech.c:790
+#: common/tech.c:798
 #, fuzzy
 msgid "Future Tech."
 msgstr "Forsker på Framtidsteknologi %d"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Ukjent)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Vei"
 
 # irrigert er tillatt på norsk, men skulle gjerne hatt et bedre ord
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Irrigert land"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Jernbane"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Gruve"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Forurensning"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Hytte"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Festning"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Elv"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Dyrket land"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Flystripe"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Atomavfall"
 
@@ -813,11 +813,11 @@ msgstr "Atombombe"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " og "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?og:, "
 
@@ -977,79 +977,79 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (totalt %d gjentakelse)"
 msgstr[1] " (totalt %d gjentakelse)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Mangler argument for \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Mangler argument for \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d f.Kr"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d e.Kr"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH er satt til å være tom, benytter standard PATH i stedet."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Klarte ikke å lese fra datakatalogen %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "Datastien kan settes via (environment) miljøvariablen FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Nåværende datasti er: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Den nødvendige filen \"%s\" mangler...   avslutter!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Fatal feil: du forsøker å kjøre meg som superbruker!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Bruk en ikke-priviligert konto istedet.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "eksakt treff"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "eneste treff"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "uklar"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "tom"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "for lang"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "ikke treff"
 
@@ -1078,91 +1078,91 @@ msgstr "%s har startet byggingen av %s i %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s selger %s (ikke nødv.) for %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, fuzzy, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "* %s (AI)* AI kan ikke signere noe avtaler i bortemodus"
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, fuzzy, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (AI)* Bryt først alliansen med %s, %s"
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, fuzzy, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (AI)* La oss først få slutt på fiendtlighetene, %s"
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr "*%s (AI)* Du slipper ikke unna så lett, %s. Avtalen gjelder fortsatt."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, fuzzy, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (AI)* Bryt først alliansen med %s, %s"
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr ""
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (AI)* Beklager, å dele utsyn med deg er ikke lenger trygt."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* Velkommen til vår allianse %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, fuzzy, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* Ja, måtte vi stå sammen for alltid, %s"
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* Ja, fred i vår tid!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, fuzzy, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)* Avtale. Ingen flere fiendtligheter, %s"
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, fuzzy, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* Ja, fred i vår tid!"
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, fuzzy, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (AI)* Fred i .... en annen gang"
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1171,17 +1171,17 @@ msgstr ""
 "*%s (AI)* Endelig får jeg tak i deg! Trodde du virkelig at du skulle slippe "
 "unna med dine forbrytelser?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, fuzzy, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)* Din aggresjon mot min allierte var din siste tabbe!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1192,14 +1192,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1212,7 +1212,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1223,13 +1223,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1240,12 +1240,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1256,7 +1256,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1267,7 +1267,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1276,7 +1276,7 @@ msgstr ""
 "*%s (AI)* Ditt forsøk på å erobre verdensrommet alene har avslørt dine "
 "virkelige motiver, og derfor avbryter jeg alliansen vår!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1284,7 +1284,7 @@ msgid ""
 msgstr ""
 "*%s (AI)* Ditt forsøk på å alene dominere verdensrommet er meget truende."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1293,12 +1293,12 @@ msgstr ""
 "*%s (AI)* Dersom du ikke slutter å bygge ditt romskip, kan jeg måtte ta "
 "aksjon!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr "*%s (AI)* Beklager, å dele utsyn med deg er ikke lenger trygt."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1307,7 +1307,7 @@ msgstr ""
 "*%s (AI)* Vær hilset, vår mest troverdige allierte. Vi trenger din hjelp til "
 "å ødelegge vår fiende, %s"
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1316,7 +1316,7 @@ msgstr ""
 "*%s (AI)* Vær hilset, vår allierte. Jeg ser at du ikke har startet krig mot "
 "vår fiende, %s. Hvorfor må jeg minne deg på dine løfter?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1327,19 +1327,19 @@ msgstr ""
 "fredsavtalen med vår fiende, %s! Dette er uakseptabelt, derfor oppløser jeg "
 "vår allianse!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr "*%s (AI)* Vår venn, kan vi foreslå et samlet angrep mot %s?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, fuzzy, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr "*%s (AI)* Vår nabo, kan vi foreslå et samlet angrep mot %s?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1347,7 +1347,7 @@ msgid ""
 msgstr ""
 "*%s (AI)* %s truer oss begge, skal vi foreslå at fiendtlighetene opphører?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1355,59 +1355,64 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Alle alternativer"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (veteran)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Det navnet er ikke tillat."
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Klarer ikke å finne lydfilen %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr "Advarsel: gjestenavnet '%s' har blitt tatt, bytter navn til '%s'."
 
 #
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Gjester er ikke tillatt på denne tjeneren. Beklager."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, fuzzy, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s ble vist bort. Manglet egenskaper."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1416,7 +1421,7 @@ msgstr ""
 "Det har oppstått en feil ved lesing av bruker-databasen, oppretter "
 "forbindelse som gjest '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1424,39 +1429,39 @@ msgstr ""
 "Det har oppstått en feil ved lesing av bruker-databasen. Gjeste-forbindelser "
 "er ikke lov."
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Skriv inn passord for %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Skriv inn et nytt passord (og husk det)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Denne tjeneren krever forhåndsregistrering. Beklager."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, fuzzy, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "Denne tjeneren krever forhåndsregistrering. Beklager."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Beklager, for mange gale forsøk..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1464,31 +1469,31 @@ msgstr ""
 "Advarsel: Det har oppstått en feil ved lagring til brukerdatabasen. "
 "Fortsetter uten å lagre resultatene."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, fuzzy, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s ble vist bort. Manglet egenskaper."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Passordet er feil. Prøv igjen."
 
-#: server/auth.c:549
+#: server/auth.c:569
 #, fuzzy
 msgid "Sorry, your connection timed out..."
 msgstr "Beklager, luftpatruljering er ikke implementert."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "Passordet er for kort, minimum lengde er %d. Prøv igjen."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2266,16 +2271,14 @@ msgid "Cast a vote."
 msgstr "Stemme."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "En spiller med info tilgangsnivå starter et nytt valg som det må stemmes på "
 "ved hver kommando. /vote kommandoen etterfulgt av \"yes\" eller \"no\", og "
@@ -2286,18 +2289,18 @@ msgstr ""
 "Dersom en hel runde går uten at noen stemmer mot et valg, så blir det "
 "vedtatt automatisk."
 
-#: server/commands.c:122
+#: server/commands.c:121
 #, fuzzy
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr "debug [ spiller <spiller> | by <x> <y> | enhet <x> <y> | enhet <id>]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Slår av eller på AI debugging for en gitt entitet."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2305,23 +2308,23 @@ msgstr ""
 "Skriver ut AI debug informasjon om en gitt entitet og skrur av eller på "
 "kontinuerlig utskrift av denne entiteten."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <alternativsnavn> <verdi>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Sett tjeneralternativ."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <spiller> [lag]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Endre, legg til eller fjerne en spillers lagtilhørighet."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2334,15 +2337,15 @@ msgstr ""
 "og ambassader, og sloss sammen for å oppnå lagseier med snittet av de "
 "individuelle poengsummene."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <katalog>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Velg en ny katalog for regeloppsett."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2351,15 +2354,15 @@ msgstr ""
 "Å kalle denne uten argument vil vise deg det nåværende regeloppsettet."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <metalinje>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Sett metaserver infolinje."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2368,19 +2371,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <metalinje>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Sett metaserver endringslinje."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Kontroller metaserver forbindelse."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2393,33 +2396,33 @@ msgstr ""
 "metaserveren."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <addresse>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Sett adressen (URL) for metaserveren det skal rapporteres til."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <spillernavn>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Bytt spillers AI-status."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [forbindelses-navn] <spillernavn>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Ta over en spillers plass i spillet."
 
-#: server/commands.c:185
+#: server/commands.c:184
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2435,15 +2438,15 @@ msgstr ""
 "tilkoblet som global observatør."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [forbindelses-navn] [spillernavn]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Observere en spiller eller hele spillet."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2458,15 +2461,15 @@ msgstr ""
 "tilkoblet som global observatør."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <forbindelsesnavn>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "Fraskilles fra en spiller."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2475,20 +2478,20 @@ msgstr ""
 "forbindelser til å ta over en spiller. "
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <spillernavn>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Opprett en AI spiller med gitt navn."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "'create' kommandoen er kun tilgjengelig før spillet har startet."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2496,16 +2499,16 @@ msgstr ""
 "borte\n"
 "borte"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Setter deg i borte-modus. AI'en vil holde orden for deg."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "AI styrer din nasjon, men gjør ingen store endringer."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2513,11 +2516,11 @@ msgstr ""
 "novice\n"
 "novice <spillernavn>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Sett en eller alle AI-spillere til 'novice'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2529,7 +2532,7 @@ msgstr ""
 "vanskelighetsgraden kun for en spiller."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2537,11 +2540,11 @@ msgstr ""
 "easy\n"
 "easy <spillernavn>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Sett en eller alle AI spillere til 'lett'."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2553,7 +2556,7 @@ msgstr ""
 "vanskelighetsgraden kun for en spiller."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2561,11 +2564,11 @@ msgstr ""
 "normal\n"
 "normal <spillernavn>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Sett en eller alle AI-spillere til 'normal'."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2577,7 +2580,7 @@ msgstr ""
 "kommandoen vanskelighetsgraden kun for en spiller."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2585,11 +2588,11 @@ msgstr ""
 "hard\n"
 "hard <spillernavn>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Sett en eller alle AI spillere til å være vanskelig (hard)."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2601,7 +2604,7 @@ msgstr ""
 "vanskelighetsgraden kun for en spiller."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2609,11 +2612,11 @@ msgstr ""
 "experimental\n"
 "experimental <spiller-navn>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Setter en eller alle AI spillerne til 'experimental'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2628,7 +2631,7 @@ msgstr ""
 "ingen effekt."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2642,11 +2645,11 @@ msgstr ""
 "cmdlevel <nivå> first\n"
 "cmdlevel <nivå> <forbindelsesnavn>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Be om eller sett kommando tilgangsnivå."
 
-#: server/commands.c:276
+#: server/commands.c:275
 #, fuzzy
 msgid ""
 "The command access level controls which server commands are available\n"
@@ -2686,20 +2689,20 @@ msgstr ""
 "kan koble til med det samme navnet. Legg merke til at denne kommandoen nå "
 "tar imot forbindelsesnavn, ikke spillernavn."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <runde> <rundetillegg> <verdi> <faktor>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Se \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2713,42 +2716,42 @@ msgstr ""
 "Bruk denne kommandoen sammen med \"timeout\". Standardverdiene er 0 0 0 1."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 #, fuzzy
 msgid "endgame"
 msgstr "Endre navn"
 
-#: server/commands.c:311
+#: server/commands.c:310
 #, fuzzy
 msgid "End the game immediately in a draw."
 msgstr "Spillet endte uavgjordt"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr ""
 
-#: server/commands.c:316
+#: server/commands.c:315
 #, fuzzy
 msgid "Concede the game."
 msgstr "Klarte ikke laste inn lagret spill."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <spillernavn>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Fjern spilleren fullstendig fra spillet."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2757,7 +2760,7 @@ msgstr ""
 "enheter.  Brukes med måte!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2765,11 +2768,11 @@ msgstr ""
 "save\n"
 "save <filnavn>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Lagre spill til fil."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2786,7 +2789,7 @@ msgstr ""
 "og bruk 'start' kommandoen når alle spillerne har koblet til på nytt."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2794,11 +2797,11 @@ msgstr ""
 "load\n"
 "load <filnavn>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Fortsette et spill fra fil."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2807,28 +2810,28 @@ msgstr ""
 "spillere, regeloppsett og tjeneralternativ vil forsvinne.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <filnavn>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Utfør tjenerkommandoer fra fil."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <filnavn>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Skriv oppsettet som blir brukt nå til en fil som tjenerkommandoer."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Endre tjener-utskrifter mellom 'RFC-style' og vanlig."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Returnerer identiteten til tjeneren."
 
@@ -3348,26 +3351,35 @@ msgstr "Du har for
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s har forårsaket en skandale ved å oppmuntre til opprør i %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr "Startende sjøenheter er ikke støttet. Ingen får %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "År: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Rundens tidsfrist har oversteget sin maksimale verdi, setter til maksimum"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Rundens tidsfrist er mindre enn null, setter den til null."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3411,11 +3423,11 @@ msgstr "Der er ingen forbindelse med navn %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Der er ingen spiller eller forbindelse med navn %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Det har skjedd en global oppvarming!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
@@ -3423,17 +3435,17 @@ msgstr ""
 "Kyststriper har blitt oversvømt og enorme områder grassland har blitt til "
 "ørken."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Atomvinter har oppstått!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Våtområder har tørket opp og enorme områder med grassland har blitt til "
 "tundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3443,7 +3455,7 @@ msgstr ""
 "jernbanen blir kunngjort.\n"
 "      Arbeiderne samler seg til dugnad og bygger jernbane i samtlige byer."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3453,12 +3465,12 @@ msgstr ""
 "jernbanen.\n"
 "      Arbeiderne samler seg til dugnad og bygger jernbane i samtlige byer."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, fuzzy, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Flyttet din %s på grunn av transformasjon fra sjø til land."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, fuzzy, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Oppløste din %s på grunn av transformasjon fra land til sjø."
@@ -3517,53 +3529,53 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr "Du kan velge en ny regjeringsform fra regjeringsmenyen."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Skattenivået er høyere enn max nivå for %s; justert."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Forskningsnivået er høyere enn maksnivået for %s; justert."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Luksusnivået er høyere enn maksnivået for %s; justert."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s gir oss ikke lengre delt utsyn!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 "Senatet vedtar lovforslaget ditt pga de konstante provokasjonene fra %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Den diplomatiske status mellom %s og %s er nå %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3572,14 +3584,14 @@ msgstr ""
 "%s avbrøt den diplomatiske avtalen! Det diplomatiske forholdet mellom %s og %"
 "s er nå %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 "%s har angrepet din allierte %s! Du avbryter alliansen din med angriperen."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3588,43 +3600,43 @@ msgstr ""
 "Spilleren %s som du er på lag med har erklært krig mot %s. Du må avbryte "
 "alliansen med %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Fjernet spiller %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Du har blitt fjernet fra spillet!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s har blitt fjernet fra spillet."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Du har oppnådd kontakt med %s, styrt av %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, fuzzy, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 "%s har angrepet din allierte %s! Du avbryter alliansen din med angriperen."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Kunne ikke starte borgerkrig for %s - for mange spillere"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Kunne ikke starte borgerkrig for %s - for mange spillere"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3633,12 +3645,12 @@ msgstr ""
 "Din nasjon er splittet i en borgerkrig.\n"
 "       %s er proklamert leder for de opprørske fylkene."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s proklamerer allianse med %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3875,21 +3887,21 @@ msgstr "."
 msgid "th"
 msgstr "."
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Demografi tekststrengen inneholder ugyldige bokstaver. Prøv \"help demography"
 "\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Demografi-rapport:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Beklager, demografirapport er ikke tilgjengelig."
 
-#: server/report.c:746
+#: server/report.c:748
 #, fuzzy, c-format
 msgid "The %s of the %s (%s)"
 msgstr "Styresett: %s  Nasjon: %s"
@@ -3900,11 +3912,11 @@ msgstr "Styresett: %s  Nasjon: %s"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Kunne ikke finne en lesbar regeloppsettfil med navnet \"%s\"."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Laster inn regeloppsett"
 
@@ -3920,7 +3932,7 @@ msgstr ""
 "lagrede spill, eller det kan tyde på feil ved selve filen. Fortsett på eget "
 "ansvar."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
@@ -3945,13 +3957,13 @@ msgstr ""
 "støttet. Bruker '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3987,7 +3999,7 @@ msgstr "Intern"
 msgid "Networking"
 msgstr "Nettverk"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Alle"
@@ -4009,7 +4021,7 @@ msgstr "Usedvanlig"
 msgid "Changed"
 msgstr "Endre"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4017,7 +4029,7 @@ msgstr ""
 "Tekststrengen for tillatte forbindelser inneholder ugyldige bokstaver.\n"
 " Prøv  \"help allowconnect\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4025,7 +4037,7 @@ msgstr ""
 "Tekststrengen for startende enheter inneholder ugyldige bokstaver. Prøv "
 "\"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4034,15 +4046,15 @@ msgstr ""
 "Tekststrengen for startende enheter inneholder ikke minst en bygrunnlegger.\n"
 "Prøv \"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -4051,11 +4063,16 @@ msgstr ""
 "Antallet spillere er høyere enn den ønskede verdien, beholder den gamle "
 "verdien."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Du har ikke lov å sette dette alternativet."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Størrelsen på kartet (i tusen ruter)."
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4065,12 +4082,12 @@ msgstr ""
 "  size = 4 er et normalt kart med 4000 ruter (standard)\n"
 "  size = 20 er et stort kart med 20000 ruter"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Kartets topologi"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4139,11 +4156,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Metode brukt for å generere kart"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4163,11 +4180,11 @@ msgstr ""
 "standardverdien blir brukt, så vil startpos innstillingen bli basert på "
 "generatoren. Se på \"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Metode brukt for å velge startposisjoner"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4189,36 +4206,36 @@ msgstr ""
 "Generatorene forsøker å lage riktig antall kontinent for valget av start "
 "posisjoner og antallet spillere."
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Om 1x1 øyer skal være med"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0=ingen 1x1 øyer; 1=noen 1x1 øyer"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Om polene er separate kontinenter"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = kontinenter kan tilsluttes polene, 1 = polene er vanligvis separate"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Hele kartet er temperert"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = vanlig planet som jorden; 1 = hele planeten er temperert"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Gjennomsnittelig terreng som er temperert på planeten"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4250,21 +4267,21 @@ msgstr ""
 "0 betyr en meget kalt planet med store polarområder og ingen tropiske "
 "områder."
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Prosent av terrenget som er land"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr "Denne innstillingen gir gjennomsnittelig terreng som blir land."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Mengde åser/fjell"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4272,11 +4289,11 @@ msgstr ""
 "Små verdier gir flate kart, høye verdier gir et mer brattere terreng med "
 "flere åser og fjell."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Mengde vann på land"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4284,11 +4301,11 @@ msgstr ""
 "Små verdier innebærer mye tørt ørkenlandskap, mens høye verdier betyr et "
 "våtere landskap mer sump, jungel or elver."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "'Seed' for tilfeldig generering av kart"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4298,21 +4315,21 @@ msgstr ""
 "(standardverdi) vil en verdi velges basert på klokkeslettet for å gi et "
 "tilfeldig kart."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Vanlig 'seed' for tilfeldighetsfunksjon"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr "For 0 (standardverdi) vil 'seed' bli valgt basert på klokkeslett."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Mengde felt med \"spesielle\" ressurser"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4320,11 +4337,11 @@ msgstr ""
 "Spesielle ressurser forbedrer terrenget de er på. Serverens variabelskala er "
 "deler pr. tusen."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Mengde hytter (mindre stammelandsbyer)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4332,23 +4349,24 @@ msgstr ""
 "Denne innstillingen sier hvor mange hytter som vil bli plassert på kartet. "
 "Hyttene er små stamme-landsbyer som kan utforskes med enheter."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Minimum antall spillere"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Der må være minimum så mange spillere (tilkoblede spillere eller AIer)før "
 "spillet kan starte."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Maksimalt antall spillere"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4358,11 +4376,11 @@ msgstr ""
 "spillet. Når så mange spillere er tilkoblet under forspillet avvises alle "
 "ytterligere spillere som forsøker å tilkoble."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Totalt antall spillere (inkludert datastyrte spillere)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 #, fuzzy
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
@@ -4371,11 +4389,11 @@ msgstr ""
 "Hvis der er færre enn dette antallet spillere når spillet starter, vil "
 "ekstra AI-spillere bli supplert."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Liste over spillerens opprinnelige enheter"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4403,28 +4421,28 @@ msgstr ""
 "  a = Rask angrepsenhet (f.eks. ryttere)\n"
 "  A = Sterke angrepsenhet (f.eks. katapult)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Området hvor startenheter er"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "Dette er radien innenfor hvor startenhetene er fordelt i starten av spillet."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Antall gull pr spiller ved start"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Hver spiller får denne mengden gull utlevert i starten av spillet."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Antall teknologier i starten av spillet tildelt hver spiller"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4436,11 +4454,11 @@ msgstr ""
 "tech_cost_style i regeloppsettet, så vil en stor verdi for techlevel kan "
 "gjøre de neste teknologiene veldig dyre."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 #, fuzzy
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
@@ -4448,11 +4466,11 @@ msgid ""
 "determined by the ruleset or other game settings."
 msgstr "Dette påvirker hvor fort spillere kan forske fram ny teknologi."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Prosentvis \"straff\" ved endring av forskning"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4462,12 +4480,12 @@ msgstr ""
 "overskudd av forskningsverdi mister man denne prosentandelen av det. Dette "
 "gjelder ikke om man akkurat har gjort et fremskritt denne omgangen."
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Tap ved anskaffelse av teknologi fra diplomati"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4480,11 +4498,11 @@ msgstr ""
 "forske på et nytt fremskritt. Forskningsverdien kan bli negativ dersom dette "
 "er ulik null."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Tap ved anskaffelse av teknologi fra erobring"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4495,11 +4513,11 @@ msgstr ""
 "utvikle en ny teknologi. Forskningsverdien kan bli negativ dersom dette er "
 "ulik null."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Tap av forskningspoeng når du får gratis teknologi"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4513,11 +4531,11 @@ msgstr ""
 "å utvikle et nytt fremskritt. Forskningsverdien kan bli negativ dersom dette "
 "er ulik null."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Mat nødvendig for å få vekst i en by"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4527,12 +4545,12 @@ msgstr ""
 "verdien er multiplisert med en faktor som kommer fra regeloppsettet og som "
 "er avhengig av størrelsen på byen."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Prosentandel mat som går tapt når det er behov for akvedukt"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4542,21 +4560,21 @@ msgstr ""
 "Kloakksystem),  mister den dette antallet prosent av sin mat (eller "
 "halvparten dersom den har Kornlager)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Miste størrelse på by for å få full handel"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4568,11 +4586,11 @@ msgstr ""
 "gradvis til 0% (ingen begrensning utenom normal korrupsjon) for byer med "
 "størrelse fulltradesize. Se også notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Største størrelse på en by uten handel"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4582,11 +4600,11 @@ msgstr ""
 "gradvis for byer større enn notradesize og mindre enn fulltradesize. Se også "
 "fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Bystørrelse før folk blir ulykkelige"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4594,11 +4612,11 @@ msgstr ""
 "Før andre faktorer har innvirkning er de første unhappysize innbyggerne i en "
 "by fornøyde, deretter er innbyggerne ulykkelige. Se også cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Antall byer for øket ulykkelighet"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4610,11 +4628,11 @@ msgstr ""
 "også unhappysize. Dette forutsetter Demokrati, for andre regjerninger er "
 "effekten mindre."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Minste avstand mellom byer"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4627,11 +4645,11 @@ msgstr ""
 "2 ruter mellom 2 byer. Hvis det er satt til 0 (standard) så benyttes verdien "
 "i regelsettet i stedet."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Antallet runder mellom hver feiring"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4639,11 +4657,11 @@ msgstr ""
 "Setter antallet runder mellom vekst fra feiring i en by. Når satt til n vil "
 "byen vokse etter å ha feiret i n+1 runder."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Sjanse for ødeleggelse av bygning ved erobring"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4651,11 +4669,11 @@ msgstr ""
 "Når en spiller erobrer en by, så har hver byforbedring denne prosentsjansen "
 "for å bli ødelagt."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Sjanse for å flytte inn i felt etter angrep"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4668,11 +4686,11 @@ msgstr ""
 "blir angrepet om de vinner over den siste fiendtlige enheten. Verdier mellom "
 "0 og 100 gir varierende sannsynlighet for at området blir \"okkupert\"."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Slå av/på auto-angrep på tjeneren."
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4680,11 +4698,11 @@ msgstr ""
 "Dersom denne er satt på, så vil enheter med tilgjengelig flyttpoeng "
 "automatisk vurdere å angripe fiendtlige enheter som beveger seg i nærheten."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Reduser bybefolkning etter angrep"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4700,11 +4718,11 @@ msgstr ""
 "  4 = heli\n"
 "  8 = luft"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Nasjonale grensers radius"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4714,11 +4732,11 @@ msgstr ""
 "angitte radiusen til en by bli eid av den nasjonen. Det er spesielle regler "
 "for sjøruter og ruter som er innenfor radiusen til flere enn en nasjons byer."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Militære enheter innenfor dine grenser fører ikke til ulykkelighet. "
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4726,11 +4744,11 @@ msgstr ""
 "Dersom denne er satt, så vil enheter ikke forårsake ulykkelighet så lenge de "
 "er innenfor dine egne landegrenser."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Mulighet for å utøve diplomati med andre spillere"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4744,11 +4762,11 @@ msgstr ""
 "Ved verdi 3 er diplomati kun lov innen etablerte lag.\n"
 "Ved verdi 4 er diplomati ikke tilgjengelig for noen."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Tillatte bynavn"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4772,11 +4790,11 @@ msgstr ""
 "standardnavnet til en by som tilhører en annen nasjon, med unntak av dersom "
 "det navnet er standardnavnet for den spillerens nasjon også."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Hvor ofte barbarene dukker opp"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4790,19 +4808,19 @@ msgstr ""
 "3 - høy mengde barbarer \n"
 "4 - vandrende horder, massevis av barbarer"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "År for barbarer"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbarer vil ikke dukke opp før dette året"
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Lengen på revolusjoner i antall turer"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4811,11 +4829,11 @@ msgstr ""
 "antall runder. Dersom denne innstillingen er satt til 0, så blir lengden "
 "tilfeldig valgt mellom 1 og 6 runder."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Hvorvidt 'fog of war' skal tillates"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4825,30 +4843,30 @@ msgstr ""
 "til sine egne enheter og byer. Man kan ikke se nye byer, byer som har vokst "
 "eller landskapsforandringer."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Hvorvidt romkappløp tillates"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Hvis dette alternativet er 1, kan spillerne bygge romskip."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Minimum antall byer for borgerkrig"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4858,11 +4876,11 @@ msgstr ""
 "hovedstaden faller. Hvis dette alternativet er satt til sin største verdi "
 "blir det aldri borgerkrig."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Antall turer til kontakt med spiller er tapt"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4872,12 +4890,12 @@ msgstr ""
 "enheter møttes, selv om de ikke har en ambassade. Sett denne verdien til "
 "null for å hindre at spillere kan møtes uten å ha ambassade."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Bygg nytt palass dersom hovedstaden er erobret"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4889,21 +4907,21 @@ msgstr ""
 "de byene som er igjen. Dette er viktig fordi teknologikravet for å bygge et "
 "palass blir ignorert."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Hvorvidt naturlige bynavn skal benyttes"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr "Om dette er valgt styrer bynavnene etter landskapet rundt byen."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Spillere som har lov til å bruke kommandoen take"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4957,11 +4975,11 @@ msgstr ""
 "4 = Ingen kontroller tillatt, overvatør tillatt.\n"
 
 # Adopterer tysk oversettelse
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Automatisk AI-status"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -4969,24 +4987,27 @@ msgstr ""
 "Dersom denne er satt til 1 stenges datastyring av en tilkoblet spillet, og "
 "settes på når en spiller kobler fra."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "År spillet slutter"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Spillet vil avsluttes når dette året utløper."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Maksimalt antall sekunder pr runde"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Hvis ikke alle spillerne har trykket på \"Runde over\" før tidsbegrensningen "
 "er gått ut, vil runden slutte automatisk. Null betyr ingen tidsbegrensning. "
@@ -4994,32 +5015,32 @@ msgstr ""
 "testmodus. Benytt dette med kommandoen \"timeoutincrease\" for å få en "
 "dynamisk tidsbegrensning på rundene."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 #, fuzzy
 msgid "Whether to have simultaneous player phases."
 msgstr "Hvorvidt spillerstatistikk skal logges"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Maksimal klient-blokkering (sekunder)"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5029,11 +5050,11 @@ msgstr ""
 "verdien, så stenges den. Null betyr at det ikke finnes noen tidsbegrensning, "
 "men forbindelser vil bli automatisk frakoblet til slutt."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Maks sekunder for tømming av nettverksbuffer."
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5043,11 +5064,11 @@ msgstr ""
 "forbindelsers buffere skal ublokkeres. Null betyr at serveren ikke kommer "
 "til å vente."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Sekunder mellom PING"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5055,22 +5076,22 @@ msgstr ""
 "Tjeneren kommer til å kontakte klientene med PING forespørsler etter dette "
 "tids intervallet."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Tidsfrist for å koble fra en klient"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Dersom en klient ikke svarer på en PING innen denne tiden vil den bli koblet "
 "fra."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Rundeblokkerende spillmodus"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
@@ -5079,11 +5100,11 @@ msgstr ""
 "Hvis denne er satt til 1 spillet så går ikke spillet videre til alle\n"
 "spillerne har avsluttet deres runde, inkludert avkoblede spillere."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Fast-lengde runder (spill-modus)"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5092,11 +5113,11 @@ msgstr ""
 "Hvis denne er satt til 1 så går ikke spillrunden videre før tiden har gått "
 "ut, uansett om alle spillere har trykket på \"Runde over\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Hva er i demografirapporten"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5133,11 +5154,11 @@ msgstr ""
 "    b = vis kolonnen \"beste stat\"\n"
 "Rekkefølgen betyr ingenting, men størrelsen på bokstavene gjør det."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Runder pr auto-lagring"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5145,11 +5166,11 @@ msgstr ""
 "Spillet vil automagisk lagres med så mange runders mellomrom. Null betyr at "
 "en ikke ønsker auto-lagring."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Komprimeringsnivå på lagret spill"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5159,11 +5180,11 @@ msgstr ""
 "Høyere tall vil gi høyere komprimering, men ta lenger tid. Dersom maksimum "
 "er null så var ikke tjeneren kompilert for å bruke zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Autolagrings prefiks"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5171,11 +5192,11 @@ msgstr ""
 "Automatisk lagrede spill vil ha navnet \"<forstavelse><år>.sav\". Denne "
 "innstillingen endrer <forstavelse> delen."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Hvorvidt spillerstatistikk skal logges"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5189,7 +5210,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Serveren kan ikke lese fra tastaturet. Ignorerer det."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Server: addressefeil: [%s: %d]."
@@ -5321,102 +5342,102 @@ msgstr "Klarte ikke 
 msgid "Game saved as %s"
 msgstr "Spill lagret som %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Spillet er allerede i gang."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Starter spillet."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "forespørsel etter ukjent rapport (type: %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Advarsel: forkastet gammel klient %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Mottok en nettpakke av type %d fra en død eller observatør spiller"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Vennligst velg et ikke-blankt navn."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Den nasjonen er allerede i bruk."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "En annen spiller kalt '%s' deltar allerede.  Velg et annet navn."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Vennligst velg et navn som kun inneholder ASCII bokstaver."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, fuzzy, c-format
 msgid "%s nation is already in use."
 msgstr "Den nasjonen er allerede i bruk."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s er den %se herskeren %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, fuzzy, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Kan ikke starte spill: det er allerede startet."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, fuzzy, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s ble lagt til som en AI-styrt spiller."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Spiller %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s styrer %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Sender info til metaserver [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Spillet er over..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Aksepterer nå nye klientforbindelser."
 
@@ -5438,7 +5459,7 @@ msgstr "(uklar)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5615,7 +5636,7 @@ msgstr "Spillere kan ikke fjernes etter at spillet har startet."
 msgid "Removed player %s from the game."
 msgstr "Fjernet spiller %s fra spillet."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5692,203 +5713,203 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr "Kan ikke øke kommando tilgangsnivå til '%s'; du har kun '%s' selv."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Kommando tilgangsnivå satt til '%s' for forbindelse %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "Kommando tilgangsnivå kunne ikke settes til '%s' for forbinselse %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Kommando tilgangsnivå satt til '%s' for nye spillere."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "Kommando tilgangsnivå tildeles '%s' første spiller som kobler til."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 #, fuzzy
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "'Førstenivå'-kommandoen gir ikke mening på server-kommandolinje."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Du har allerede tilgangsnivå '%s' eller bedre."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 #, fuzzy
 msgid "Someone else already is game organizer."
 msgstr "Noen andre har allerede tilgangsnivå '%s' eller bedre."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Ugyldig argument %d"
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Bruk: timeoutincrease <runde> <rundetillegg> <verdi> <faktor>"
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Dynamisk rundetidsbegrensning satt til %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Alternativ:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "kan endres"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fastsatt"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Verdi: %d, Minimum: 0, Std.verdi: %d, Maksimum: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Verdi: %d, Minimum: %d, Std.verdi: %d, Maksimum: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Verdi: \"%s\", Std.verdi: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Forklaringer er tilgjengelige for følgende serveralternativ:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Ingen forklaring på det ennå."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Alternativet har flere betydninger."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Server Operatør: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Spiller '%s' har nå AI vanskelighetsgrad '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s er ikke kontrollert av AI'en."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Standard AI vanskelighetsgrad er satt til '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Denne kommandoen er kun for klienten."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Bruk: borte"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s satt til borde-modus."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s har returnert til spillet."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Beklager, du har ikke tilgang til å se alternativ '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Ukjent alternativ '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 #, fuzzy
 msgid "All options with non-default values"
 msgstr "= betyr at alternativet har standardverdi"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Alle alternativer"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Viktige alternativer"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Situasjonsbetingede alternativer"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Sjeldent brukte innstillinger"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ betyr at du kan endre alternativet"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= betyr at alternativet har standardverdi"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s verdi  (min,maks)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Alternativ"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "beskrivelse"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 #, fuzzy
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
@@ -5896,76 +5917,76 @@ msgid ""
 msgstr ""
 "Prøv 'show situational' eller 'show rare' for å vise flere alternativer."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Kan ikke endre lagene når spillet er startet."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 #, fuzzy
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Udefinert argument.  Bruk: team <spiller> [lag]."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Kan ikke tilordne lag til en barbar."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Spiller %s er med i laget %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Udefinert argument.  Bruk: vote yes|no [valgnummer]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Observatører kan ikke stemme."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Valg %d \"%s\": %d for, %d mot"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Det er ingen aktive valg."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Ingen tidligere gyldige valg."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Verdien må være et heltall."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Ingen slik avstemning (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Du stemte for \"%s\""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Du stemte mot \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 #, fuzzy
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
@@ -5974,435 +5995,462 @@ msgstr ""
 "Udefinert argument. Bruk: debug <diplomacy <spiller> | by <x> <y> | enhet "
 "<x> <y> | enhet <id> | tech <spiller>>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Du kan kun benytte denne kommandoen når spillet er i gang."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "%s diplomati blir ikke lenger feilsøkt"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "%s diplomati feilsøking"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "%s tech blir ikke lenger feilsøkt"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "%s tech feilsøking"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Verdi 2 og 3 må være heltall."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Ugyldige kart koordinater."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Ingen by på dette koordinatet."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s er ikke lenger debugget."
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "%ss %s er ikke lenger debugget."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "%ss %s debugget."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Verdi 2 må være heltall"
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Enhet %d eksisterer ikke."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Udefinert argument.  Bruk: set <alternativ> <verdi>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Du har ikke lov å sette dette alternativet."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Denne innstillingen kan ikke endres etter at spillet har startet."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Verdien må være heltall"
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Verdi utenfor område (minimum: 0, maksimum: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Alternativ: %s har blitt satt til %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Verdi utenfor område (minimum: %d, maksimum: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Streng verdi for lang.  Bruk: set <alternativ> <verdi>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Alternativ: %s har blitt satt til \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Beklager, man kan ikke være global observatør i dette spillet."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 "Beklager, man kan styre en global observatør. Prøv å observere den i stedet."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Beklager, man kan ikke overta menneskelige spillere i dette spillet."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Beklager, man kan ikke observere barbarer i dette spillet."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Beklager, man kan ikke styre barbarer i dette spillet."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Beklager, man kan ikke observere døde spillere i dette spillet."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Beklager, man kan ikke styre døde spillere i dette spillet."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Beklager, man kan ikke ovservere AI spillere i dette spillet."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Beklager, man kan ikke styre AI spillere i dette spillet."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 "Beklager, man kan ikke observere menneskelige spillere i dette spillet."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "Beklager, man kan ikke overta menneskelige spillere i dette spillet."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Beklager, man kan ikke observere i dette spillet."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Beklager, man kan ikke overta spillere i dette spillet."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 "Beklager, man kan ikke overta spillere som allerede er tilkoblet i dette "
 "spillet."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Bruk: observe [forbindelses-navn] <spillernavn>"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Bruk: observe <spillernavn>"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s styrer allerede %s. Ved å bruke 'observe' ville det fjerne %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s observerer allerede %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, fuzzy, c-format
 msgid "%s is already observing."
 msgstr "%s observerer allerede %s."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s observerer nå %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, fuzzy, c-format
 msgid "%s now observes"
 msgstr "%s observerer nå %s"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Bruk: take <forbindelsesnavn> <spillernavn>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Bruk: take <spillernavn>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Bruk: take [forbindelsesnavn] <spillernavn>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s styrer allerede %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Der er ingen spiller eller forbindelse med navn %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "kobles fra %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s styrer nå %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "barbarsk"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "AI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Menneske"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Levende"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Død"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s er ikke tilordnet en spillet."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Bruk: detach <forbindelsesnavn>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Du kan ikke fjerne andre brukere."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s er ikke tilordnet en spillet."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s kobler fra %s."
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, fuzzy, c-format
 msgid "%s no longer observing."
 msgstr "%s er ikke lenger debugget."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "fjernes fra %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 #, fuzzy
 msgid "Usage: load <game name>"
 msgstr "Bruk: load <filnavn>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 #, fuzzy
 msgid "Cannot load a game while another is running."
 msgstr "Kan ikke fortsette et spill mens et annet er i gang."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, fuzzy, c-format
 msgid "Could not load savefile: %s"
 msgstr "Klarte ikke laste inn lagret spill i: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Nåværende katalog for regeloppsettet er: \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Kunne ikke finne regeloppsettskatalogen \"%s\""
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, fuzzy, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Regeloppsettkatalogen er \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Regeloppsettkatalogen er \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Adjø."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Beklager, du har ikke lov å benytte kommandoer på serveren."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Advarsel: '%s' tolket som '%s', men dette er ikke nødv. riktig.  Forsøk '%"
 "shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Ukjent kommando.  Forsøk '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Din nye stemme endret din tidligere stemme."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, fuzzy, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Ny stemme, nei. %d, av %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Du har ikke lov å bruke denne kommandoen."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(server kommandolinje)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 #, fuzzy
 msgid "Game ended in a draw."
 msgstr "Spillet endte uavgjordt"
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Avslutter spillet. Serveren vil starte på nytt når alle klienter har koblet "
 "fra."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Kan ikke avslutte spill: det er ikke noe spill igang."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 #, fuzzy
 msgid "You cannot surrender now."
 msgstr "Du kan ikke oppløse enheter."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Ikke nok spillere, spillet vil ikke starte."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Ikke nok spillere, spillet vil ikke starte."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Ikke nok spillere, spillet vil ikke starte."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 #, fuzzy
 msgid "All players are ready; starting game."
 msgstr "Der finnes allerede en spiller med det navnet."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "Kan ikke starte spillet: det venter på at alle klienter skal koble fra."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Kan ikke starte spill: det er allerede i gang."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Avbryter forbindelse til %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6441,126 +6489,126 @@ msgstr ""
 "  save   -  lagre det nåværende spillet\n"
 "  quit   -  avslutte"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Kommando:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Betydning:"
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Nivå: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Følgende serverkommandoer er tilgjengelige:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Hjelpeargument '%s' er ikke entydig."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Ingen treff funnet for hjelpeargument '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Ulovlig listeargument: '%s'.  Forsøk '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Liste over spillere:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<ingen spillere>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "bruker %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Død"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", vanskelighetsgrad %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 #, fuzzy
 msgid ", ready"
 msgstr ", Død"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ""
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d forbindelse:"
 msgstr[1] " %d forbindelse:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s fra %s (kommando tilgangsnivå: %s), buffer størrelse=%dkb"
 
 # heter AI på norsk.. ingen skjønner KI
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (observatør modus)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 #, fuzzy
 msgid "List of teams:"
 msgstr "Liste over spillere:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr ""
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "List opp forbindelser til server:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<ingen forbindelser>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 #, fuzzy
 msgid "List of scenarios available:"
 msgstr "Ingen enheter tilgjengelige"
@@ -6632,17 +6680,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Teknologimålet er %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Du stjeler %s fra %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%s stjal %s fra deg!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "Din %s stjal %s fra %s."
@@ -7166,20 +7214,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr "Din %s har ugyldige ordre."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Mye landmasse - dette kan ta noen sekunder."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Faller tilbake på generator %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Generator 3 plasserte ikke alle de store øyene."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Generator 3 forlot %li landmasse uplassert."
@@ -7271,122 +7319,123 @@ msgstr "Kanskje det er feil ved konfigurasjonen"
 msgid "Cannot find audio file %s"
 msgstr "Klarer ikke å finne lydfilen %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX runder"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d gull per runde"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d runde"
 msgstr[1] "%3d runde"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "aldri"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/runde"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d runde"
 msgstr[1] "%s (%d) %d runde"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Foreldet"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Bygget"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 #, fuzzy
 msgid "Great Wonder"
 msgstr "Underverk"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 #, fuzzy
 msgid "Small Wonder"
 msgstr "Tilgjengelige underverker"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/runde"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, fuzzy, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%s - %s innbyggere"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, fuzzy, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "Handelsruter"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, fuzzy, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "Bygger enheter"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -7499,8 +7548,8 @@ msgid "Best defending units"
 msgstr "Beste forsvarende enheter"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7683,8 +7732,8 @@ msgstr "?pollution [short]:For"
 msgid "?cma:Governor"
 msgstr "Sysselmann"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 #, fuzzy
@@ -7949,19 +7998,19 @@ msgstr ""
 "Auto-tilkobler server \"%s\" på port %d som \"%s\" hvert %f sekund i %d "
 "ganger"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "nybegynner"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "lett"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "vanskelig"
 
@@ -7969,31 +8018,31 @@ msgstr "vanskelig"
 msgid "experimental"
 msgstr "eksperimentell"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Starter tjeneren..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Klarte ikke å starte tjeneren."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Du må starte en tjener selv. Beklager..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Klarte ikke å koble til tjeneren."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Vi kunne sannsynligvis ikke starte herfra."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Vi har kontroll over tjeneren (hack tilgangsnivå)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "Vi kan ikke ta kontroll over tjeneren, forsøker å avslutte den."
 
@@ -8079,27 +8128,27 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, fuzzy, c-format
 msgid "Allows %s."
 msgstr "Tillater %s.\n"
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, fuzzy, c-format
 msgid "Allows %s (with %s)."
 msgstr "Tillater %s (med %s).\n"
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Elver"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Beklager, ikke noe hjelpeemne for %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8110,86 +8159,86 @@ msgstr ""
 "Denne siden ble auto-generert.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr "Du kan ikke forske på denne teknologien."
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Oppdagelsen av %s vil forelde %s.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* Tillater alle spillere med kunnskap om %s å bygge %s enheter.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Tillater %s (med %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Tillater %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Kan ikke bygges i byer.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Har aldri en hjemby.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Å miste denne enheten gjør at du taper spiller!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Hver spiller kan kun ha en av denne enheten.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Krever befolkningstall på %d for å kunne bygges.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Kan frakte og fylle drivstoff på %d flyenhet.\n"
 msgstr[1] "* Kan frakte og fylle drivstoff på %d flyenhet.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Kan transportere og fylle drivstoff på %d rakettenhet.\n"
 msgstr[1] "* Kan transportere og fylle drivstoff på %d rakettenhet.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Kan transportere %d landenhet over vann.\n"
 msgstr[1] "* Kan transportere %d landenhet over vann.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8197,166 +8246,166 @@ msgstr ""
 "* Kan etablere handelsruter (må reise til en annen by som er minst 9 ruter "
 "[i Manhattan avstand] fra denne enhetens hjemby). \n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Kan hjelpe til å bygge underverk (legger til %d produksjon).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Kan ikke oppløses.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Kan oppløses i en by for å få tilbake 50%% av produksjonskonstnadene.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Kan bygge nye byer.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Kan legge til %d innbyggere til byer på størrelse mindre enn %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Kan bygge veier og jernbaner.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Kan bygge gruver.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Kan bygge irrigasjon.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "- Kan bygge dyrket mark.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Kan bygge dyrket mark (dersom %s er kjent).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Kan bygge dyrket mark (dersom en av %s er kjent).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Tillater å bygge fort.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Tillater å bygge fort (dersom %s er kjent).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Tillater å bygge fort (dersom en av følgende er kjent: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Kan fjerne forurensing. \n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Kan fjerne atomavfall.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Kan transformere kartruter.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Kan bygge flyplasser.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Kan befeste, som git 50%% forsvarsbonus.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Kan plyndre for å ødelegge infrastrukturen på kartruter.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Kan utføre diplomatiske forhandlinger, samt spesielle spion-egenskaper.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Kan utføre diplomatiske forhandlinger.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Vil aldri tape en diplomat-mot-diplomat kamp.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Denne enheten kan ikke bestikkes.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Kan angripe fiendtlige luftenheter.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* Er usynlig unntatt når den er ved siden av en fremmed enhet eller by.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Kan kunne angripe enheter på havet (ingen angrep mot land).\n"
 
 # dumbo translation
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr "* Kan fra sjøenheter angripe fiendens byer og enheter på land.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Kan gjøre fallskjermhopp fra vennligsinnet by (Rekkevidde: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Får dobbelt forsvar mot enheter som er 'til hest'.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Teller som 'til hest' mot enkelte forsvarere.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* En rakettenhet: blir brukt opp idet den angriper.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Et angrep avslutter denne enhetens runde.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Denne enhetens angrep skaper en atomeksplosjon!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Får dobbel ildkraft ved angrep på byer.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Bryr seg ikke om bymurer.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8366,36 +8415,36 @@ msgstr ""
 "(aldri drepe) den forsvarende enheten, men innebærer ingen risiko for "
 "angriper.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Får femdoblet forsvar mot raketter og fly.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Bryr seg ikke om terreng (alle felt tilsvarer veier).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Bryr seg ikke om kontrollsoner.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* En ikke-militær enhet (kan ikke angripe; ingen unntakstilstand).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 "* En kampenhet: medfører 1 ulykkelig selv når den er ikke-aggressiv. \n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Oppnår aldri status som veteran.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Kan bli oppnå veteran status gjennom trening eller kamp.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8404,12 +8453,12 @@ msgstr ""
 "* Må avslutte runden i en by eller ved kysten, ellers har den en 50%% sjanse "
 "for å gå tapt på havet.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* Oppdagelsen av %s reduserer risikoen til 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s reduserer risikoen til 12%%.\n"
@@ -8418,27 +8467,27 @@ msgstr "* %s reduserer risikoen til 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " eller "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?eller:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* Enheten må være i en by, eller på en %s etter %d runde.\n"
 msgstr[1] "* Enheten må være i en by, eller på en %s etter %d runde.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Dersom vi hadde startet med %s ville vi trengt %d forskningspoeng."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8447,91 +8496,91 @@ msgstr ""
 "For å nå %s trenger vi å anskaffe %d andre teknologier først. Hele "
 "prosjektet krever %d forskningspoeng for å fullføres."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Du kan ikke forske på denne teknologien."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr "Nummeret kan variere i forhold til hva andre spillere forsker på. \n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* Den første spilleren som forsker på %s får et umiddelbart fremskritt.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 "* Reduserer sannsynligheten for å miste en enhet på dypt hav til 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 "* Reduserer sannsynligheten for å miste en enhet på dypt hav til 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Øker forurensningen skapt av befolkningen.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Tillater %s å bygge veier på elve-felt\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Tillater %s å bygge fort.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Tillater %s å bygge flybaser.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Tillater %s å oppgradere veier til jernbane.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Tillater %s å oppgradere irrigert land til jordbruksland.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Dette terrenget kan ikke bli forurenset."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Kan ikke bygge byer på slikt terreng."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Kystlinja til dette terrenget er utrygg."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Dette terrenget er utrygt for ferdsel."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Landenheter kan ikke ferdes over havterreng."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8542,7 +8591,7 @@ msgid_plural ""
 msgstr[0] "Militære enheter i felten kan føre til ulykkelighet. "
 msgstr[1] "Militære enheter i felten kan føre til ulykkelighet. "
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8550,48 +8599,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8599,23 +8648,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8626,7 +8675,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8634,64 +8683,64 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 #, fuzzy
 msgid "* Your units cannot be bribed.\n"
 msgstr "Denne enheten kan ikke bestikkes."
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 #, fuzzy
 msgid "* Your cities cannot be incited.\n"
 msgstr "Byen kan ikke bli infiltrert!"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 #, fuzzy
 msgid "* Has no unhappy citizens.\n"
 msgstr "%d ulykkelige innbyggere."
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 #, fuzzy
 msgid "* Veteran units.\n"
 msgstr "Sjøenheter"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8699,7 +8748,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8707,71 +8756,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, fuzzy, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Tillater %s å bygge flybaser.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, fuzzy, c-format
 msgid "%s%d %s"
 msgstr "%3d/%3d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d ulykkelig"
@@ -9183,16 +9232,16 @@ msgstr "Server egenskapsstreng: %s"
 msgid "Start of turn %d"
 msgstr "Runden begynner %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "AI modus er nå %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "PÅ"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "AV"
 
@@ -9224,13 +9273,13 @@ msgstr "Navn"
 msgid "Username"
 msgstr "Brukernavn"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Flagg"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9244,7 +9293,7 @@ msgstr "Grense"
 msgid "Score"
 msgstr "Poengsum"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Lag"
 
@@ -9277,36 +9326,36 @@ msgstr "Ledig"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Du kan ikke selge byforbedringer."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Solgte %d %s for %d gull."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Ingen %s kunne selges."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Du kan ikke oppløse enheter."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s kan ikke oppløses."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Oppløste %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Ingen %s kan oppløses."
@@ -9624,64 +9673,70 @@ msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Skatt:%d Luksus:%d Fors:%d"
 
 # problem
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "i %s"
+
+# problem
+#: client/text.c:609
 #, fuzzy, c-format
 msgid "Moving: %s"
 msgstr "i %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr ""
 
-#: client/text.c:625
+#: client/text.c:629
 #, fuzzy, c-format
 msgid "%s People"
 msgstr "%s Velkommen"
 
-#: client/text.c:629
+#: client/text.c:633
 #, fuzzy, c-format
 msgid "Turn: %d"
 msgstr "Terreng: %s"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Gull: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr ""
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, fuzzy, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Skatt:%d Luksus:%d Fors:%d"
 
-#: client/text.c:639
+#: client/text.c:643
 #, fuzzy, c-format
 msgid "Researching %s: %s"
 msgstr "Forsker på %s: %d/%d"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Styreform: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, fuzzy, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9689,58 +9744,58 @@ msgstr[0] " enhet"
 msgstr[1] " enhet"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Runder til mål: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, fuzzy, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Runder til mål: %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, fuzzy, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "Valg av enheter"
 msgstr[1] "Valg av enheter"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 #, fuzzy
 msgid "No units selected."
 msgstr "Nasjon valgt"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 #, fuzzy
 msgid "No units to upgrade!"
 msgstr "Ingen enheter kunne oppgraderes."
 
-#: client/text.c:860
+#: client/text.c:864
 #, fuzzy
 msgid "None of these units may be upgraded."
 msgstr "Ingen enheter kunne oppgraderes."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9755,14 +9810,14 @@ msgstr[1] ""
 "Oppgrader %s til %s for %d gull?\n"
 "Skattkammeret har %d gull."
 
-#: client/text.c:887
+#: client/text.c:891
 #, fuzzy
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 "Viser fremgangen på det nåværende forskningsprosjektet.\n"
 "%s: %d/%d."
 
-#: client/text.c:893
+#: client/text.c:897
 #, fuzzy
 msgid "no research target."
 msgstr ""
@@ -9770,46 +9825,46 @@ msgstr ""
 "(ingen forskning)"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 #, fuzzy
 msgid "Shows the progress of global warming:"
 msgstr ""
 "Viser endringen i global oppvarming:\n"
 "%d."
 
-#: client/text.c:917
+#: client/text.c:921
 #, fuzzy, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Forurensning:  %3d"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 #, fuzzy
 msgid "Shows the progress of nuclear winter:"
 msgstr ""
 "Viser endringen i atomvinter:\n"
 "%d."
 
-#: client/text.c:936
+#: client/text.c:940
 #, fuzzy, c-format
 msgid "Fallout rate: %d%%"
 msgstr "%s maks nivå: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 #, fuzzy
 msgid "Shows your current government:"
 msgstr ""
@@ -9817,25 +9872,25 @@ msgstr ""
 "%s."
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Befolkning:     %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Støtte:           %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energi:           %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9843,96 +9898,96 @@ msgstr[0] "Masse:  %5d tonn"
 msgstr[1] "Masse:  %5d tonn"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Reisetid:        %5.1f år"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Reisetid:           N/A     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Suksess sanns.:      %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Ankomstår: %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:av"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dt %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dd %02dt"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:overflod"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "Styresett: %s  Nasjon: %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, fuzzy, c-format
 msgid "Observer: %s"
 msgstr "Observatør"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Bygninger:"
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Ingen. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Underverk: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Byer: %d totalt, %d over terskelen %d byer."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9940,7 +9995,7 @@ msgstr[0] "%d forn
 msgstr[1] "%d fornøyd før straff med "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9948,16 +10003,16 @@ msgstr[0] "%d ulykkelige innbyggere."
 msgstr[1] "%d ulykkelige innbyggere."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Unntakstilstand ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "ingen maksimum, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9965,20 +10020,20 @@ msgstr[0] "%d enhet maksimalt, "
 msgstr[1] "%d enhet maksimalt, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d per enhet)."
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Militære enheter i felten kan føre til ulykkelighet. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Militære enheter har ingen innvirkning på lykkeligheten."
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luksus: %d totalt"
@@ -10027,12 +10082,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "ingen"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "egendefinert"
 
@@ -10086,11 +10141,13 @@ msgid "Ooops..."
 msgstr "Oops..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Denne enheten kan ikke bestikkes."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10107,6 +10164,7 @@ msgstr "Bestikk fiendens enhet"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10147,6 +10205,7 @@ msgstr "_Fremskritt:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "La spionen velge"
 
@@ -10171,13 +10230,14 @@ msgstr "For_bedringer:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Byproduksjon"
 
 # problem
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Du kan ikke starte opprør i %s."
@@ -10189,6 +10249,7 @@ msgstr "Byen kan ikke bli infiltrert!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10205,6 +10266,7 @@ msgstr "Start oppr
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10214,6 +10276,7 @@ msgstr ""
 "Skattkammeret har %d gull."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10283,11 +10346,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Vend om fiendtlig enhet"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Deres høyhet, diplomaten avventer deres ordre"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Deres høyhet, spionen avventer deres ordre"
@@ -10388,7 +10453,7 @@ msgstr "Forurensning:"
 msgid "_Overview"
 msgstr "_Byoversikt"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10413,11 +10478,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d runder"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Kjøp"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "_Produksjon"
@@ -10540,7 +10605,7 @@ msgstr "St
 msgid "Present units %d"
 msgstr "Enheter tilstede %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Sen_trer"
 
@@ -10629,32 +10694,32 @@ msgstr "Omd
 msgid "What should we rename the city to?"
 msgstr "Hva skal vi omdøpe byen til?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_Endre"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "_Legg til forhåndsvalg"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "_Legg til forhåndsvalg"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "_Legg til forhåndsvalg"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Velg"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "V_is"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10664,13 +10729,13 @@ msgstr "V_is"
 msgid "Cities"
 msgstr "Byer"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "Vis _By"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10679,85 +10744,90 @@ msgstr "Vis _By"
 msgid "Improvements"
 msgstr "Forbedringer"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Underverk"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Alle byer"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Ingen byer"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Snu valg"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Bygger enheter"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Bygger byforbedringer"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Bygger underverk"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Bygger enhet"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Bygger byforbedring"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Bygger underverk"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Byer ved kysten"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Samme øy"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Støttede enheter"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Enheter tilstede"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Forbedringer i by"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Underverk i byen"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Tilgjengelige enheter"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Tilgjengelige Forbedringer"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Tilgjengelige underverker"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Total kostnad:"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 #, fuzzy
 msgid ""
@@ -10826,128 +10896,128 @@ msgstr "Hva skal vi kalle forh
 msgid "Remove this preset?"
 msgstr "Fjern denne innstillingen?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "_Gå til"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "_Vis by"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Så du vil ha revolusjon?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revolusjon!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Hva skal plyndres"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Velg hva som skal plyndres:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Enhet"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Navn"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Valg av enheter"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_Klargjør alle"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "Inaktive enheter hold _stand"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Nasjoner:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Hvilken nasjon vil du være?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 #, fuzzy
 msgid "Pick Nation"
 msgstr "Politistasjon"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Forente Nasjoner"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Velg en nasjon"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Alternativer"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Leder:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Kvinne"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Mann"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "_Bystil:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "_Forklaring"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Du må velge kjønn."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Du må velge stil for byene din."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Du må skrive et gyldig navn."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Oppgrader enhet!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11196,70 +11266,76 @@ msgstr ""
 msgid "Not _ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 #, fuzzy
 msgid "_Ready"
 msgstr "_Klargjør alle"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Start"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Byer"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 #, fuzzy
 msgid "Pick _Nation"
 msgstr "Politistasjon"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 #, fuzzy
 msgid "_Observe"
 msgstr "_Observatør"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "_observerer nå"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 #, fuzzy
 msgid "<AI>"
 msgstr "AI"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 #, fuzzy
 msgid "<Easy AI>"
 msgstr "AI"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 #, fuzzy
 msgid "<Hard AI>"
 msgstr "AI"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 #, fuzzy
 msgid "Random"
 msgstr "Radio"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Observer"
 msgstr "Observatør"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Detached"
 msgstr "Død"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Er du sikker på at du vil avslutte?"
 
@@ -12194,227 +12270,227 @@ msgstr "K_oble til nettverksspill"
 msgid "Connect to Gaming _Zone"
 msgstr "Koble til nettverksspill"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Passordene stemmer ikke, skriv inn passord."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Servernavn"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versjon"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Status"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Spillere"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Kommentar"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Lok_alt Nettverk"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Internett _Metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Tjener"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Portnummer"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Navn:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "_Gjenta passord:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 #, fuzzy
 msgid "C_onnect"
 msgstr "Koble til"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, fuzzy, c-format
 msgid "Connection name: %s"
 msgstr "Tilkobling under opprettelse."
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, fuzzy, c-format
 msgid "Player name: %s"
 msgstr "Navn"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, fuzzy, c-format
 msgid "Host: %s"
 msgstr "Tjener:"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, fuzzy, c-format
 msgid "%s info"
 msgstr "By info"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 #, fuzzy
 msgid "Toggle player ready"
 msgstr "aitoggle <spillernavn>"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 #, fuzzy
 msgid "Pick nation"
 msgstr "Politistasjon"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 #, fuzzy
 msgid "Take this player"
 msgstr "Byer"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 #, fuzzy
 msgid "Cut connection"
 msgstr "Avbryter forbindelse til %s."
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 #, fuzzy
 msgid "Aitoggle player"
 msgstr "aitoggle <spillernavn>"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 #, fuzzy
 msgid "Remove player"
 msgstr "Fjernet spiller %s."
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, fuzzy, c-format
 msgid "Put on %s"
 msgstr "Befolkning: %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "_Antall spillere (inkludert datastyrte spillere):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "Datastyrte spilleres _vanskelighetsgrad:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "Hersker:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "_Flere valg..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 #, fuzzy
 msgid "Record"
 msgstr "Handelsrapport"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 #, fuzzy
 msgid "Rating"
 msgstr "Skrivekunst"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 #, fuzzy
 msgid "Ready"
 msgstr "Klargjør alle"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Leder"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Velg lagrefil å laste"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Velg lagrefil å _laste:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Let etter fil..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Velg et ferdiglagd oppsett"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Velg et ferdiglagd _oppsett:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Type"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Velg en _nasjon å spille:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Velg plassering for å lagre spillet"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Lagre spill"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "_Lagrede spill:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Lagre _filnavn:"
 
@@ -12451,7 +12527,7 @@ msgstr "Bygning"
 msgid "Count"
 msgstr "Antall"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12696,28 +12772,28 @@ msgstr "_Arbeidslister:"
 msgid "Edit Global _Worklists"
 msgstr "Endre globale _arbeidslister"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Runder"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "_Kilde oppgaver:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Vis _framtidige mål"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "_Mål arbeidsliste:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "_Ny arbeidsliste"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "_Endre produksjon"
 
@@ -13022,8 +13098,8 @@ msgid "City shrinks: %d %s"
 msgstr "By: %s (%s)"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13139,12 +13215,12 @@ msgstr "Endelig rapport:"
 msgid "Maintenance Report"
 msgstr "Forskningsrapport"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 #, fuzzy
 msgid "worklist"
 msgstr "(arbeidsliste)"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13583,21 +13659,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -14912,7 +14988,7 @@ msgstr "_Bystil:"
 msgid "Unit Selection"
 msgstr "Valg av enheter"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "INGEN"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index b318e08..d4e5ba9 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index c66907b..daece11 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-09-01 22:37+0300\n"
 "Last-Translator: Mateusz Stefek <matusik_s at o2.pl>\n"
 "Language-Team: none\n"
@@ -58,22 +58,22 @@ msgstr "Luksus"
 msgid "Science"
 msgstr "Nauka"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:B"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:cud"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:P"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:B"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:cud"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -549,82 +549,82 @@ msgid "AI Debug messages"
 msgstr ""
 
 # TO NIE SĄ DOSŁOWNE TŁUMACZENIA, STARAM SIĘ JEDYNIE UTWORZYĆ JAKIEŚ SENSOWNE STOPNIOWANIE
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:Nienawiść"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:Obrzydzenie"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:Wrogość"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:Niechęć"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:Niepokój"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?nation:Obojętność"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:Uprzejmość"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:Zadowolenie"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:Wdzięczność"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:Przyjaźń"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:Harmonia"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Rozejm"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Wojna"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Zawieszenie broni"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Pokój"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Sojusz"
 
 #
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Brak kontaktu"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Zespół"
 
@@ -670,13 +670,13 @@ msgstr "jednostki %s"
 msgid "Size %d"
 msgstr "Rozmiar %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Tech. Przysz. %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -688,68 +688,68 @@ msgstr "Tech. Przysz. %d"
 msgid "None"
 msgstr "Brak"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Tech. Przysz."
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(nieznane)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Droga"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Nawodnienie"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Kolej"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Kopalnia"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Zanieczyszczenie"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 #, fuzzy
 msgid "Hut"
 msgstr "Wyj"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Fort"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 #, fuzzy
 msgid "River"
 msgstr " Rzeki"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 #, fuzzy
 msgid "Farmland"
 msgstr "Zbuduj farmÄ™"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "LÄ…dowisko"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Skażenie"
 
@@ -860,11 +860,11 @@ msgstr "Bomba Atomowa"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " oraz "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?and: oraz "
 
@@ -1028,81 +1028,81 @@ msgstr[0] " (łącznie %d powtórzenie)"
 msgstr[1] " (łącznie %d powtórzenia)"
 msgstr[2] " (łącznie %d powtórzeń)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Pusty argument dla \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Brakuje argumentu dla \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d p.n.e."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d n.e."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH jest ustawione, ale puste; używam domyślnej wartości."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Nie można czytać z katalogu danych %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "Ścieżka danych może być ustawiana przy pomocy zmiennej środowiskowej "
 "FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Bieżący katalog danych to: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Wymagany jest plik \"%s\"... kończę pracę!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Błąd fatalny: próbujesz mnie uruchomić jako administrator!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Użyj do tego konta normalnego użytkownika.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "dokładnie pasujące"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "tylko pasujÄ…ce"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "dwuznaczne"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "puste"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "za długie"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "nie-pasuje"
 
@@ -1131,72 +1131,72 @@ msgstr "%s rozpoczęli budowę %s w mieście %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s sprzedaje niepotrzebne %s za %d złota."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (AI)* W trybie 'away' AI nie może podpisywać takiego traktatu."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (AI)* Zerwij najpierw sojusz z %s, %s"
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (AI)* Na razie wystarczy mi zawieszenie broni, %s"
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr "*%s (AI)* Najpierw spróbuj dotrzymać warunków zawieszenia broni, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 "*%s (AI)* Po prostu jeszcze ci nie ufam na tyle aby zawrzeć sojusz, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (AI)* Nic nie wiem o mieście, o którym wspominasz."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 "*%s (AI)* Niestety, nie mogę dzielić się z tobą widokiem - uważam to za "
 "niebezpieczne."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (AI)* Ta propozycja mi się nie opłaca, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* Witamy w naszym sojuszu %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* Niech nasza sojusz trwa na wieki, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* Pokój to dobre rozwiązanie dla nas!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)* Ok, zgoda. Dość już krwi, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1205,22 +1205,22 @@ msgstr ""
 "*%s (AI) Pozdrowienia %s! Czy mogę ci zaproponować zawieszenie broni? Może "
 "siÄ™ poznamy i polubimy."
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* Kosmos nigdy nie będzie twój."
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr "*%s (AI)* Mam już dość twoich brudnych sztuczek! WOJNA!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (AI)* Pokój? ... raczej nie teraz."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1228,17 +1228,17 @@ msgid ""
 msgstr ""
 "*%s (AI)* Mam już ciebie dość, jak mogłem tak długo tolerować twoje zbrodnie?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (AI)* Twoje próby zirytowania mnie przyniosły skutek. WOJNA!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)* Podniesienie ręki na %s było twoim ostatnim błędem!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1256,14 +1256,14 @@ msgstr[2] ""
 "*%s (AI)* Totalna wojna przeciwko %s rozpocznie siÄ™ w ciÄ…gu %d tur. Musimy "
 "zatrzymać ten statek kosmiczny."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr "*%s (AI)* Oczekujemy twojej pomocy. Niech żyje nasz sojusz!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1283,7 +1283,7 @@ msgstr[2] ""
 "*%s (AI)* %s poważnie naruszył nasze traktaty. Odpowiemy siłą w ciągu %d "
 "tur. Oczekujemy twojej pomocy!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1301,13 +1301,13 @@ msgstr[2] ""
 "*%s (AI)* Zamierzamy złupić i zniszczyć cywilizację %s. Wojna rozpocznie się "
 "w ciÄ…gu %d tur."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr "*%s (AI)* Jeśli zależy ci na łupach, przyłącz się do nas!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1325,12 +1325,12 @@ msgstr[2] ""
 "*%s (A)* Nie możemy dalej tolerować %s. Zniszczmy tą żałosną cywilizację. "
 "Pozostało im jedynie %d tur spokoju."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr "*%s (AI)* Zapewne jako nasz wielki przyjaciel zechcesz nam pomóc."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1348,7 +1348,7 @@ msgstr[2] ""
 "*%s (AI)* Dotrzymamy warunków sojuszu i wypowiemy wojnę %s w ciągu %d tur. "
 "Pomoc przybywa!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1366,7 +1366,7 @@ msgstr[2] ""
 "*%s (AI)* Dotrzymamy sojuszu z %s i wypowiemy wojnÄ™ przeciwko %s w ciÄ…gu %d "
 "tur. Oczekujemy twojej pomocy."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1375,14 +1375,14 @@ msgstr ""
 "*%s (AI)* Twoja próba podbicia kosmosu tylko dla siebie zdradziła twoje "
 "prawdziwe zamiary. Dalszy sojusz z tobÄ… jest bezcelowy!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr "*%s (AI)* Jestem zaniepokojony(a) Twoimi próbami opanowania kosmosu."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1391,14 +1391,14 @@ msgstr ""
 "*%s (AI)* Jeśli nie przerwiesz konstrukcji statku, będę zmuszony powstrzymać "
 "Cię wszelkimi dostępnymi sposobami!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 "*%s (AI)* Niestety, nie mogę dzielić się już więcej z tobą widokiem - uważam "
 "to za niebezpieczne."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1407,7 +1407,7 @@ msgstr ""
 "*%s (AI)* Mój najbardziej zaufany przyjacielu, wzywam cię do zniszczenia "
 "naszego wroga - %s."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1417,7 +1417,7 @@ msgstr ""
 "wojny naszemu wrogowi %s. Czyżbyś zapomniał o naszych wzajemnych "
 "zobowiÄ…zaniach?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1428,7 +1428,7 @@ msgstr ""
 "utrzymać pokój z naszym największym wrogiem, %s! Tak się nie postępuje z "
 "przyjaciółmi, zrywam nasz sojusz!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1437,12 +1437,12 @@ msgstr ""
 "*%s (AI)* Pozdrowienia przyjacielu; razem będziemy silniejsi. Co sądzisz o "
 "sojuszu?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr "*%s (AI)* Pozdrowienia sąsiedzie, proponuję pokój dla wspólnego dobra."
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1451,7 +1451,7 @@ msgstr ""
 "*%s (AI)* Obaj wiele ucierpieliśmy w tym konflikcie. Co sądzisz o przerwaniu "
 "przemocy?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1462,133 +1462,138 @@ msgstr ""
 "zapomniane!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Wszystkie opcje"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (weteran)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "To imiÄ™ nie jest dozwolone."
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Nie mogę znaleźć pliku audio %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 
-#: server/auth.c:384
+#: server/auth.c:404
 #, fuzzy
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Nie masz uprawnień do sterowania pracą serwera."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, fuzzy, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s został odrzucony: Zduplikowany login [%s]."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr ""
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr ""
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr ""
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr ""
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr ""
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr ""
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
 msgstr ""
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, fuzzy, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s został odrzucony: Niezgodność protokołu."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr ""
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr ""
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2377,16 +2382,14 @@ msgid "Cast a vote."
 msgstr "Oddaje głos."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Gracz posiadający poziom dostępu info, który wykonuje komendy z poziomu "
 "control rozpoczyna nowe głosowanie nad daną komendą. Aby zagłosować użyj /"
@@ -2398,7 +2401,7 @@ msgstr ""
 "głosowania, to głosowanie jest rozstrzygane pozytywnie o ile nikt nie "
 "głosował przeciw."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2406,11 +2409,11 @@ msgstr ""
 "debug [ player <gracz> | city <x> <y> | units <x> <y> | unit <id> ]tech "
 "<gracz> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Włącza lub wyłącza debugowanie AI w podanym obiekcie."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2418,23 +2421,23 @@ msgstr ""
 "Wypisuje informacje debugera AI o podanym obiekcie oraz włącza lub wyłącza "
 "debugowanie AI w tym obiekcie."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <opcja> <wartość>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Ustawia opcjÄ™ serwera."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <gracz> [zespół]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Dodaje lub usuwa gracza z zespołu."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2447,15 +2450,15 @@ msgstr ""
 "ambasadami, która dąży do wspólnego zwycięstwa. Ale punktacja jest "
 "prowadzona osobno dla każdego członka zespołu."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <katalog>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Zmienia katalog z zasadami (modpack)."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2465,15 +2468,15 @@ msgstr ""
 "zasadami."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <meta-linia>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Ustawia wiersz informacyjny metaserwera."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2482,19 +2485,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <meta-linia>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Ustawia wiersz Å‚atek metaserwera."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Kontroluje połączenia z metaserwerem."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2505,34 +2508,34 @@ msgstr ""
 "'metaconnection up' lub 'metac u' Łączy z metaserwerem."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <adres>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Ustawia adres (URL) metaserwera, do którego będziemy meldować."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <gracz>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Przełącza kontrolę nad graczem."
 
 #
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [nazwa-połączenia] <nazwa-gracza>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Przypisuje kontrolÄ™ nad graczem."
 
-#: server/commands.c:185
+#: server/commands.c:184
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2547,15 +2550,15 @@ msgstr ""
 "konsoli, to używany jest globalny obserwator."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [nazwa-połączenia] [nazwa-gracza]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Obserwuje gracza lub całą grę."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2569,15 +2572,15 @@ msgstr ""
 "konsoli, to używany jest globalny obserwator."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <nazwa-połączenia>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "odłącza od gracza."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2586,21 +2589,21 @@ msgstr ""
 "użytkownika od gracza."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <gracz>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Tworzy gracza AI o danym imieniu."
 
 #
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "Komenda 'create' jest dostępna jedynie przed rozpoczęciem gry."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2608,19 +2611,19 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 "Ustawia cię w tryb 'away' (odejście). AI będzie pilnowało twojej cywilizacji."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr ""
 "Powoduje przejęcie kontroli nad twoją cywilizacją przez AI, tak aby komputer "
 "nie wykonywał jednak za dużo zmian."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2628,11 +2631,11 @@ msgstr ""
 "novice\n"
 "novice <gracz>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Ustawia jednego bądź wszystkich graczy AI na poziom 'novice'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2643,7 +2646,7 @@ msgstr ""
 "argument) ustawia poziom 'novice' tylko dla tego gracza."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2651,11 +2654,11 @@ msgstr ""
 "easy\n"
 "easy <gracz>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Ustawia jednego bądź wszystkich graczy AI na poziom 'easy'."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2666,7 +2669,7 @@ msgstr ""
 "gracza (jako argument) ustawia poziom 'easy' tylko dla tego gracza."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2674,11 +2677,11 @@ msgstr ""
 "normal\n"
 "normal <gracz>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Ustawia jednego bądź wszystkich graczy AI na poziom 'normal'."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2689,7 +2692,7 @@ msgstr ""
 "argument) ustawia poziom 'normal' tylko dla tego gracza."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2697,11 +2700,11 @@ msgstr ""
 "hard\n"
 "hard <gracz>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Ustawia jednego bądź wszystkich graczy AI na poziom 'hard'."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2712,7 +2715,7 @@ msgstr ""
 "gracza(jako argument) ustawia poziom 'hard' tylko dla tego gracza."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2720,11 +2723,11 @@ msgstr ""
 "experimental\n"
 "experimental <gracz>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Ustawia jednego bądź wszystkich graczy AI w tryb 'experimental'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2738,7 +2741,7 @@ msgstr ""
 "serwerów."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2752,11 +2755,11 @@ msgstr ""
 "cmdlevel <poziom> first\n"
 "cmdlevel <poziom> <gracz>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Pokazuje lub zmienia poziomy dostępu do operacji."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2794,20 +2797,20 @@ msgstr ""
 "Poziomy dostępu nie są zapamiętywane po rozłączeniu ze względów "
 "bezpieczeństwa. Ta komenda przyjmuje nazwy połączeń, a nie nazwy graczy."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "Przyjmij uprawnienia organizatora, jeśli jeszcze go nie ma."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <liczba_tur> <inkrementator> <wartość> <mnożnik>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Zobacz \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2818,24 +2821,24 @@ msgstr ""
 "razem z opcją \"timeout\". Wartości domyślne to 0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Kończy grę remisem."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "surrender"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Poddaje grÄ™."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2844,15 +2847,15 @@ msgstr ""
 "gracze oprócz jednego podadzą się, to zostanie zakończona."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <gracz>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Całkowicie usuwa gracza z gry."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2861,7 +2864,7 @@ msgstr ""
 "rozwagÄ…!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2869,11 +2872,11 @@ msgstr ""
 "save\n"
 "save <nazwa-pliku>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Zapisuje stan gry do pliku."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2889,7 +2892,7 @@ msgstr ""
 "oraz użyć komendy 'start' po ponownym przyłączeniu się graczy."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2897,11 +2900,11 @@ msgstr ""
 "load\n"
 "load <nazwa-pliku>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Wczytuje stan gry z pliku."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2910,28 +2913,28 @@ msgstr ""
 "graczy, zasad i opcji serwera sÄ… resetowane.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <plik>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Wykonuje komendy serwera zapisane w podanym pliku."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <plik>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Zapisuje aktualne ustawienia jako komendy serwera do pliku."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Przełącza pomiędzy 'RFC-style' i normalnym stylem wyświetlania."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Zwraca id serwera."
 
@@ -3455,27 +3458,36 @@ msgstr "Wszczynając bunt w m. %s wywołałeś skandal dyplomatyczny."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s wywołali skandal dyplomatyczny wszczynając bunt w m. %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "Morskie jednostki startowe nie sÄ… jeszcze zaimplementowane, sorry, nikt nie "
 "otrzymał %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Rok: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr "Czas tury przekroczył swoją maksymalną wartość, zmieniam na maksimum"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Czas tury jest mniejszy od zera, zmieniam na zero."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3518,27 +3530,27 @@ msgstr "Nie ma połączenia o nazwie %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Nie ma gracza ani połączenia o nazwie %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Nastąpiło globalne ocieplenie!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 "Wybrzeża zostały podtopione, a ogromna powierzchnia traw stała się pustynią."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Nastąpiła zima nuklearna!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Lądy zostały osuszone, a ogromna powierzchnia traw zamieniła się w tundrę."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3547,7 +3559,7 @@ msgstr ""
 "Nowe nadzieje związane z odkryciem kolei rozprzestrzeniły się po kraju\n"
 "Robotnicy spontanicznie zbierajÄ… siÄ™ i budujÄ… kolej w miastach."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3556,12 +3568,12 @@ msgstr ""
 "Ludzie są zadowoleni z tego, że twoi naukowcy w końcu poznali kolej.\n"
 "       Robotnicy spontanicznie zbierajÄ… siÄ™ i budujÄ… koleje w miastach."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Przesunięto jednostkę %s z powodu zmiany terenu."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Rozproszono jednostkÄ™ %s z powodu zmiany terenu."
@@ -3624,27 +3636,27 @@ msgstr "Rewolucja: powrót do anarchii."
 msgid "You should choose a new government from the government menu."
 msgstr "Wybierz nowy ustrój z menu."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Stawka podatkowa przekroczyła maksimum dla %s; poprawiono."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Stawka naukowa przekroczyła maksimum dla %s; poprawiono."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Stawka luksusowa przekroczyła maksimum dla %s; poprawiono."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s nie dzieli się już z nami widokiem!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3653,14 +3665,14 @@ msgstr ""
 "Twój senat nie zezwala na zerwanie umowy z %s. Musisz, albo rozwiązać senat, "
 "albo poczekać na bardziej dogodny moment."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr ""
 "Senat przyjął twoją decyzję w związku z ciągłymi prowokacjami ze strony %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3668,12 +3680,12 @@ msgid ""
 msgstr ""
 "Senat zabronił zrywania umowy z %s, ale ty bez problemu zwołałeś nowy senat."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Stanem dyplomatycznym między %s i %s jest teraz %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3682,7 +3694,7 @@ msgstr ""
 "%s zerwał(a) porozumienie dyplomatyczne! Stanem dyplomatycznym między %s i %"
 "s jest teraz %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
@@ -3690,7 +3702,7 @@ msgstr ""
 "%s zaatakował twojego sojusznika %s! Warunki sojuszu zobowiązują cię do "
 "natychmiastowej odpowiedzi."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3699,26 +3711,26 @@ msgstr ""
 "Gracz z twojego zespołu %s wypowiedział wojnę %s. Jesteś zmuszony zerwać "
 "sojusz z %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Usuwam gracza %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Zostałeś usunięty z gry!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s został usunięty z gry."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "%s spotkani! RzÄ…dzi nimi %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, fuzzy, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3726,29 +3738,29 @@ msgstr ""
 "%s zaatakował twojego sojusznika %s! Warunki sojuszu zobowiązują cię do "
 "natychmiastowej odpowiedzi."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Nie można rozdzielić gracza %s przez wojnę domową - za dużo graczy"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Nie można rozdzielić gracza %s przez wojnę domową - za dużo graczy"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr "W twoim państwie wybuchła wojna domowa. Przywódcą rebelii jest %s."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s ogłasza sojusz z %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3988,21 +4000,21 @@ msgstr "ci"
 msgid "th"
 msgstr "ty"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Napis określający raport demograficzny zawiera niedozwolone znaki. Spróbuj "
 "\"help demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Raport Demograficzny:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Sorry, Raport Demograficzny nie jest dostępny."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%s %s (%s)"
@@ -4013,11 +4025,11 @@ msgstr "%s %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Nie mogłem znaleźć czytelnego pliku z zasadami \"%s.%s\"."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "WczytujÄ™ zasady"
 
@@ -4033,7 +4045,7 @@ msgstr ""
 "zbyt stara wersja pliku lub uszkodzenie. Kontynuuj na własną "
 "odpowiedzialność."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
@@ -4057,13 +4069,13 @@ msgstr ""
 "Używam: '%s'"
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4100,7 +4112,7 @@ msgstr "Wewnętrzne"
 msgid "Networking"
 msgstr "Sieciowe"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Dowolny"
@@ -4121,7 +4133,7 @@ msgstr "Rzadkie"
 msgid "Changed"
 msgstr "Zmienione"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4129,7 +4141,7 @@ msgstr ""
 "Napis określający dopuszczalne połączenia zawiera\n"
 "niedozwolone znaki.  Spróbuj \"help allowtake\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4137,7 +4149,7 @@ msgstr ""
 "Napis określający początkowe jednostki zawiera nieprawidłowe znaki.\n"
 "Spróbuj: \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4146,15 +4158,15 @@ msgstr ""
 "Ciąg znaków z początkowymi jednostkami nie zawiera budowniczych miast.  "
 "Sprawdź \"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "Nie można zmieniać opcji maxplayers w trybie GGZ."
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -4163,11 +4175,16 @@ msgstr ""
 "Liczba graczy jest większa od podanej wartości; pozostawiam poprzednią "
 "wartość."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Nie możesz zmienić tej opcji."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Rozmiar mapy (w tysiącach pól)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4177,12 +4194,12 @@ msgstr ""
 "  size = 4 to normalna mapa z 4,000 pól (domyślnie)\n"
 "  size = 20 to ogromna mapa z 20,000 pól"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Topologia mapy"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4250,11 +4267,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Sposób generowania mapy"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4273,11 +4290,11 @@ msgstr ""
 "Liczby podane wewnątrz [] oznaczają domyślne wartości opcji startpos. Zobacz "
 "opcjÄ™ \"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Sposób wyboru pozycji początkowych"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4298,37 +4315,37 @@ msgstr ""
 "Uwaga: Generator stara się utworzyć odpowiednią liczbę wysp na podstawie  "
 "tej opcji"
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Dopuszczenie wysp rozmiaru 1x1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = brak wysp 1x1; 1 = możliwość występowania wysp 1x1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Czy bieguny znajdujÄ… siÄ™ na odseparowanych kontynentach"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = kontynenty mogą być połączone z biegunami\n"
 "1 = bieguny sÄ… na odseparowanych kontynentach"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Jednakowa temperatura na całej mapie"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = zwyczajna ziemska planeta; 1 = wyrównany klimat na całej planecie"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Temperatura planety"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4354,32 +4371,32 @@ msgstr ""
 "30  oznacza zimnÄ… planetÄ™: niewielkie strefy tropikalne\n"
 "0   oznacza mroźną planetę: ogromne strefy polarne, brak tropików"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Procent lądów na mapie"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr "Ta opcja oznacza przybliżony procent mapy, który będzie lądem."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Ilość gór/wzgórz"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
 msgstr ""
 "Małe wartości dają więcej równin, wysokie wartości dają więcej wzgórz i gór."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Liczba wody na lÄ…dach"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4387,11 +4404,11 @@ msgstr ""
 "Niewielkie wartości dają suchy, pustynny ląd; większe oznaczają mokry ląd z "
 "bagnami, dżunglami i rzekami."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "`Ziarno' losowej generacji mapy"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4401,11 +4418,11 @@ msgstr ""
 "powoduje losowanie samego `ziarna', dajÄ…c w efekcie mapÄ™ losowÄ….Ta opcja "
 "jest przydatna jedynie w procesie odpluskwiania, dla graczy nie ma znaczenia."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Ziarno losowania w grze"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4413,11 +4430,11 @@ msgstr ""
 "Domyślna wartość 0 = losowanie wartości `ziarna' wg czasu. Ta opcja jest "
 "przydatna jedynie do odpluskwiania gry. Dla graczy nie ma znaczenia"
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Liczba pól kryjących zasoby \"specjalne\""
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4425,11 +4442,11 @@ msgstr ""
 "Zasoby specjalne ulepszają właściwości terenu na którym się znajdują. "
 "Wartość podawana jest w promilach."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Liczba chatek (wiosek mniejszych plemion)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4438,23 +4455,24 @@ msgstr ""
 "niewielkie wioski pomniejszych plemion, w których można znaleźć wartości lub "
 "barbarzyńców."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Minimalna liczba graczy"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Musi istnieć co najmniej podana liczba graczy (tych połączonych plus AI) "
 "zanim gra siÄ™ rozpocznie."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Maksymalna liczba graczy"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4464,11 +4482,11 @@ msgstr ""
 "liczba graczy jest równa podanej liczbie, to każdy nowy gracz, który będzie "
 "chciał się połączyć zostanie odrzucony."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Liczba graczy (Łącznie z botami)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4476,11 +4494,11 @@ msgstr ""
 "Jeśli podana liczba będzie dodatnia, to zostanie utworzona lub usunięta "
 "odpowiednia liczba graczy AI, aby wyrównać liczbę graczy do podanej wartości."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Lista poczÄ…tkowych jednostek graczy"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4508,28 +4526,28 @@ msgstr ""
 "    a   = Szybka jednostka atakujÄ…ca (np. Konnica)\n"
 "    A   = Silna jednostka atakujÄ…ca (np. Katapulta)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Rozrzucenie poczÄ…tkowych jednostek"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "Jest to promień koła, w którym początkowe jednostki zostaną rozrzucone."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "ZÅ‚oto na gracza na starcie"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Na początku gry każdy gracz otrzymuje podaną liczbę złota."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Liczba początkowych wynalazków na gracza"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4541,11 +4559,11 @@ msgstr ""
 "'tech_cost_style' w zestawie zasad duża wartość techlevel może spowodować, "
 "że następne technologie będą drogie."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Mnożnik kosztu technologii (w procentach)"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4555,11 +4573,11 @@ msgstr ""
 "wszystkich technologi będzie mnożony przez tą wartość (procentowo). Koszy "
 "technologi sÄ… determinowane przez zestawy zasad i inne ustawienia gry."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Procentowa strata za zmianÄ™ technologii"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4569,12 +4587,12 @@ msgstr ""
 "wsześniejsze punkty odkryć, stracisz podany procent tych punktów. Utrata nie "
 "ma miejsca jeśli w danej turze, (przed chwilą) odkryłeś pewną technologię."
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Strata przy uzyskiwaniu technologii przez traktat"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4586,11 +4604,11 @@ msgstr ""
 "punkty odkryć w liczbie równej podanemu procentowi aktualnego kosztu nowej "
 "technologii. Może się zdarzyć, że twoje punkty odkryć spadną poniżej zera."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Strata przy uzyskiwaniu technologii przez podbój"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4600,11 +4618,11 @@ msgstr ""
 "punkty odkryć w liczbie równej podanemu procentowi aktualnego kosztu nowej "
 "technologii. Może się zdarzyć, że twoje punkty odkryć spadną poniżej zera."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Strata przy uzyskiwaniu darmowej technologii"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4617,11 +4635,11 @@ msgstr ""
 "procentowi aktualnego kosztu nowej technologii. Może się zdarzyć, że twoje "
 "punkty odkryć spadną poniżej zera."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Żywność potrzebna miastu do wzrostu"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4631,12 +4649,12 @@ msgstr ""
 "do zwiększenia rozmiaru miasta. Inne współczynniki pochodzą z zestawu zasad "
 "i zależą od rozmiaru miasta."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Procent żywności traconej z powodu braku akweduktu"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4646,11 +4664,11 @@ msgstr ""
 "akwedukt (lub kanalizacja), traci ono podany procent zapasów (albo połowę "
 "tej wartości jeśli miasto posiada Spichlerz)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Procentowy mnożnik kosztu produkcji"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4658,11 +4676,11 @@ msgstr ""
 "Ta opcja kontroluje prędkość produkcji budynków i jednostek. Podstawowe "
 "koszty są mnożone przez tą wartość (wyrażoną w procentach)."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Minimalny rozmiar miasta, które ma maksymalny handel"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4675,11 +4693,11 @@ msgstr ""
 "stopniowo do 0%(inne straty powodowana przez korupcjÄ™ nadal istniejÄ…). "
 "Zobacz także notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Maksymalny rozmiar miasta bez handlu"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4689,11 +4707,11 @@ msgstr ""
 "wytwarzajÄ… handlu. Wytworzony handel wzrasta stopniowo dla miast o rozmiarze "
 "pomiędzy notradesize i fulltradesize. Zobacz także fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Rozmiar miasta zanim obywatele staną się nieszczęśliwi"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4702,11 +4720,11 @@ msgstr ""
 "mieszkańców jest zadowolona, pozostali są niezadowoleni. Zobacz także "
 "cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Liczba miast, po której niezadowolenie wzrasta"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4719,12 +4737,12 @@ msgstr ""
 "jedynie dla Demokracji, dla innych ustrojów taki próg jest odpowiednio "
 "mniejszy(w zależności od zasad)."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Minimalna odległość między miastami"
 
 #
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4738,11 +4756,11 @@ msgstr ""
 "citymindist jest ustawiony na 0 (domyślnie), efektywna wartość jest "
 "określana przez wczytany plik z zasadami."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Opóźnienie efektu świętowania."
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4750,11 +4768,11 @@ msgstr ""
 "Opóźnia wzrost miasta spowodowany świętowaniem. Jeżeli ustawione na n, "
 "miasto zacznie rosnąć po n+1 turach świętowania."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Szansa na zniszczenie budynku podczas podboju"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4762,11 +4780,11 @@ msgstr ""
 "Kiedy gracz podbija miasto, każdy obiekt w mieście może zostać zniszczony z "
 "tym prawdopodobieństwem."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Szansa na ruch na atakowane pole po ataku"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4781,11 +4799,11 @@ msgstr ""
 "100, będzie oznaczać procentowe prawdopodobieństwo przemieszczenia się na to "
 "pole."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Włącza i wyłącza autoatak (po stronie serwera)"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4793,11 +4811,11 @@ msgstr ""
 "Jeśli ta opcja jest włączona, to jednostki będą mogły automatycznie rozważać "
 "atakowanie jednostek, które staną na polu obok."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Zmniejsz populacjÄ™ po ataku"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4813,11 +4831,11 @@ msgstr ""
 "  4 = helikoptery\n"
 "  8 = lotnicza"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Promień granic państw"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4827,11 +4845,11 @@ msgstr ""
 "obejmowały tereny dookoła miast (promień koła jest podany przy tej opcji). "
 "Skomplikowane zasady dotyczą oceanów i terenów spornych."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Jednostki nie powodują niezadowolenia we własnych granicach"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4839,11 +4857,11 @@ msgstr ""
 "Jeżeli ustawione na 1, jednostki znajdujące się wewnątrz własnych granic nie "
 "będą powodować niezadowolenia."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Możliwość prowadzenia dyplomacji z innymi graczami"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4857,11 +4875,11 @@ msgstr ""
 "3 = dyplomacja jest dozwolona jedynie wewnątrz zespołów.\n"
 "4 = dyplomacja jest całkowicie zakazana."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Powtarzanie siÄ™ nazw miast"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4881,11 +4899,11 @@ msgstr ""
 "nazwy miast nie mogą się nigdzie powtarzać. Jeśli ustawione na 3 gracze nie "
 "mają prawa użyć domyślnych nazw miast innych narodów."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Częstotliwość pojawiania się barbarzyńców"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4899,19 +4917,19 @@ msgstr ""
 "3 - częste barbarzyńskie powstania \n"
 "4 - wściekłe hordy, mnóstwo barbarzyńców"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Rok pojawienia się barbarzyńców"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbarzyńcy nie pojawią się przed podanym rokiem."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Długość trwania rewolucji"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4920,11 +4938,11 @@ msgstr ""
 "Jeśli podano wartość 0, to długość rewolucji będzie losową liczbą tur z "
 "przedziału 1-6."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "'Mgła wojny' (Fog of war)"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4934,11 +4952,11 @@ msgstr ""
 "będą widoczne. Nie będziesz wiedział co się dzieje na polach, których nie "
 "obserwujesz."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Podstawowa szansa na sukces dyplomatów."
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4947,19 +4965,19 @@ msgstr ""
 "Szansa na powrót szpiega ze zwycięskiej misji oraz szansa powodzenia różnych "
 "akcji podejmowanych przez dyplomatów i szpiegów."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Czy pozwolić na wyścig kosmiczny"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Jeśli wynosi 1, można budować statki kosmiczne."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Minimalna liczba miast przed wojnÄ… domowÄ…"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4969,11 +4987,11 @@ msgstr ""
 "miast, a jego stolica została przejęta. Jeśli ta wartość jest ustawiona na "
 "maksimum, wojny domowe są całkowicie niemożliwe."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Utrata kontaktu po podanej liczbie tur"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4983,12 +5001,12 @@ msgstr ""
 "od ostatniego kontaktu. Jeśli opcja jest ustawiona na zero, to takie "
 "spotkania są niemożliwe (chyba że gracze mają ambasadę)."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Odbuduj pałac po utracie stolicy"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4999,11 +5017,11 @@ msgstr ""
 "odbudowywany za darmo w innym losowo wybranym mieście, nawet gdy gracz nie "
 "odkrył jeszcze murarstwa."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Czy używać inteligentnego nazywania miast"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -5011,11 +5029,11 @@ msgstr ""
 "Jeśli włączone, domyślne nazwy miast będą zależały od terenu dokoła pola "
 "miasta."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Do jakich graczy użytkownicy mogą się przyłączyć"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -5077,11 +5095,11 @@ msgstr ""
 "\"Wymienianie połączeń\" oznacza przejęcie kontroli nad cywilizacją "
 "kontrolowaną już przez innego użytkownika.\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Czy status AI jest przełączany podczas połączenia"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5089,35 +5107,38 @@ msgstr ""
 "Jeżeli ustawione na 1, status AI jest wyłączany gdy gracz się połączy, a "
 "włączany gdy gracz się rozłączy."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Rok końca gry"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Gra zakończy się pod koniec podanego roku."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Maksymalna liczba sekund na turÄ™"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Tura kończy się zawsze po podanym czasie, chyba że wcześniej wszyscy "
 "zawodnicy nacisnęli \"Koniec Tury\". Używaj tej opcji razem z "
 "\"timeoutincrease\", aby dynamicznie zmieniać timeout. W serwerach typu "
 "DEBUG, timeout ustawiony na -1 oznacza grÄ™ w trybie autogame test."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "Licznik ustawiony na co najmniej n sekund przy ruchy przeciwnika"
 
-#: server/settings.c:896
+#: server/settings.c:889
 #, fuzzy
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
@@ -5128,11 +5149,11 @@ msgstr ""
 "jeśli był niższy."
 
 #
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Czy fazy gry są równoczesne dla wszystkich graczy."
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5140,11 +5161,11 @@ msgstr ""
 "Jeśli ta opcja jest ustawiona, to wszyscy gracze będą ruszać się "
 "jednoczenie. Jeśli nie, to fazy ruchu będą osobne."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Dozwolony czas blokowania TCP (w sekundach)"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5154,11 +5175,11 @@ msgstr ""
 "wartość, to połączenie zostaje zerwane. Zero oznacza, że nie ma limitu "
 "oprócz tego zdefiniowanego w implementacji protokołu TCP."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Zwłoka (sek.) na opróżnienie buforów TCP"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5167,31 +5188,31 @@ msgstr ""
 "Serwer Freeciv będzie czekał przez podany czas na odblokowanie buferów TCP. "
 "Zero oznacza, że serwer nie będzie czekał."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Liczba sekund pomiędzy PINGami"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr "Serwer Freeciv będzie wysyłał PINGi co podaną liczbę sekund."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Maksymalny czas na odpowiedź"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Jeżeli klient nie odpowie PONG przez podany czas, to zostanie rozłączony."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Tryb rozgrywek `blokada końca tury'"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
@@ -5200,11 +5221,11 @@ msgstr ""
 "Jeśli ma wartość 1 - Zawsze czekamy na zakończenie tury przez każdego z "
 "uczestników, także tych chwilowo rozłączonych z serwerem."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Tryb rozgrywek `stała długość trwania tury'"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5213,11 +5234,11 @@ msgstr ""
 "Jeśli ma wartość 1 - Zawsze czekamy na zakończenie ustalonego czasu trwania "
 "tury, nawet wtedy, gdy wszyscy kliknęli \"Koniec Tury\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Co jest publikowane w raporcie demograficznym"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5256,11 +5277,11 @@ msgstr ""
 "    b = Prowadzący naród\n"
 "(Kolejność znaków nie ma znaczenia, ale wielkość liter tak.)"
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Co ile tur robić auto-save'a"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5268,11 +5289,11 @@ msgstr ""
 "Gra będzie automatycznie zapisywana co podaną liczbę tur. Zero oznacza brak "
 "auto-save'ów."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Stopień kompresji save-game'a"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5282,11 +5303,11 @@ msgstr ""
 "Większe wartości dają lepszą kompresję, która trwa dłużej. Jeżeli maksimum "
 "jest równe zeru to serwer nie został skompilowany z możliwością użycia zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Przedrostek autosave'a"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5295,11 +5316,11 @@ msgstr ""
 "podanym przedrostkiem."
 
 #
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Czy zapisywać statystyki graczy"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5313,7 +5334,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Serwer nie może czytać ze standardowego wejścia. Wejście ignorowane."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Serwer: zły adres: [%s:%d]."
@@ -5449,104 +5470,104 @@ msgstr "Nie mogę zachować gry jako %s"
 msgid "Game saved as %s"
 msgstr "Gra zachowana jako %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Gra jest już uruchomiona."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%s utracił poziom uprawnień cmdlevel po starcie gry. Od teraz należy używać "
 "głosowania."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "StartujÄ™ grÄ™."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "Żądanie nieprawidłowego raportu (typ %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Ostrzeżenie: Odrzucam przestarzałego klienta %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Odebrano pakiet typu %d od uczestnika `martwego' lub widza"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Proszę wybrać niepustą nazwę."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Naród jest już używany."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "Inny gracz używa już imienia '%s'. Proszę wybrać inne imię."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Proszę wybrać nazwę zawierającą jedynie znaki ASCII."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "Naród %s nie jest dostępny w tym scenariuszu."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "Naród %s jest już używany."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s to %s przywódca %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Oczekiwanie na rozpoczęcie gry: %d z %d graczy jest już gotowych."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s został(a) dodany jako gracz AI, poziom %s."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Gracz %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s rzÄ…dzi %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Wysyłam informację do metaserwera [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Gra skończona..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Teraz oczekuję nowych połączeń."
 
@@ -5570,7 +5591,7 @@ msgstr "(dwuznaczne)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5747,7 +5768,7 @@ msgstr "Gracz nie może być usunięty po rozpoczęciu gry."
 msgid "Removed player %s from the game."
 msgstr "Usunięto gracza %s z gry."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Nazwa \"%s\" jest niedozwolona ze względów bezpieczeństwa."
@@ -5825,205 +5846,205 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr "Nie można zwiększyć poziomu dostępu '%s'; twój poziom to tylko '%s'."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Poziom dostępu ustawiony na '%s' dla połączenia %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 "Poziom dostępu do operacji nie może być ustawiony na '%s' dla połączenia %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Poziom dostępu ustawiony na '%s' dla nowych graczy."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 "Poziom dostępu do operacji dla pierwszego gracza, który go weźmie wynosi '%"
 "s'."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "Komenda 'first' nie ma sensu z linii poleceń serwera."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Już masz poziom '%s' albo lepszy."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Ktoś inny już jest organizatorem."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "Połączenie %s poprosiło o stanie się organizatorem gry."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Niewłaściwy argument %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 "Składnia: timeoutincrease <liczba_tur> <inkrementator> <wartość> <mnożnik>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Dynamiczny timer ustawiony na %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Opcja:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Opis:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "zmienialne"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "stałe"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Wartość: %d, Minimalna: 0, Domyślna: %d, Maksymalna: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Wartość: %d, Minimalna: %d, Domyślna: %d, Maksymalna: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Wartość: \"%s\", Domyślna: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Opisy są dostępne dla poniższych opcji:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Opis jeszcze nieprzygotowany."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Dwuznaczna nazwa opcji."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Operator Serwera: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Gracz '%s' ma teraz poziom trudności AI '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s nie jest kontrolowany przez AI."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Domyślny poziom trudności AI ustawiony na '%s'."
 
 #
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Ten rozkaz ma sens tylko z poziomu klienta."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Składnia: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Tylko prawdziwi gracze mogą używać komendy away."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s ustawiony(a) w tryb away."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s powrócił(a) do gry."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Niestety nie masz dostępu do opcji '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Nieznana opcja '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Opcje z innymi niż domyślne wartościami"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Wszystkie opcje"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Ważne opcje"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Drugorzędne opcje"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Rzadko używane opcje"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ znaczy że możesz zmienić tą opcję"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= znaczy że dana opcja jest ustawiona na swoją domyślną wartość"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s wartość (min,max)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Opcja"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "opis"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -6032,38 +6053,38 @@ msgstr ""
 "Spróbuj 'show changed' aby zobaczyć opcje z innymi niż domyślne wartościami."
 
 #
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Po rozpoczęciu rozgrywki nie można zmieniać zespołów."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Nieznany argument.  Składnia: team <gracz> <zespół>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 "Nie ma zespołu '%s'.  Proszę podać prawidłowy numer zespołu lub jego nazwę."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Nie można grać razem z barbarzyńcami."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Gracz %s gra teraz w zespole %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Brak argumentów. Składnia: vote yes|no [numer głosowania]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Obserwatorzy nie mogą głosować."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -6071,39 +6092,39 @@ msgstr ""
 "Głosować można jedynie w już wystartowanej grze. Użyj polecenia 'first' aby "
 "zostać organizatorem gry, jeśli jeszcze takiego nie ma."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "GÅ‚osowanie %d \"%s\": %d za, %d przeciw"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Nie odbywa się żadne głosowanie."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Nie ma głosowania."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Wartość musi być liczbą całkowitą."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Nie ma takiego głosowania (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Zagłosowałeś za \"%s\""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Zagłosowałeś przeciwko \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6112,429 +6133,457 @@ msgstr ""
 "units <x> <y> | unit <id> | tech <gracz> | timing | info>."
 
 #
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Tej komendy można używać dopiero po rozpoczęciu gry."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "dyplomacja %s już nie jest debugowana"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "dyplomacja %s debugowana"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "Technologia %s już nie jest debugowana"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "Technologia %s debugowana"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Wartość druga i trzecia powinna być liczbą całkowitą."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Złe współrzędne mapy."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Nie ma miasta na podanych współrzędnych."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s już nie jest debugowany"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "Jednostka %s %s już nie jest debugowana."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "Jednostka %s %s jest debugowana."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Wartość druga musi być liczbą całkowitą."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Jednostka %d nie istnieje."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Nieznany argument.  Składnia: set <opcja> <wartość>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Nie możesz zmienić tej opcji."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Ta opcja nie może być zmieniona po rozpoczęciu gry."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Wartość musi być liczbą całkowitą."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Wartość spoza zakresu (minimum: 0, maksimum: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Opcje: %s zostało ustawione na %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Wartość spoza zakresu (minimum: %d, maksimum: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Nazwa za długa.  Składnia: set <opcja> <wartość>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Opcje: %s zostało ustawione na \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Sorry, tej rozgrywki nie można obserwować globalnie."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 "Sorry, nie można przejąć kontroli nad globalnym obserwatorem. Prawdopodobnie "
 "chodzi ci o '/observe'owanie go."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Sorry, w tej rozgrywce nie można przejmować ludzkich graczy."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Sorry, nie można obserwować barbarzyńców w tej rozgrywce."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Sorry, nie można przejąć kontroli nad barbarzyńcami w tej rozgrywce."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Sorry, w tej rozgrywce nie można obserwować martwych graczy."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Sorry, w tej rozgrywce nie można przejmować martwych graczy."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Sorry, w tej rozgrywce nie można obserwować AI."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Sorry, w tej rozgrywce nie można przejmować graczy AI."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Sorry, w tej rozgrywce nie można obserwować ludzi."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "Sorry, w tej rozgrywce nie można przejmować ludzkich graczy."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Sorry, tej rozgrywki nie można obserwować."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Sorry, w tej rozgrywce nie można przejmować graczy."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "Sorry, w tej rozgrywce nie można przejmować graczy już zajętych."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Składnia: observe [nazwa-połączenia [nazwa-gracza]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Składnia: observe [nazwa-gracza]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s już kontroluje %s. Użycie 'observe' usunęłoby %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s już kontroluje obserwuje %s"
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s już obserwuje."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "użytkownik %s obserwuje teraz gracza %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s teraz obserwuje"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Składnia: take <nazwa-połączenia> <nazwa-gracza>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Składnia: take <nazwa-gracza>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Składnia: take [nazwa-połączenia] <nazwa-gracza>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s już kontroluje gracza %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Nie ma gracza ani połączenia o nazwie %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "odłączam od gracza %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "użytkownik %s kontroluje teraz gracza %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbarzyński"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "AI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Człowiek"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Żywy"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Martwy"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s nie przyłączony do żadnego gracza."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Składnia: detach <nazwa-połączenia>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Nie możesz odłączać innych użytkowników."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s nie przyłączony do żadnego gracza."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "Odłączam użytkownika %s od gracza %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s już nie obserwuje."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "odłączam od %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Składnia: load <nazwa-gry>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "Nie można wczytać gry podczas trwania innej."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "Nie mogę znaleźć zapisanej gry lub scenariusza o nazwie \"%s\"."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "Nie mogę wczytać zapisanej gry: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Bieżąca ścieżka zasad to: \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Katalog z zasadami \"%s\" nieznaleziony"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Katalog z zasadami już jest ustawiony na \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Katalog z zasadami ustawiony na \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Dziękujemy za używanie serwera Freeciv."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Nie masz uprawnień do sterowania pracą serwera."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Ostrzeżenie: %s interpretowane jako '%s', choć jest dwuznaczne.  Spróbuj %"
 "shelp."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Nieznana komenda.  Spróbuj '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Twój nowy głos unieważnił poprzedni."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Nowe głosowanie nr %d zainicjowane przez %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Nie masz uprawnień do wydania tego polecenia."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(linia poleceń serwera)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Gra zakończyła się remisem."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Kończę grę. Serwer się zrestartuje po tym jak rozłączą się wszyscy "
 "użytkownicy."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Nie mogę zakończyć gry: jeszcze nie rozpoczęta."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s poddał grą i nie może już wygrać."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Nie możesz się teraz poddać."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Brak graczy, gra nie wystartuje."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Brak graczy, gra nie wystartuje."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Brak graczy, gra nie wystartuje."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Wszyscy gracze sÄ… gotowi; rozpoczynamy grÄ™!"
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "Nie można rozpocząć gry: program czeka na rozłączenie się wszystkich "
 "użytkowników."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Nie mogę wystartować gry: jest już włączona."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Przerywam połączenie %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6572,77 +6621,77 @@ msgstr ""
 "  save   -  aby zapisać grę\n"
 "  quit   -  aby zakończyć program"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Komenda:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Składnia: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Poziom: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Poniższe komendy serwera są dostępne:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Argument pomocy '%s' jest dwuznaczny."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Nieprawidłowy argument '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Zły argument komendy list: '%s'.  Spróbuj '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Lista graczy:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<brak graczy>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "użytkownik %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Martwy"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", poziom trudności %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", gotowy"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ","
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
@@ -6650,21 +6699,21 @@ msgstr[0] " %d połączenie:"
 msgstr[1] " %d połączenia:"
 msgstr[2] " %d połączeń:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s z %s (poziom dostępu do operacji: %s), bufor=%dKB"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (tryb obserwatora)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Lista zespołów:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
@@ -6672,25 +6721,25 @@ msgstr[0] "%2d : '%s' : %d gracz"
 msgstr[1] "%2d : '%s' : %d graczy"
 msgstr[2] "%2d : '%s' : %d graczy"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 gracz: %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Pusty zespół: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Lista połączeń z serwerem:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<brak połączeń>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Lista dostępnych scenariuszy:"
 
@@ -6760,17 +6809,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Nie znaleziono nowej technologii w mieście %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, fuzzy, c-format
 msgid "You steal %s from the %s."
 msgstr "%s otrzymali %s od %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr ""
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, fuzzy, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%s otrzymali %s od %s."
@@ -7316,20 +7365,20 @@ msgstr "Nie udało się wspomóc budowy cudu za pomocą %s."
 msgid "Your %s has invalid orders."
 msgstr "Twoja jednostka %s ma nieprawidłowe rozkazy."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Duża ilość lądów(landmass) - może to zająć kilka sekund."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Powrót do generatora %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Generator 3 nie umiejscowił wszystkich dużych wysp."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Generator 3 pozostawił %li masywów lądowych bez umiejscowienia."
@@ -7423,16 +7472,17 @@ msgstr ""
 msgid "Cannot find audio file %s"
 msgstr "Nie mogę znaleźć pliku audio %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX XXX tur"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d złota na turę"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
@@ -7440,30 +7490,30 @@ msgstr[0] "%d tura"
 msgstr[1] "%d tury"
 msgstr[2] "%d tur"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "nigdy"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d na turÄ™"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
@@ -7471,74 +7521,74 @@ msgstr[0] "%s (%d) %d tura"
 msgstr[1] "%s (%d) %d tury"
 msgstr[2] "%s (%d) %d tur"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Przestarzałe"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Zbudowane"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Cud świata"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Mały cud"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d na turÄ™"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Mieszkańcy\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Podatek z handlu\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : Szlak handlowy z %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : Datki generowane przez budynki\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : Bonus z %s (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Straty\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Zamieszki\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Zużywane\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== W sumie\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Nadwyżka"
@@ -7656,8 +7706,8 @@ msgid "Best defending units"
 msgstr "Najlepsze siły obrony"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7841,8 +7891,8 @@ msgstr "?pollution [short]:Zan"
 msgid "?cma:Governor"
 msgstr "?cma:ZarzÄ…dca"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -8110,19 +8160,19 @@ msgstr ""
 "Łączę się automatycznie z serwerem \"%s\" przez port %d jako \"%s\" co %f "
 "sekund. Maksymalna liczba prób: %d"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "nowicjusz"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "Å‚atwy"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normalny"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "trudny"
 
@@ -8130,31 +8180,31 @@ msgstr "trudny"
 msgid "experimental"
 msgstr "eksperymentalny"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "StartujÄ™ serwer..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Nie mogę wystartować serwera."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Musisz uruchomić go ręcznie. Przepraszamy..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Nie można się połączyć z serwerem."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Prawdopodobnie nie można wystartować go w ten sposób."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Mamy kontrolę nad serwerem (poziom dostępu hack)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "Nie można przejąć kontroli nad serwerem, próbuję go zabić."
 
@@ -8255,27 +8305,27 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr "Wymaga rozmiaru miasta co najmniej %d.\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Umożliwia %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Pozwala na %s (z %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Rzeki"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Niestety, pomoc na temat %s nie istnieje.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8286,7 +8336,7 @@ msgstr ""
 "Ta strona została wygenerowana automatycznie.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
@@ -8295,60 +8345,60 @@ msgstr ""
 "Wymagany jest budynek %s.\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Odkrycie %s sprawi, że %s będzie przestarzałe.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 "* Pozwala wszystkim graczom ze znajomością technologii %s budować jednostki %"
 "s.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Pozwala na %s (razem z %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Umożliwia %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, fuzzy, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Jednostka Może być jedynie budowana przy ustroju %s.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Jednostka Może być jedynie budowana przy ustroju %s.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Nie może być budowana przez miasta.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Jednostka nie jest utrzymywana przez żadne miasto.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Utrata tej jednostki powoduje przegranie gry!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Każdy gracz może posiadać tylko jeden egzemplarz tej jednostki.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Jednostka wymaga %d populacji w mieście, które ją buduje.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
@@ -8356,7 +8406,7 @@ msgstr[0] "* Może przenosić i uzupełniać paliwo %d jednostki powietrznej.\n"
 msgstr[1] "* Może przenosić i uzupełniać paliwo %d jednostek powietrznych.\n"
 msgstr[2] "* Może przenosić i uzupełniać paliwo %d jednostek powietrznych.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -8364,7 +8414,7 @@ msgstr[0] "* Może przenosić i uzupełniać paliwo %d jednostki pocisków.\n"
 msgstr[1] "* Może przenosić i uzupełniać paliwo %d jednostek pocisków.\n"
 msgstr[2] "* Może przenosić i uzupełniać paliwo %d jednostek pocisków.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
@@ -8372,7 +8422,7 @@ msgstr[0] "* Może transportować %d jednostkę lądową.\n"
 msgstr[1] "* Może transportować %d jednostki lądowe.\n"
 msgstr[2] "* Może transportować %d jednostek lądowych.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8380,128 +8430,128 @@ msgstr ""
 "* Może ustanawiać trasy handlowe (musi dojść do miasta docelowego odległego "
 "o co najmniej 9 pól (w metryce miejskiej)).\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Pomaga w budowie cudów świata (Dodaje %d do produkcji).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Nie można rozproszyć.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Jednostka może zostać rozwiązana w mieście, aby odzyskać 50%% wartości w "
 "postaci tarczek.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Potrafi zakładać nowe miasta.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Potrafi powiększać miasta nie większe niż %2$d o %1$d populacji.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Potrafi budować drogi i koleje.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Potrafi budować kopalnie.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Potrafi budować nawodnienie.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Potrafi budować farmy.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Potrafi budować farmy (Jeśli znana jest technologia %s).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Potrafi budować farmy (Jeśli znane są: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Potrafi budować fortece.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Potrafi budować fortece (Jeśli odkryto %s).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Potrafi budować fortece (Jeśli odkryto %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Potrafi usuwać zanieczyszczenia.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Potrafi usuwać skażenia radioaktywne.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Potrafi przekształcać teren.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Potrafi budować bazy lotnicze.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 "* Potrafi się fortyfikować, przez co otrzymuje 50%% dodatkowej siły obrony.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Potrafi niszczyć infrastrukturę terenów.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* Może wykonywać czynności dyplomatyczne oraz szpiegowskie.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Może wykonywać czynności dyplomatyczne.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Nigdy nie przegra konfrontacji z innym dyplomatÄ….\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Jednostka nie może być przekupiona.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Potrafi atakować jednostki powietrzne przeciwnika.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* Jest niewidoczna dla innych graczy, chyba że znajduje się w sąsiedztwie "
 "wrogiej jednostki lub miasta.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Może atakować tylko jednostki na morzu (nie atakuje lądu).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
@@ -8509,40 +8559,40 @@ msgstr ""
 "* Może atakować przy zaokrętowaniu na jednostkach morskich - przeciwko "
 "wrogim miastom i polom na lÄ…dzie.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Może być przerzucona z miasta na odległość %d.\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Otrzymuje podwójną obronę w starciu z jednostkami 'konnymi'.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Jest liczona jako jednostka 'konna'.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Jednostka pocisku: jest tracona podczas ataku.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Przeprowadzenie ataku kończy turę tej jednostki.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Atak tej jednostki prowadzi do eksplozji nuklearnej!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Otrzymuje dodatkową siłę ognia podczas ataku na miasto.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignoruje efekt wywoływany przez mury miasta.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8551,36 +8601,36 @@ msgstr ""
 "* Potrafi bombardować miasto (%d razy na turę).  Te ataki mogą jedynie "
 "uszkodzić (nie zabić) obrońcę. Atakujący nie ponosi żadnych strat.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Osiąga pięciokrotną siłę obrony przed pociskami i samolotami.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Ignoruje wpływ terenu (traktuje wszystko jak drogę).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignoruje strefy kontroli\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 "* Jednostka niezmilitaryzowana (bez możliwości przeprowadzania ataku).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "* Jednostka powoduje 1 niezadowolenie nawet gdy nie jest agresywna.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Nie potrafi osiągnąć statusu weterana.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Może zostać weteranem w czasie szkolenia lub podczas bitwy.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8589,12 +8639,12 @@ msgstr ""
 "* Musi kończyć turę w mieście lub przy lądzie, albo z prawdopodobieństwem 50%"
 "% zaginie w morzu.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* Technologia '%s' zmniejsza ryzyko do 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* Technologia '%s' zmniejsza ryzyko do 12%%.\n"
@@ -8603,15 +8653,15 @@ msgstr "* Technologia '%s' zmniejsza ryzyko do 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " lub "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
@@ -8619,14 +8669,14 @@ msgstr[0] "* Musi kończyć turę w mieście lub na %s co %d turę.\n"
 msgstr[1] "* Musi kończyć turę w mieście lub na %s co %d tury.\n"
 msgstr[2] "* Musi kończyć turę w mieście lub na %s co %d tur.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr ""
 "Gdybyśmy rozpoczęli badania w kierunku %s potrzebowalibyśmy %d punktów "
 "odkryć."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8635,88 +8685,88 @@ msgstr ""
 "Aby osiągnąć %s potrzebujemy %d dodatkowych technologii. Cały projekt "
 "wymagał będzie %d punktów odkryć."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Nie możesz odkryć tej technologii."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr " Ta liczba może zależeć od odkryć innych graczy.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr "* Kto odkryje %s jako pierwszy - zyska natychmiastowy postęp.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Zmniejsza ryzyko zatonięcia łodzi na szerokich morzach do 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Zmniejsza ryzyko zatonięcia łodzi na szerokich morzach do 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Zwiększa zanieczyszczenie powodowane przez populację.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Pozwala %s budować drogi na rzekach.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Pozwala %s budować fortece.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Pozwala %s budować bazy lotnicze.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Pozwala %s ulepszać drogi do kolei.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Sprawia, że jednostka %s może ulepszać nawodnienie na farmy.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Na tym terenie nie występują skażenia."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Nie można budować miast na tym terenie."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Linia brzegowa tego terenu nie jest bezpieczna."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Ten teren nie jest niebezpieczny dla jednostek podróżujących po nim."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Jednostki lądowe nie mogą podróżować po polach morskich."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Właściwości:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8734,7 +8784,7 @@ msgstr[2] ""
 "* Jednostki militarne poza miastem i granicami będą powodować %d "
 "niezadowolenia.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8744,23 +8794,23 @@ msgstr ""
 "o %d.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* PÅ‚acisz %d-krotnie stawki %s za jednostki.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* PÅ‚acisz %d-krotnie stawki za swoje jednostki.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, fuzzy, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* PÅ‚acisz %d-krotnie stawki %s za jednostki.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 #, fuzzy
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* PÅ‚acisz %d-krotnie stawki za swoje jednostki.\n"
@@ -8768,25 +8818,25 @@ msgstr "* PÅ‚acisz %d-krotnie stawki za swoje jednostki.\n"
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr "* Każde miasto pozwala na uniknięcie płacenia %d %s za jednostki.\n"
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr "* Każde miasto pozwala na uniknięcie płacenia %d złota za jednostki.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "* Szansa wojnÄ™ domowÄ… przy utracie stolicy wynosi %d%%.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8796,7 +8846,7 @@ msgstr ""
 "pojawić się gdy masz %d miast.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8805,18 +8855,18 @@ msgstr ""
 "* Za każde dodatkowe %d miast jeden niezadowolony mieszkaniec będzie się "
 "pojawiał w miastach.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 "Maksymalny poziom podatku, jaki możesz ustawić na naukę, złoto czy luksusy, "
 "wynosi %d%%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "Nie posiada ograniczeń podatków na naukę/złoto/luksusy.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, fuzzy, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8834,7 +8884,7 @@ msgstr[2] ""
 "* Możesz wprowadzać stan wojenny. Jednostki militarne będą zadowalać po %d "
 "mieszkańców.\n"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, fuzzy, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8843,7 +8893,7 @@ msgstr[1] "* Maksymalnie %d jednostek może wprowadzać porządek.\n"
 msgstr[2] "* Maksymalnie %d jednostek może wprowadzać porządek.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8852,15 +8902,15 @@ msgstr ""
 "* Twoje miasta wzrastają w czasie świętowania.  Miasta muszą mieć rozmiar co "
 "najmniej %d, aby mogły to wykorzystać.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Twoje jednostki nie mogą zostać przekupione.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Twoje miasta nie mogą zostać przekupione.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8868,16 +8918,16 @@ msgstr ""
 "* Państwo popadnie w anarchię jeśli w jakimkolwiek mieście zamieszki będą "
 "trwały dwie tury z rzędu.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Senatu może blokować wypowiadanie wojen.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 "* Pojawiają się partyzanci, gdy miasto zostanie przejęte przez wroga.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
@@ -8885,25 +8935,25 @@ msgstr ""
 "* Budynki, które normalnie zmniejszają niezadowolenie będą produkować "
 "złoto.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* Nie płacisz utrzymania za fanatyków.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* Nie ma niezadowolonych mieszkańców.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* Czyni %s bardziej doświadoczonymi.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Czyni jednostki weteranami.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8913,7 +8963,7 @@ msgstr ""
 "produkuje o jeden mniej z wyjątkiem okresu świętowania.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, fuzzy, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8923,7 +8973,7 @@ msgstr ""
 "%d dodatkowy %s podczas świętowania.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, fuzzy, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
@@ -8931,66 +8981,66 @@ msgstr ""
 "%d dodatkowy %s.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, fuzzy, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* Produkcja %s będzie podlegać ogromnym stratom.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* Produkcja %s będzie podlegać ogromnym stratom.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* Produkcja %s będzie pewnym stratom.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* Produkcja %s będzie podlegać niewielkim stratom.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* Marnotrastwo %s będzie wzrastać wraz z odległością do stolicy.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* Marnotrastwo %s będzie wzrastało razem z odległością do stolicy.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 "* Marnotrastwo %s będzie wzrastało powoli wraz z odległością od stolicy.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Pozwala budować %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d wzburzony"
@@ -9441,16 +9491,16 @@ msgstr "Napis określający funkcjonalność serwera: %s"
 msgid "Start of turn %d"
 msgstr "PoczÄ…tek %d tury"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "Tryb AI jest teraz %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "Aktywny"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "Nieaktywny"
 
@@ -9481,13 +9531,13 @@ msgstr "?Player:ImiÄ™"
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Flaga"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9501,7 +9551,7 @@ msgstr "Granica"
 msgid "Score"
 msgstr "Punktacja"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Zespół"
 
@@ -9534,36 +9584,36 @@ msgstr "?Player_dlg:Bezczynność"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Nie możesz sprzedawać budynków."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Sprzedana %d %s za %d złota."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Nie udało się sprzedać żadnego z %s."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Nie możesz rozpraszać jednostek."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "Jednostka %s nie może być rozproszona."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "RozwiÄ…zano %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Nie udało się rozproszyć żadnej jednostki %s."
@@ -9882,64 +9932,69 @@ msgstr "ZÅ‚oto: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Pod:%d Lux:%d Nau:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Faza: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Faza: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Kliknij - więcej danych)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s populacji"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Tura: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "ZÅ‚oto: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Zysk: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Pod:%d%% Lux:%d%% Nau:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Badania: %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Szansa globalnego ocieplenia: %d%% (%+d%% na turÄ™)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Szansa zimy nuklearnej: %d%% (%+d%% na turÄ™)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Ustrój: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9948,21 +10003,21 @@ msgstr[1] "%d jednostki"
 msgstr[2] "%d jednostek"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Tur do celu: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Tur do celu: %d do %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
@@ -9970,36 +10025,36 @@ msgstr[0] "%d jednostka zaznaczona"
 msgstr[1] "%d jednostki zaznaczone"
 msgstr[2] "%d jednostek zaznaczonych"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Brak zaznaczonych jednostek"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Inne: %d cywilnych; %d militarnych"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Inne: %d cywilne"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Inne: %d militarnych"
 
-#: client/text.c:835
+#: client/text.c:839
 #, fuzzy
 msgid "No units to upgrade!"
 msgstr "Nie można ulepszyć żadnej jednostki."
 
-#: client/text.c:860
+#: client/text.c:864
 #, fuzzy
 msgid "None of these units may be upgraded."
 msgstr "Nie można ulepszyć żadnej jednostki."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -10017,72 +10072,72 @@ msgstr[2] ""
 "Ulepszyć %s do %s za %d złota?\n"
 "Skarbiec zawiera %d złota."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Wyświetla stan prac nad nową technologią."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "brak celu badań"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d"
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Wyświetla poziom globalnego ocieplenia:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Poziom zanieczyszczenia: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Szansa katastrofalnego ocieplenia na turÄ™: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Wyświetla poziom zimy nuklearnej:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Poziom skażenia: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Szansa katastrofalnego oziębienia na turę: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Wyświetla twój aktualny ustrój:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Populacja:      %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Obsługa:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energia:        %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -10091,96 +10146,96 @@ msgstr[1] "Masa:            %5d tony"
 msgstr[2] "Masa:            %5d ton"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Czas podróży:      %5.1f lat"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Czas podróży:       N/A     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Prawd. Sukcesu:  %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Rok przybycia:  %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:wył"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%d sek"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?min/secs:%dmin %ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%dh %dmin"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%ddni %d godz"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:błąd"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%2$s %1$s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Obserwator: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Budynki: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Brak. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Cuda: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Liczba miast: %d, %d powyżej progu %d miast."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10189,7 +10244,7 @@ msgstr[1] "%d zadowolonych poniżej progu oraz "
 msgstr[2] "%d zadowolonych poniżej progu oraz "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10198,16 +10253,16 @@ msgstr[1] "%d dodatkowi(y) nieszczęśliwy(i)."
 msgstr[2] "%d dodatkowi(y) nieszczęśliwy(i)."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Stan wojenny ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "bez maksimum, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10216,20 +10271,20 @@ msgstr[1] "maksymalnie %d jednostki, "
 msgstr[2] "maksymalnie %d jednostek, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d na jednostkÄ™). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Jednostki militarne w mieście mogą powodować niezadowolenie. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Jednostki militarne nie mają wpływu na zadowolenie. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luksus: ogółem %d."
@@ -10276,12 +10331,12 @@ msgstr ""
 "Zarządca miejski nie mógł sobie poradzić z miastem %s. Powinieneś sam "
 "rozwiązać problem."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "brak"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "własny"
 
@@ -10335,11 +10390,13 @@ msgid "Ooops..."
 msgstr "Ups..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Tej jednostki nie można przekupić!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10356,6 +10413,7 @@ msgstr "Przekup JednostkÄ™ Wroga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10397,6 +10455,7 @@ msgstr "_Wynalazki"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Tajemnica szpiega"
 
@@ -10421,12 +10480,13 @@ msgstr "Budynki:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Produkcja Miejska"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Nie możesz wzniecić buntu w mieście %s."
@@ -10438,6 +10498,7 @@ msgstr "Miasto nie może zostać zbuntowane!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10454,6 +10515,7 @@ msgstr "Wznieć Bunt!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10463,6 +10525,7 @@ msgstr ""
 "Skarbiec zawiera %d złota."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10532,11 +10595,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Przekup jednostkÄ™ wroga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Panie, dyplomata czeka na twe rozkazy"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Panie, szpieg czeka na Twe rozkazy"
@@ -10637,7 +10702,7 @@ msgstr "Zanieczyszczenie:"
 msgid "_Overview"
 msgstr "_Ogólne"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10662,11 +10727,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d tur"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Kup"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "Pro_dukcja"
@@ -10786,7 +10851,7 @@ msgstr "Jednostki na utrzymaniu %d"
 msgid "Present units %d"
 msgstr "Obecne jednostki %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "_Centruj"
 
@@ -10875,32 +10940,32 @@ msgstr "Zmień nazwę miasta"
 msgid "What should we rename the city to?"
 msgstr "Jaka powinna być nowa nazwa miasta?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "Zmień"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Wstaw na _poczÄ…tek"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Ustaw _następny"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Wstaw na _koniec"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Wybierz"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "Po_każ"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10910,13 +10975,13 @@ msgstr "Po_każ"
 msgid "Cities"
 msgstr "Miasta"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "Wyświetl"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10925,85 +10990,90 @@ msgstr "Wyświetl"
 msgid "Improvements"
 msgstr "Budynki"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Cuda świata"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Wszystkie Miasta"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Brak Miast"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Odwróć wybór"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Jednostki w Budowie"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Budynki w Budowie"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Cuda w Budowie"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Budowana jednostka"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Budowany obiekt"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Budowany cud"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Miasta Przybrzeżne"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Ta Sama Wyspa"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Utrzymywane Jednostki"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Obecne Jednostki"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Budynki w Mieście"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Cuda w Mieście"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Dostępne Jednostki"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Dostępne Budynki"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Dostępne Cuda Świata"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Całkowity koszt:"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -11069,126 +11139,126 @@ msgstr "Jaka powinna być nazwa nowego schematu?"
 msgid "Remove this preset?"
 msgstr "Usunąć ten schemat?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "_Idź do miejsca zdarzenia"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "_Wyświetl miasto"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "NaprawdÄ™ chcesz rewolucji?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Rewolucja!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Cel plÄ…drowania"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Wybierz cel plÄ…drowania:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Jednostka"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "ImiÄ™"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Wybór jednostki"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "Zaznacz _wszystkie"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "W_artuj bezczynne jednostki"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Narody:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Wybór narodu"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Wybierz naród"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Losowy naród"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Wybierz naród"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Właściwości"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Przywódca:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "Kobiet_a"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Mężczyzna"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "_Styl miast:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "O_pis"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Należy wybrać płeć."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Należy wybrać styl twych miast."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Należy wpisać poprawne imię."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Ulepsz jednostkÄ™!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11446,64 +11516,70 @@ msgstr ""
 msgid "Not _ready"
 msgstr "Nie _przygotowany"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Gotowy"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Start"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Warstwa miast"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Wybierz _naród"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 #, fuzzy
 msgid "_Observe"
 msgstr "_Obserwator"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "teraz _obserwuje"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<AI - Nowicjusz>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<AI - Łatwy>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<AI - Normalny>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<AI - Trudny>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Losowy"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Observer"
 msgstr "Obserwator: %s"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Detached"
 msgstr "Martwy"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Na pewno chcesz zakończyć?"
 
@@ -12421,225 +12497,225 @@ msgstr "Przyłącz się do gry sie_ciowej"
 msgid "Connect to Gaming _Zone"
 msgstr "Przyłącz się do Gaming _Zone"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Hasło nieprawidłowe, wprowadź hasło."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Nazwa serwera"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Wersja"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Stan"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Gracze"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Komentarz"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Sieć _Lokalna"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Metaserwer Internetowy"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Host:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Port:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Użytkownik:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Hasło:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Potwierdź hasło:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "Połą_cz"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, fuzzy, c-format
 msgid "Connection name: %s"
 msgstr "Połączenie jest nawiązywane."
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, fuzzy, c-format
 msgid "Player name: %s"
 msgstr "?Player:ImiÄ™"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, fuzzy, c-format
 msgid "Host: %s"
 msgstr "Serwer:"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, fuzzy, c-format
 msgid "%s info"
 msgstr "Statystyki"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 #, fuzzy
 msgid "Toggle player ready"
 msgstr "aitoggle <gracz>"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 #, fuzzy
 msgid "Pick nation"
 msgstr "Wybierz naród"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 #, fuzzy
 msgid "Take this player"
 msgstr "Warstwa miast"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 #, fuzzy
 msgid "Cut connection"
 msgstr "Przerywam połączenie %s."
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 #, fuzzy
 msgid "Aitoggle player"
 msgstr "aitoggle <gracz>"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 #, fuzzy
 msgid "Remove player"
 msgstr "Usuwam gracza %s."
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, fuzzy, c-format
 msgid "Put on %s"
 msgstr "Populacja: %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "Liczba _graczy (Łącznie z botami):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "Poziom trudności _AI:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "_Zestaw zasad:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Więcej _opcji..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 #, fuzzy
 msgid "Record"
 msgstr "Raporty"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 #, fuzzy
 msgid "Rating"
 msgstr "czeka"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Gotowy"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Przywódca"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Wybierz ZapisanÄ… GrÄ™"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Wybierz ZapisanÄ… GrÄ™:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_PrzeglÄ…daj..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Wybierz scenariusz"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Wybierz _scenariusz:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Typ"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Wybierz _naród:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Wybierz miejsce zapisu"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Zapisz _grÄ™"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Zapisane _gry:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Zapisz w pliku:"
 
@@ -12675,7 +12751,7 @@ msgstr "?Building:Nazwa"
 msgid "Count"
 msgstr "Liczba"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12918,28 +12994,28 @@ msgstr "_Schematy:"
 msgid "Edit Global _Worklists"
 msgstr "Edytuj _globalny schemat"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Tury"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "D_ostępne zadania:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Pokaż _przyszłe cele"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "_Wykonywane zadania"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "Dodaj _globalny schemat"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "_Zmień produkcję"
 
@@ -13243,8 +13319,8 @@ msgid "City shrinks: %d %s"
 msgstr "Miasto: %s(%se)"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13360,12 +13436,12 @@ msgstr "Raport Końcowy:"
 msgid "Maintenance Report"
 msgstr "Raport Naukowy"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 #, fuzzy
 msgid "worklist"
 msgstr "(schemat)"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13810,21 +13886,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -15138,7 +15214,7 @@ msgstr "Styl miast:"
 msgid "Unit Selection"
 msgstr "Wybór jednostki"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "BRAK"
 
diff --git a/po/pt.gmo b/po/pt.gmo
index 2587cf1..7caf0ba 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index ceed4a5..83b1af9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-09-01 22:56+0300\n"
 "Last-Translator: Duarte Loreto <happyguy_pt at hotmail.com>\n"
 "Language-Team: \n"
@@ -52,22 +52,22 @@ msgstr "Luxo"
 msgid "Science"
 msgstr "Ciência"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?construído:C"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?maravilha:m"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsoleto:O"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundante:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?construído:C"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?maravilha:m"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -497,83 +497,83 @@ msgstr "A Ligar"
 msgid "AI Debug messages"
 msgstr ""
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr ""
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr ""
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr ""
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr ""
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr ""
 
-#: common/player.c:737
+#: common/player.c:742
 #, fuzzy
 msgid "?attitude:Neutral"
 msgstr "?diplomatic_state:Neutral"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr ""
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr ""
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr ""
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr ""
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr ""
 
-#: common/player.c:759
+#: common/player.c:764
 #, fuzzy
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Aliança"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Guerra"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:Cessar-fogo"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Paz"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Aliança"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Nunca se encontraram"
 
-#: common/player.c:765
+#: common/player.c:770
 #, fuzzy
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Paz"
@@ -620,13 +620,13 @@ msgstr " unidade"
 msgid "Size %d"
 msgstr "Tamanho"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Tecn. Futura %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -638,66 +638,66 @@ msgstr "Tecn. Futura %d"
 msgid "None"
 msgstr "Nenhum"
 
-#: common/tech.c:790
+#: common/tech.c:798
 #, fuzzy
 msgid "Future Tech."
 msgstr "Tecn. Futura %d"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Desconhecido)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Estrada"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Irrigação"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Caminho de Ferro"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Mina"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Poluição"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Cabana"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Fortaleza"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Rio"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Quinta"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Base Aérea"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Chuva Nuclear"
 
@@ -807,11 +807,11 @@ msgstr "Míssil Nuclear"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " e "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?e:, "
 
@@ -971,82 +971,82 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (total de %d repetição)"
 msgstr[1] " (total de %d repetições)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Argumento vazio para \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Argumento em falta para \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d AC"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d DC"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH está definido mas vazio; a utilizar caminho por omissão."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Incapaz de ler directório de dados %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "O caminho de dados pode ser definido através da variável de ambiente "
 "FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Caminho de dados actual é: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "O ficheiro \"%s\" é requerido ... a abortar!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 "%s: Erro fatal: está a tentar executar o Freeciv como superutilizador!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Utilize uma conta sem privilégios (não 'root').\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "equivalência perfeita"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "única equivalência"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "ambíguo"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "vazio"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "demasiado longo"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "não-equivalente"
 
@@ -1075,108 +1075,108 @@ msgstr "Os %s iniciaram a construção de %s em %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s está a vender %s (desnecessária) por %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr ""
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr ""
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr ""
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr ""
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
 "away with your crimes?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1187,14 +1187,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1207,7 +1207,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1218,13 +1218,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1235,12 +1235,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1251,7 +1251,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1262,47 +1262,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
 "intentions, and I will have no more of our alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr ""
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
 "our enemy, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
 "s. Why do I need to remind you of your promises?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1310,26 +1310,26 @@ msgid ""
 "more!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
 "cessation of hostilities?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1337,134 +1337,139 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Definir opções locais"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (veterana)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Que ligações são permitidas"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Incapaz de encontrar ficheiro audio %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 
-#: server/auth.c:384
+#: server/auth.c:404
 #, fuzzy
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Desculpe, você não está autorizado a utilizar comandos do servidor."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, fuzzy, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s foi rejeitado, %s já estava ligado."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr ""
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr ""
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, fuzzy, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s foi rejeitado: Nome %s já está a ser utilizado."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr ""
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr ""
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, fuzzy, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s foi rejeitado: Nome %s já está a ser utilizado."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr ""
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
 msgstr ""
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, fuzzy, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s foi rejeitado: Não se podem observar bárbaros."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr ""
 
-#: server/auth.c:549
+#: server/auth.c:569
 #, fuzzy
 msgid "Sorry, your connection timed out..."
 msgstr "Desculpe, patrula aérea ainda não implementada."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, fuzzy, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s foi rejeitado: Não se pode re-ligar como jogador humano."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2257,44 +2262,42 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr ""
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <nome-de-opção> <valor>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Define opção do servidor."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <nome-de-jogador> [equipa]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Alterar, adicionar ou remover a filiação de equipa de um jogador."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2307,16 +2310,16 @@ msgstr ""
 "visão partilhada e embaixadas, e lutam em conjunto para obter vitória em "
 "equipa com pontuações individuais iguais à média da equipa."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <directório>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 #, fuzzy
 msgid "Choose new ruleset directory or modpack."
 msgstr "Directório de conjunto de regras actual é \"%s\""
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2325,15 +2328,15 @@ msgstr ""
 "Invocar sem argumentos apresenta o conjunto de regras actual."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <meta-linha>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Define a linha de informação do metaservidor."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2342,21 +2345,21 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 #, fuzzy
 msgid "metapatch <meta-line>"
 msgstr "metainfo <meta-linha>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 #, fuzzy
 msgid "Set metaserver patches line."
 msgstr "Define a linha de informação do metaservidor."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Controla a ligação ao metaservidor."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2367,34 +2370,34 @@ msgstr ""
 "'metaconnection up' ou 'metac u' estabelece ligação com o metaservidor."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaservidor <endereço>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 #, fuzzy
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Definir endereço do metaservidor a que reportar."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <nome-de-jogador>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Alterna estado IA do jogador."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [nome-ligação] <nome-de-jogador>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Tomar o lugar de um jogador no jogo."
 
-#: server/commands.c:185
+#: server/commands.c:184
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2408,17 +2411,17 @@ msgstr ""
 "apenas é permitido o argumento <nome-de-jogador>"
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 #, fuzzy
 msgid "observe [connection-name] [player-name]"
 msgstr "take [nome-ligação] <nome-de-jogador>"
 
-#: server/commands.c:194
+#: server/commands.c:193
 #, fuzzy
 msgid "Observe a player or the whole game."
 msgstr "Removido do jogo o jogador %s."
 
-#: server/commands.c:195
+#: server/commands.c:194
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2432,16 +2435,16 @@ msgstr ""
 "apenas é permitido o argumento <nome-de-jogador>"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 #, fuzzy
 msgid "detach <connection-name>"
 msgstr "cut <nome-ligação>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr ""
 
-#: server/commands.c:205
+#: server/commands.c:204
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2452,20 +2455,20 @@ msgstr ""
 "apenas é permitido o argumento <nome-de-jogador>"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <nome-de-jogador>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Cria um jogador IA com o nome indicado."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "O comando 'create' só está disponível antes do jogo ser iniciado."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2473,16 +2476,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Coloque-se em modo ausente. A IA irá tomar conta do seu jogo."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "A IA irá governar a sua nação mas efectuar alterações mínimas."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2490,11 +2493,11 @@ msgstr ""
 "novice\n"
 "novice <nome-jogador>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Coloca um ou todos os jogadores IA em nível 'novice' (iniciado)."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2506,7 +2509,7 @@ msgstr ""
 "jogador."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2514,11 +2517,11 @@ msgstr ""
 "easy\n"
 "easy <nome-de-jogador>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Coloca um ou todos os jogadores IA em nível 'easy' (fácil)."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2530,7 +2533,7 @@ msgstr ""
 "jogador."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2538,11 +2541,11 @@ msgstr ""
 "normal\n"
 "normal <nome-de-jogador>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Coloca um ou todos os jogadores IA em nível 'normal' (normal)."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2554,7 +2557,7 @@ msgstr ""
 "jogador."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2562,11 +2565,11 @@ msgstr ""
 "hard\n"
 "hard <nome-de-jogador>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Coloca um ou todos os jogadores IA em nível 'hard' (difícil)."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2578,7 +2581,7 @@ msgstr ""
 "jogador."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2586,11 +2589,11 @@ msgstr ""
 "experimental\n"
 "experimental <nome-de-jogador>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Coloca um ou todos os jogadores IA em nível 'experimental'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2604,7 +2607,7 @@ msgstr ""
 "servidores normais, esta opção não tem qualquer efeito."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2618,11 +2621,11 @@ msgstr ""
 "cmdlevel <nível> first\n"
 "cmdlevel <nível> <nome-de-ligação>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Questiona ou define acesso a nível de acesso de comandos."
 
-#: server/commands.c:276
+#: server/commands.c:275
 #, fuzzy
 msgid ""
 "The command access level controls which server commands are available\n"
@@ -2669,20 +2672,20 @@ msgstr ""
 "uma pessoa que não seja de confiança poderia ligar-se com o mesmo nome.  "
 "Note que este comando recebe agora nomes de ligações, não nomes de jogadores."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <turno> <increm_turno> <valor> <mult_valor>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Consulte \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2694,42 +2697,42 @@ msgstr ""
 "0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 #, fuzzy
 msgid "endgame"
 msgstr "Renomear"
 
-#: server/commands.c:311
+#: server/commands.c:310
 #, fuzzy
 msgid "End the game immediately in a draw."
 msgstr "Este comando termina imediatamente o jogo."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr ""
 
-#: server/commands.c:316
+#: server/commands.c:315
 #, fuzzy
 msgid "Concede the game."
 msgstr "Terminar o jogo."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <nome-de-jogador>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Remove completamente o jogador."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2738,7 +2741,7 @@ msgstr ""
 "etc.  Utilizar com cautela!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2746,11 +2749,11 @@ msgstr ""
 "save\n"
 "save <nome-de-ficheiro>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Grava jogo para ficheiro."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2767,7 +2770,7 @@ msgstr ""
 "e utilize o comando 'start' após os jogadores se terem ligado novamente."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2775,11 +2778,11 @@ msgstr ""
 "load\n"
 "load <nome-de-ficheiro>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Lê jogo do ficheiro."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2788,28 +2791,28 @@ msgstr ""
 "jogadores, conjuntos de regras e opções de servidor são perdidos.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <nome-de-ficheiro>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Processa comandos do servidor a partir do ficheiro."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <nome-de-ficheiro>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Grava as opções do servidor como comandos para o ficheiro."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Alternar saída de servidor entre 'Estilo RFC' e estilo normal."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr ""
 
@@ -3321,26 +3324,35 @@ msgstr "Você causou um incidente ao incitar uma revolta em %s."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s causou um incidente ao incitar uma revolta em %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Ano: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "A expiração de turno excedeu o seu limite máximo, a corrigir para máximo"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "A expiração de turno é menor do que zero, a corrigir para zero."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3384,11 +3396,11 @@ msgstr "Não existe nenhuma ligação com o nome %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Não existe nenhum jogador or ligação com o nome %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Ocorreu um aquecimento global!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
@@ -3396,16 +3408,16 @@ msgstr ""
 " As regiões costeiras foram inundadas e vastas zonas de pastos tornaram-se "
 "em desertos."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Ocorreu um inverno nuclear!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 " A costa marítima secou e vastas zonas de pastos tornaram-se em tundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3416,7 +3428,7 @@ msgstr ""
 "      Os trabalhadores juntam-se espontâneamente e colocam carris em todas "
 "as cidades."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3427,12 +3439,12 @@ msgstr ""
 "      Os trabalhadores juntam-se espontâneamente e colocam carris em todas "
 "as cidades."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, fuzzy, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr " Foi movido o seu %s devido à alteração de mar para terra em (%d, %d)."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, fuzzy, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr ""
@@ -3492,52 +3504,52 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr ""
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Taxa de imposto excede o máximo para %s; ajustada."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Taxa de ciência excede o máximo para %s; ajustada."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Taxa de luxo excede o máximo para %s; ajustada."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s já não nos dá visão partilhada!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "O senado passa a sua moção devido às constantes provocações dos %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "O estado diplomático entre os %s e os %s é agora de %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3546,55 +3558,55 @@ msgstr ""
 "  %s cancelam o acordo diplomático! O estado diplomático entre os %s e os %s "
 "é agora de %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr ""
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "A remover o jogador %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Você foi removido do jogo!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s foi removido do jogo."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Estabeleceu contacto com os %s, governados por %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr ""
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr ""
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3603,12 +3615,12 @@ msgstr ""
 " A sua nação caíu numa guerra civil,  %s é declarado líder dos estados "
 "rebeldes."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s forma uma aliança com %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3845,21 +3857,21 @@ msgstr "º"
 msgid "th"
 msgstr "º"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Expressão demográfica contém caracteres inválidos. Consulte \"help demography"
 "\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Relatório Demográfico:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Desculpe, o relatório Demográfico não se encontra disponível."
 
-#: server/report.c:746
+#: server/report.c:748
 #, fuzzy, c-format
 msgid "The %s of the %s (%s)"
 msgstr "O %s dos %s"
@@ -3870,11 +3882,11 @@ msgstr "O %s dos %s"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Ficheiro legível de regras \"%s\" não encontrado."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "A ler conjuntos de regras"
 
@@ -3890,7 +3902,7 @@ msgstr ""
 "com jogos gravados antigos, ou pode indicar um jogo gravado inválido. "
 "Prossiga por sua conta e risco."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Jogo gravado demasiado antigo, requerida pelo menos versão 1.9.0."
@@ -3914,13 +3926,13 @@ msgstr ""
 "A utilizar '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3959,7 +3971,7 @@ msgstr "Industrial"
 msgid "Networking"
 msgstr ""
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Todas"
@@ -3984,7 +3996,7 @@ msgstr "Taxas"
 msgid "Changed"
 msgstr "Alterar"
 
-#: server/settings.c:102
+#: server/settings.c:83
 #, fuzzy
 msgid ""
 "Allowed take string contains invalid\n"
@@ -3993,7 +4005,7 @@ msgstr ""
 "Expressão de ligações autorizadas contém caracteres\n"
 "inválidos.  Consulte \"help allowconnect\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 #, fuzzy
 msgid ""
 "Starting units string contains invalid\n"
@@ -4002,22 +4014,22 @@ msgstr ""
 "Expressão de ligações autorizadas contém caracteres\n"
 "inválidos.  Consulte \"help allowconnect\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -4025,23 +4037,28 @@ msgid ""
 msgstr ""
 "Número de jogadores é mais elevado que o valor pedido, a manter valor antigo"
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Você não está autorizado a definir esta opção."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr ""
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
 "  size = 20 is a huge map of 20,000 tiles"
 msgstr ""
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr ""
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4077,11 +4094,11 @@ msgid ""
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 msgstr ""
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Método utilizado para gerar o mapa"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4093,12 +4110,12 @@ msgid ""
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr ""
 
-#: server/settings.c:301
+#: server/settings.c:292
 #, fuzzy
 msgid "Method used to choose start positions"
 msgstr "Método utilizado para gerar o mapa"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4111,37 +4128,37 @@ msgid ""
 "of start pos and to the number of players"
 msgstr ""
 
-#: server/settings.c:315
+#: server/settings.c:306
 #, fuzzy
 msgid "Presence of 1x1 islands"
 msgstr "Existência ou ausência de ilhas 1x1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = sem ilhas 1x1; 1 = algumas ilhas 1x1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Se os polos são ou não continentes distintos"
 
-#: server/settings.c:322
+#: server/settings.c:313
 #, fuzzy
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr "0 = continentes podem ser anexos aos polos; 1 = polos são distintos"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr ""
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr ""
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr ""
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4159,21 +4176,21 @@ msgid ""
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr ""
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr ""
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Quant. de colinas/montanhas"
 
-#: server/settings.c:360
+#: server/settings.c:351
 #, fuzzy
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
@@ -4181,22 +4198,22 @@ msgid ""
 msgstr ""
 "Valores menores geram mapas planos, maiores geram mapas com mais relevo."
 
-#: server/settings.c:366
+#: server/settings.c:357
 #, fuzzy
 msgid "Amount of water on lands"
 msgstr "Quant. de terra vs oceano"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
 msgstr ""
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Raíz aleatória de geração do mapa"
 
-#: server/settings.c:375
+#: server/settings.c:366
 #, fuzzy
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
@@ -4206,23 +4223,23 @@ msgstr ""
 "Uma mesma raíz produzirá sempre o mesmo mapa; para zero (por omissão) uma "
 "raíz será definida baseada na data actual, para gerar um mapa aleatório."
 
-#: server/settings.c:388
+#: server/settings.c:379
 #, fuzzy
 msgid "Game random seed"
 msgstr "Raíz aleatória geral"
 
-#: server/settings.c:389
+#: server/settings.c:380
 #, fuzzy
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr "Para zero (por omissão) uma raíz será definida baseada na data."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Quant. de quadrados de recursos \"especiais\""
 
-#: server/settings.c:397
+#: server/settings.c:388
 #, fuzzy
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
@@ -4231,34 +4248,34 @@ msgstr ""
 "Os recursos especiais melhoram o tipo básico de terreno em que se "
 "encontram.  A escala da variável do servidor é de partes por milhar."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Quant. de cabanas (aldeias de tribos menores)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
 msgstr ""
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Número mínimo de jogadores"
 
-#: server/settings.c:419
+#: server/settings.c:410
 #, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "No mínimo, deve existir este número de jogadores (humanos ou IA) ligados "
 "antes do jogo poder começar."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Número máximo de jogadores"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4268,12 +4285,12 @@ msgstr ""
 "este número de jogadores é atingido no estado pré-jogo, qualquer novo "
 "jogador que se tente ligar será rejeitado."
 
-#: server/settings.c:435
+#: server/settings.c:426
 #, fuzzy
 msgid "Total number of players (including AI players)"
 msgstr "Número total de jogadores (a encher com IAs)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 #, fuzzy
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
@@ -4283,12 +4300,12 @@ msgstr ""
 "serão criados para aumentar o número total de jogadores para o valor desta "
 "opção."
 
-#: server/settings.c:448
+#: server/settings.c:439
 #, fuzzy
 msgid "List of players' initial units"
 msgstr "_Listar unidades presentes"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4304,31 +4321,31 @@ msgid ""
 "    A   = Strong attack unit (eg., Catapult)\n"
 msgstr ""
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Área onde as unidades iniciais são colocadas"
 
-#: server/settings.c:467
+#: server/settings.c:458
 #, fuzzy
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "Este é metade da largura do lado de um quadrado dentro do qual as unidades "
 "iniciais são dispersas."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Moedas iniciais por jogador"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 
-#: server/settings.c:480
+#: server/settings.c:471
 #, fuzzy
 msgid "Number of initial techs per player"
 msgstr "Número inicial de colonos por jogador"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4336,11 +4353,11 @@ msgid ""
 "next techs really expensive."
 msgstr ""
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 #, fuzzy
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
@@ -4348,11 +4365,11 @@ msgid ""
 "determined by the ruleset or other game settings."
 msgstr "Isto afecta a velocidade de investigação de tecnologia dos jogadores."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Percentagem de penalização por mudar de tecnologia"
 
-#: server/settings.c:501
+#: server/settings.c:492
 #, fuzzy
 msgid ""
 "If you change your current research technology, and you have positive "
@@ -4363,12 +4380,12 @@ msgstr ""
 "pesquisa, perderá esta percentagem desses pontos de pesquisa.  Não se aplica "
 "se descobriu a tecnologia neste turno."
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Penalização por obter tecn. por tratado"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4380,11 +4397,11 @@ msgstr ""
 "igual a esta percentagem do custo para pesquisar um novo avanço.  Você "
 "poderá ficar com pontos de pesquisa negativos se este valor não for zero."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Penalização por obter tecn. por conquista"
 
-#: server/settings.c:522
+#: server/settings.c:513
 #, fuzzy
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
@@ -4396,11 +4413,11 @@ msgstr ""
 "avanço.  Você poderá ficar com pontos de pesquisa negativos se este valor "
 "não for zero."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Penalização por obter uma tecnologia grátis"
 
-#: server/settings.c:533
+#: server/settings.c:524
 #, fuzzy
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
@@ -4415,23 +4432,23 @@ msgstr ""
 "custo para pesquisar um novo avanço.  Você poderá ficar com pontos de "
 "pesquisa negativos se este valor não for zero."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Comida necessária para que uma cidade cresça"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
 "the size of the city."
 msgstr ""
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Percentagem de comida perdida por necessitar de aqueduto"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4441,21 +4458,21 @@ msgstr ""
 "(ou Sistema de Esgotos), ela perderá esta percentagem da sua comida (ou "
 "metade desta quantidade se possuir um Celeiro)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Tamanho mínimo da cidade para obter comércio total"
 
-#: server/settings.c:579
+#: server/settings.c:570
 #, fuzzy
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
@@ -4468,11 +4485,11 @@ msgstr ""
 "decrementa gradualmente até 0% (sem penalização excepto corrupção) para "
 "tamanho=fulltradesize. Consulte também notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Tamanho máximo de uma cidade sem comércio"
 
-#: server/settings.c:590
+#: server/settings.c:581
 #, fuzzy
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
@@ -4483,11 +4500,11 @@ msgstr ""
 "comércio. O comércio produzido incrementa gradualmente para cidades maiores "
 "que notradesize e menor que fulltradesize. Consulte também fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Tamanho da cidade a partir do qual cidadãos ficam descontentes"
 
-#: server/settings.c:600
+#: server/settings.c:591
 #, fuzzy
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
@@ -4497,11 +4514,11 @@ msgstr ""
 "cidade serão contentes, e os restantes cidadãos descontentes.  Consulte "
 "também cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Nº de cidades para maior descontentamento"
 
-#: server/settings.c:609
+#: server/settings.c:600
 #, fuzzy
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
@@ -4514,12 +4531,12 @@ msgstr ""
 "unhappysize.  Assume-se uma Democracia; para outros governos o efeito ocorre "
 "com um número menor de cidades."
 
-#: server/settings.c:618
+#: server/settings.c:609
 #, fuzzy
 msgid "Minimum distance between cities"
 msgstr "Distância mínima entre cidades (distância de movimento)"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4533,11 +4550,11 @@ msgstr ""
 "direcção. Se estiver definido como 0 (por omissão), é sobreposto pelo "
 "conjunto de regras actual ao iniciar o jogo."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Número de turnos entre efeito de celebração"
 
-#: server/settings.c:631
+#: server/settings.c:622
 #, fuzzy
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
@@ -4546,11 +4563,11 @@ msgstr ""
 "Define o número de turnos entre o crescimento das celebrações numa cidade. "
 "Se definido como n uma cidade irá crescer após celebração em n+1 turnos."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Hipótese de destruição de um edifício conquistado"
 
-#: server/settings.c:641
+#: server/settings.c:632
 #, fuzzy
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
@@ -4559,11 +4576,11 @@ msgstr ""
 "Quando um jogador conquista uma cidade, cada Melhoramento da Cidade tem esta "
 "hipótese em percentagem de ser destruido."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Hip. de se mover para uma casa após atacá-la"
 
-#: server/settings.c:648
+#: server/settings.c:639
 #, fuzzy
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
@@ -4578,21 +4595,21 @@ msgstr ""
 "casa).  Se definido um valor entre 0 e 100, será a hipótese em percentagem "
 "de \"ocupar\" o território."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Reduz a população de uma cidade após um ataque"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4609,33 +4626,33 @@ msgstr ""
 "  4 = helitransportado\n"
 "  8 = aéreo"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr ""
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
 "tiles or tiles within range of more than one nation's cities."
 msgstr ""
 
-#: server/settings.c:690
+#: server/settings.c:681
 #, fuzzy
 msgid "Units inside borders cause no unhappiness"
 msgstr "Unidades militares no campo poderão causar infelicidade. "
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr ""
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4644,11 +4661,11 @@ msgid ""
 "4 = diplomacy is disabled for everyone."
 msgstr ""
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Nomes de cidades permitidos"
 
-#: server/settings.c:708
+#: server/settings.c:699
 #, fuzzy
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
@@ -4671,11 +4688,11 @@ msgstr ""
 "definido como 3, não é permitido a um jogador utilizar o nome por omissão de "
 "uma cidade da nação de outro jogador."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Frequência com que aparecem bárbaros"
 
-#: server/settings.c:737
+#: server/settings.c:728
 #, fuzzy
 msgid ""
 "0 = no barbarians \n"
@@ -4690,29 +4707,29 @@ msgstr ""
 "3 - surgimento de bárbaros frequente \n"
 "4 - hordas em fúria, imensos bárbaros"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Ano da invasão bárbara"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Os bárbaros não aparecerão antes deste ano."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr ""
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
 msgstr ""
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Se activar ou não o nevoeiro de guerra"
 
-#: server/settings.c:765
+#: server/settings.c:756
 #, fuzzy
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
@@ -4723,31 +4740,31 @@ msgstr ""
 "suas unidades e cidades lhe serão reveladas. Você não verá novas cidades ou "
 "alterações de terreno em casas não observadas."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Se a corrida espacial é ou não permitida"
 
-#: server/settings.c:783
+#: server/settings.c:774
 #, fuzzy
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Se a opção for 1, os jogadores podem construir naves espaciais."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Número mínimo de cidades para guerra civil"
 
-#: server/settings.c:790
+#: server/settings.c:781
 #, fuzzy
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
@@ -4758,11 +4775,11 @@ msgstr ""
 "de cidades e a sua capital for capturada.  Se esta opcção for definida para "
 "o valor máximo, não existirão guerras civis."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr ""
 
-#: server/settings.c:800
+#: server/settings.c:791
 #, fuzzy
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
@@ -4773,12 +4790,12 @@ msgstr ""
 "suas unidades se terem encontrado pela última vez. Coloque a zero para "
 "desactivar completamente esta funcionalidade."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Reconstruir palácio se a capital for conquistada"
 
-#: server/settings.c:811
+#: server/settings.c:802
 #, fuzzy
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
@@ -4790,11 +4807,11 @@ msgstr ""
 "automaticamente reconstruido gratuitamente numa cidade seleccionada "
 "aleatoriamente, independentemente do conhecimento de Maçonaria."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Se utilizar ou não nomes de cidades naturais"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -4802,11 +4819,11 @@ msgstr ""
 "Se activo, os nomes das cidades serão determinados baseados no terreno "
 "circundante."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr ""
 
-#: server/settings.c:835
+#: server/settings.c:826
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
@@ -4863,11 +4880,11 @@ msgstr ""
 "   (nenhum) = Apenas uma controladora.\n"
 "Ligações e observadores múltiplos são de momento EXPERIMENTAIS."
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Se o estado IA é alternado com a ligação"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -4875,25 +4892,27 @@ msgstr ""
 "Se definido como 1, estado IA é desligado quando um jogador se liga, e "
 "activado quando um jogador se desliga."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Ano em que o jogo termina"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr ""
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Número máximo de segundos por turno"
 
-#: server/settings.c:885
+#: server/settings.c:876
 #, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Se nem todos os jogadores tiverem primido o \"Turno Terminado\" antes de "
 "expirar este tempo, o turno termina automaticamente. Zero significa que não "
@@ -4901,33 +4920,33 @@ msgstr ""
 "auto-jogo. Utilize em conjunto com o comando \"timeoutincrease\" para ter um "
 "cronómetro dinâmico."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 #, fuzzy
 msgid "Whether to have simultaneous player phases."
 msgstr "Se registar estatísticas dos jogadores"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 #, fuzzy
 msgid "Seconds to let a client's network connection block"
 msgstr "Segundos para permitir uma ligação cliente bloquear"
 
-#: server/settings.c:914
+#: server/settings.c:907
 #, fuzzy
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
@@ -4938,12 +4957,12 @@ msgstr ""
 "valor, a ligação TCP é terminada. Zero significa que não existe qualquer "
 "expiração para além da imposta pela própria implementação do protocolo TCP."
 
-#: server/settings.c:923
+#: server/settings.c:916
 #, fuzzy
 msgid "Max seconds for network buffers to drain"
 msgstr "Nº máx. de seg. para esvaziar os buffers TCP"
 
-#: server/settings.c:924
+#: server/settings.c:917
 #, fuzzy
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
@@ -4954,11 +4973,11 @@ msgstr ""
 "os buffers de ligação TCP de todos os clientes desbloqueiem. Zero significa "
 "que o servidor não irá aguardar."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Segundos entre PINGs"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -4966,22 +4985,22 @@ msgstr ""
 "O civserver irá questionar os clientes com um pedido PING de cada vez que "
 "este período expirar."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Tempo para cortar um cliente"
 
-#: server/settings.c:941
+#: server/settings.c:934
 #, fuzzy
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Se um cliente não der uma resposta PONG neste período de tempo, é desligado."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Modo de jogo de bloqueio de turno"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
@@ -4990,11 +5009,11 @@ msgstr ""
 "Se definido como 1 o turno de jogo não avança até que todos os jogadores "
 "tenham terminado o seu turno, incluindo jogadores desligados."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Modo de jogo de turnos de duração fixa"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5003,11 +5022,11 @@ msgstr ""
 "Se definido como 1 o turno de joho não avança até que o prazo tenha "
 "expirado, independentemente dos jogadores terem primido \"Turno Terminado\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "O que é apresentado no relatório Demográfico"
 
-#: server/settings.c:964
+#: server/settings.c:957
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
@@ -5043,11 +5062,11 @@ msgstr ""
 "    b = mostrar coluna \"melhor nação\"\n"
 "(A ordem destes caracteres é irrelevante, mas a sua capitalização não o é.)"
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Turnos por auto-gravação"
 
-#: server/settings.c:989
+#: server/settings.c:982
 #, fuzzy
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
@@ -5056,11 +5075,11 @@ msgstr ""
 "O jogo será automaticamente gravado cada este nº de turnos.\n"
 "Zero significa nunca fazer auto-gravação."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Nível de compressão do jogo gravado"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 #, fuzzy
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
@@ -5072,11 +5091,11 @@ msgstr ""
 "tempo.  Se o máximo for zero este servidor não foi compilado para utilizar a "
 "zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Prefixo de nome de auto-gravação"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 #, fuzzy
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
@@ -5085,11 +5104,11 @@ msgstr ""
 "Jogos gravados automaticamente terão o nome \"<prefixo><ano>.sav\".\n"
 "Esta opção define a parte <prefixo>."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Se registar estatísticas dos jogadores"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 #, fuzzy
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
@@ -5104,7 +5123,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Servidor incapaz de ler da consola. A ignorar consola."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, fuzzy, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Metaservidor: endereço inválido: [%s:%d]."
@@ -5240,104 +5259,104 @@ msgstr "Falha ao gravar o jogo como %s"
 msgid "Game saved as %s"
 msgstr "Jogo gravado como %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "O jogo já foi iniciado."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "A iniciar o jogo."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "pedido de relatório desconhecido (tipo %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, fuzzy, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Aviso: Receia-se fome em %s."
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Obtido um pacote do tipo %d de um jogador morto ou observador"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Seleccione um nome não-vazio."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 #, fuzzy
 msgid "That nation is already in use."
 msgstr "O jogo já foi iniciado."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "Já existe outro jogador de nome '%s'.  Seleccione outro nome."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 #, fuzzy
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Seleccione um nome não-vazio."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, fuzzy, c-format
 msgid "%s nation is already in use."
 msgstr "O jogo já foi iniciado."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s é o governante %s %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, fuzzy, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Incapaz de iniciar o jogo: este já foi iniciado."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, fuzzy, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s foi acrescentado como um jogador controlado por IA."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Jogador %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s governa os %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "A enviar informação para o metaservidor [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "O jogo terminou..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "A aceitar novas ligações de clientes."
 
@@ -5358,7 +5377,7 @@ msgstr "(ambíguo)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5534,7 +5553,7 @@ msgstr "Não podem ser removidos jogadores após se ter iniciado o jogo."
 msgid "Removed player %s from the game."
 msgstr "Removido do jogo o jogador %s."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5614,739 +5633,766 @@ msgstr ""
 "Não pode aumentar nível de acesso de comando para '%s'; você apenas possui '%"
 "s'."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Nível de acesso de comando definido como '%s' para a ligação %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 "Nível de acesso de comando não pode ser definido como '%s' para a ligação %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Nível de acesso de comando definido como '%s' para novos jogadores."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 "Nível de acesso de comando definido como '%s' para o primeiro jogador a obte-"
 "lo"
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 #, fuzzy
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 "O comando 'firstlevel' não tem sentido a partir da linha de comando do "
 "servidor."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Você já possui o nível de acesso de comando '%s' ou superior."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 #, fuzzy
 msgid "Someone else already is game organizer."
 msgstr "Desculpe, mas já existe alguém com esse nome."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Argumento inválido %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 "Utilização: timeoutincrease <turno> <increm_turn> <valor> <mult_valor>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Expiração dinâmica definida como %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Opção:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Descrição:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "alterável"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fixo"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Valor: %d, Mínimo: 0, Por Omissão: %d, Máximo 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Valor: %d, Mínimo: %d, Por Omissão: %d, Máximo %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Valor: \"%s\", Por Omissão: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Explicações disponíveis para as seguintes opções do servidor:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Ainda não existe explicação para essa opção."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Nome de opção ambígua."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Operador do Servidor: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Jogador '%s' possui agora o nível de capacidade IA '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s não é controlado por IA."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Nível de capacidade por omissão da IA definido para '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Este comando é apenas de cliente."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Utilização: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s colocado em modo ausente."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s voltou ao jogo."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Desculpe, você não possui acesso para ver a opção '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Opção '%s' desconhecida."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 #, fuzzy
 msgid "All options with non-default values"
 msgstr "= significa que a opção está com o valor por omissão"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 #, fuzzy
 msgid "All options"
 msgstr "Definir opções locais"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 #, fuzzy
 msgid "Vital options"
 msgstr "Opções da cidade"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 #, fuzzy
 msgid "Situational options"
 msgstr "Definir opções locais"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr ""
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ significa que pode alterar a opção"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= significa que a opção está com o valor por omissão"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s valor   (mín,máx)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Opção"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "descrição"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Impossível alterar equipas após iniciar o jogo."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 #, fuzzy
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Argumento indefinido.  Utilização: team <jogador> [equipa]."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 #, fuzzy
 msgid "Cannot team a barbarian."
 msgstr "Impossível alternar um jogador bárbaro."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Jogador %s incluida na equipa %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 #, fuzzy
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Argumento indefinido.  Utilização: team <jogador> [equipa]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr ""
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr ""
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr ""
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr ""
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 #, fuzzy
 msgid "Value must be integer."
 msgstr "Valor tem de ser um inteiro."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr ""
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, fuzzy, c-format
 msgid "You voted for \"%s\""
 msgstr "Você fundou %s"
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 #, fuzzy
 msgid "Can only use this command once game has begun."
 msgstr "Impossível alterar equipas após iniciar o jogo."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 #, fuzzy
 msgid "Value 2 & 3 must be integer."
 msgstr "Valor tem de ser um inteiro."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr ""
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr ""
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "%s, unidade %s, sofreu um ataque nuclear."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "%s, unidade %s, sofreu um ataque nuclear."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 #, fuzzy
 msgid "Value 2 must be integer."
 msgstr "Valor tem de ser um inteiro."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr ""
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Argumento indefinido.  Utilização: set <opção> <valor>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Você não está autorizado a definir esta opção."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Esta opção não pode ser alterada após o ínicio do jogo."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Valor tem de ser um inteiro."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Valor fora do intervalo (mínimo: %d, máximo 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Opção: %s foi alterada para %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Valor fora do intervalo (mínimo: %d, máximo %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr ""
 "Valor de expressão demasiado comprida.  Utilização: set <opção> <valor>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Opção: %s foi alterada para \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 #, fuzzy
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Desculpe, não são permitidos jogadores novos neste jogo."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Desculpe, não se pode re-ligar como jogador humano neste jogo."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 #, fuzzy
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Desculpe, não pode observar bárbaros neste jogo."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 #, fuzzy
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Desculpe, não pode observar bárbaros neste jogo."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 #, fuzzy
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Desculpe, não se podem observar jogadores mortos neste jogo."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 #, fuzzy
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Desculpe, não se podem observar jogadores mortos neste jogo."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 #, fuzzy
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Desculpe, não se podem observar jogadores IA neste jogo."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 #, fuzzy
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Desculpe, não se podem observar jogadores IA neste jogo."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 #, fuzzy
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Desculpe, não se podem observar jogadores IA neste jogo."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 #, fuzzy
 msgid "Sorry, one can't take human players in this game."
 msgstr "Desculpe, não se pode re-ligar como jogador humano neste jogo."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 #, fuzzy
 msgid "Sorry, one can't observe in this game."
 msgstr "Desculpe, não são permitidos jogadores novos neste jogo."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 #, fuzzy
 msgid "Sorry, one can't take players in this game."
 msgstr "Desculpe, não são permitidos jogadores novos neste jogo."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 #, fuzzy
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "Desculpe, não são permitidos jogadores novos neste jogo."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 #, fuzzy
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 #, fuzzy
 msgid "Usage: observe [player-name]"
 msgstr "Utilização: take <nome-de-jogador>"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, fuzzy, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s já controla ou observa %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, fuzzy, c-format
 msgid "%s is already observing %s."
 msgstr "%s está a construir %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, fuzzy, c-format
 msgid "%s is already observing."
 msgstr "%s está a construir %s."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, fuzzy, c-format
 msgid "%s now observes %s"
 msgstr "%s controla agora %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, fuzzy, c-format
 msgid "%s now observes"
 msgstr "%s controla agora %s"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 #, fuzzy
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Utilização: take <nome-de-jogador>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
 
-#: server/stdinhand.c:2951
+#: server/stdinhand.c:3010
 #, fuzzy, c-format
-msgid "%s already controls %s"
+msgid "%s already controls %s."
 msgstr "%s já controla ou observa %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Não existe nenhum jogador or ligação com o nome %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr ""
 
-#: server/stdinhand.c:3076
+#: server/stdinhand.c:3135
 #, fuzzy, c-format
-msgid "%s now controls %s (%s, %s)"
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s controla agora %s"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Bárbaro"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "IA"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Humano"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 #, fuzzy
 msgid "Alive"
 msgstr "Activa"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 #, fuzzy
 msgid "Dead"
 msgstr ", Morto"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s não é um nome válido."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 #, fuzzy
 msgid "Usage: detach <connection-name>"
 msgstr "cut <nome-ligação>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 #, fuzzy
 msgid "You can not detach other users."
 msgstr "Não pode atacar aqui."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, fuzzy, c-format
 msgid "%s is not attached to any player."
 msgstr "%s não é um nome válido."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, fuzzy, c-format
 msgid "%s detaching from %s"
 msgstr "%s a desligar-se de  %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, fuzzy, c-format
 msgid "%s no longer observing."
 msgstr "%s está a construir %s."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, fuzzy, c-format
 msgid "detaching from %s."
 msgstr "A pesquisar %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 #, fuzzy
 msgid "Usage: load <game name>"
 msgstr "Utilização: ler <nome-de-ficheiro>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 #, fuzzy
 msgid "Cannot load a game while another is running."
 msgstr "Não é possível ler um jogo enquanto outro estiver a decorrer."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, fuzzy, c-format
 msgid "Could not load savefile: %s"
 msgstr "Incapaz de ler o ficheiro de jogo gravado: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Directório de conjunto de regras actual é \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Directório de conjunto de regras \"%s\" não encontrado"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, fuzzy, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Directório de conjunto de regras definido como \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Directório de conjunto de regras definido como \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Adeus."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Desculpe, você não está autorizado a utilizar comandos do servidor."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr "Aviso: '%s' interpretado como '%s', mas é ambíguo.  Consulte '%shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Comando desconhecido.  Consulte '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr ""
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Você não está autorizado a utilizar este comando."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(linha de comando do servidor)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 #, fuzzy
 msgid "Game ended in a draw."
 msgstr "Jogo terminou com um empate"
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Incapaz de terminar o jogo: nenhum jogo em curso."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 #, fuzzy
 msgid "You cannot surrender now."
 msgstr "Sabotar Construções"
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
+msgstr "Não existem jogadores suficientes, o jogo não pode começar."
+
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
 msgstr "Não existem jogadores suficientes, o jogo não pode começar."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Não existem jogadores suficientes, o jogo não pode começar."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 #, fuzzy
 msgid "All players are ready; starting game."
 msgstr "Já existe um jogador com esse nome."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 #, fuzzy
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr "Incapaz de iniciar o jogo: este já foi iniciado."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Incapaz de iniciar o jogo: este já foi iniciado."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "A terminar a ligação %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6383,126 +6429,126 @@ msgstr ""
 "  save   -  para gravar o jogo actual\n"
 "  quit   -  para sair"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Comando:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Sinopse: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Nível: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Os comandos de servidor disponíveis são os seguintes:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "O argumento da ajuda '%s' é ambíguo."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Não existe qualquer ocorrência na ajuda do argumento '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Lista de argumentos inválida: '%s'.  Consulte '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Lista de jogadores:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<nenhum jogador>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "utilizador %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Morto"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", nível de dificuldade %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 #, fuzzy
 msgid ", ready"
 msgstr ", pronto"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 #, fuzzy
 msgid ", not ready"
 msgstr ", não pronto"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d ligação:"
 msgstr[1] " %d ligações:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s de %s (nível de acesso %s), bufsize=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (modo observador)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 #, fuzzy
 msgid "List of teams:"
 msgstr "Lista de jogadores:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] ""
 msgstr[1] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr ""
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Lista de ligações ao servidor:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<nenhuma ligação>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 #, fuzzy
 msgid "List of scenarios available:"
 msgstr "Nenhuma Unidade Disponível"
@@ -6574,17 +6620,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Objectivo tecnológico é %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Você roubou %s aos %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "Os %s roubaram-lhe %s!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "Os %s roubaram %s aos %s."
@@ -7099,20 +7145,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr "O seu %s voltou para se reabastecer."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Massa terrestre elevada - isto pode levar alguns segundos."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, fuzzy, c-format
 msgid "Falling back to generator %d."
 msgstr "A regressar ao valor de omissão de gerador 2."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Gerador 3 não colocou todas as ilhas maiores."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Gerador 3 deixou %li massas terrestres por colocar."
@@ -7199,122 +7245,123 @@ msgstr "Talvez exista uma configuração incorrecta ou falta de permissões"
 msgid "Cannot find audio file %s"
 msgstr "Incapaz de encontrar ficheiro audio %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX turnos"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d moedas por turno"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d turno"
 msgstr[1] "%3d turnos"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "nunca"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/turno"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d turno"
 msgstr[1] "%s (%d) %d turnos"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Obsoleta"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Construída"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 #, fuzzy
 msgid "Great Wonder"
 msgstr "Maravilha"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 #, fuzzy
 msgid "Small Wonder"
 msgstr "Maravilhas Disponíveis"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/turno"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, fuzzy, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%s - %s cidadãos"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, fuzzy, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "Não existem rotas comerciais.\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, fuzzy, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "Construir Unidades"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -7427,8 +7474,8 @@ msgid "Best defending units"
 msgstr "Unidades com melhor defesa"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7609,8 +7656,8 @@ msgstr "?pollution [short]:Pol"
 msgid "?cma:Governor"
 msgstr ""
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7880,21 +7927,21 @@ msgstr ""
 "Ligação automática ao servidor \"%s\" no porto %d como \"%s\" a cada %d.%d "
 "segundo(s) por %d vezes"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 #, fuzzy
 msgid "novice"
 msgstr "nada"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "fácil"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 #, fuzzy
 msgid "normal"
 msgstr "Honrosa"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "difícil"
 
@@ -7902,35 +7949,35 @@ msgstr "difícil"
 msgid "experimental"
 msgstr ""
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 #, fuzzy
 msgid "Starting server..."
 msgstr "A iniciar o jogo."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 #, fuzzy
 msgid "Couldn't start the server."
 msgstr "Não pode atacar aqui."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr ""
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 #, fuzzy
 msgid "Couldn't connect to the server."
 msgstr "Corta a ligação de um cliente ao servidor."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr ""
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 #, fuzzy
 msgid "We have control of the server (command access level hack)"
 msgstr "Questiona ou define acesso a nível de acesso de comandos."
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 
@@ -8020,28 +8067,28 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, fuzzy, c-format
 msgid "Allows %s."
 msgstr "Permite %s.\n"
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, fuzzy, c-format
 msgid "Allows %s (with %s)."
 msgstr "Permite %s (com %s).\n"
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 #, fuzzy
 msgid " Rivers"
 msgstr "  Rios"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Desculpe, mas não existe ajuda para %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8052,13 +8099,13 @@ msgstr ""
 "Esta página foi gerada automaticamente.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr ""
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, fuzzy, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr ""
@@ -8066,209 +8113,209 @@ msgstr ""
 "\n"
 "A descoberta de %s tornará %s obsoleta.  "
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, fuzzy, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 "Permite a todos os jogadores com o conhecimento de %s construir a unidade %"
 "s.  "
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, fuzzy, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "Permite %s (com %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, fuzzy, c-format
 msgid "* Allows %s.\n"
 msgstr "Permite %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 #, fuzzy
 msgid "* May not be built in cities.\n"
 msgstr "* Pode construir novas cidades.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr ""
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr ""
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr ""
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr ""
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Pode transportar e reabastecer %d unidade aérea.\n"
 msgstr[1] "* Pode transportar e reabastecer %d unidades aéreas.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Pode transportar e reabastecer %d unidade de mísseis.\n"
 msgstr[1] "* Pode transportar e reabastecer %d unidades de mísseis.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Pode transportar %d unidade terrestre através do oceano.\n"
 msgstr[1] "* Pode transportar %d unidades terrestres através do oceano.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, fuzzy, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Pode ajudar a construir maravilhas.\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr ""
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Pode construir novas cidades.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 #, fuzzy
 msgid "* Can build roads and railroads.\n"
 msgstr "* Pode ajudar a construir maravilhas.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 #, fuzzy
 msgid "* Can build mines on tiles.\n"
 msgstr "* Pode construir novas cidades.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 #, fuzzy
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Pode construir novas cidades.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 #, fuzzy
 msgid "* Can build farmland.\n"
 msgstr "Construir Quinta"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, fuzzy, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Pode construir novas cidades.\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 #, fuzzy
 msgid "* Can build fortresses.\n"
 msgstr "Permite aos %s construir fortalezas.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 #, fuzzy
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "Limpar Radiação Nuclear"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 #, fuzzy
 msgid "* Can transform tiles.\n"
 msgstr "* Pode efectuar acções de colonização.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 #, fuzzy
 msgid "* Can build airbases.\n"
 msgstr "* Pode construir novas cidades.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Pode efectuar acções diplomáticas e acções especiais de espionagem.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Pode efectuar acções diplomáticas.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr ""
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Pode atacar unidades aéreas inimigas.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* É invisível excepto quando junto a uma unidade ou cidade enimiga.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 "* Apenas pode atacar unidades em quadrados de oceano (não ataca em terra).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 #, fuzzy
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
@@ -8277,77 +8324,77 @@ msgstr ""
 "* Pode atacar a partir de unidades navais: contra cidades inimigas e contra "
 "quadrados terrestres."
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, fuzzy, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Pode ser lançada de paraquedas de uma cidade amistosa (Alcance: %d)."
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr ""
 "* Obtém o dobro da defesa contra unidades especificadas como 'montadas'.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Conta como unidade 'montada' contra certos defensores.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Uma unidade míssil: é gasta após um ataque.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Efectuar um ataque termina o turno desta unidade.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* O ataque desta unidade causa uma explosão nuclear!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr ""
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignora os efeitos das muralhas.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Obtém o quíntuplo da defesa contra mísseis e aeronaves.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 "* Ignora efeitos do terreno (trata todos os quadrados como estradas).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignora zonas de controlo.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* Unidade não-militar (não pode atacar; não pode impôr lei marcial).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "* Unidade de campo: gera um descontente mesmo quando não-agressiva.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr ""
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, fuzzy, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8356,12 +8403,12 @@ msgstr ""
 "* Tem de terminar turno numa cidade ou próximo da costa, ou existe o risco "
 "de 50%% de ser perdida no mar."
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr ""
@@ -8370,27 +8417,27 @@ msgstr ""
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " ou "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* Unidade tem de estar numa cidade, ou num %s após %d turno.\n"
 msgstr[1] "* Unidade tem de estar numa cidade, ou num %s após %d turnos.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Se fossemos agora começar com %s iriamos necessitar de %d lâmpadas."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8399,91 +8446,91 @@ msgstr ""
 "Para atingir %s temos de obter %d outras tecnologias primeiro. A globalidade "
 "do projecto irá necessitar de %d lâmpadas para terminar."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr ""
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 " Este número pode variar dependendo do que outros jogadores pesquisarem.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, fuzzy, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr "O primeiro jogador a pesquisar %s recebe um avanço técnico imediato.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 #, fuzzy
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "Aumenta a poluição gerada pela população.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, fuzzy, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "Permite aos %s construir estradas sobre quadrados com rios.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, fuzzy, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "Permite aos %s construir fortalezas.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, fuzzy, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "Permite aos %s construir bases aéreas.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, fuzzy, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "Permite aos %s transformar as estradas em ferrovias.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, fuzzy, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "Permite aos %s transformar as irrigações em quintas.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 #, fuzzy
 msgid "* You cannot build cities on this terrain."
 msgstr "Você não pode subornar uma unidade desta nação."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr ""
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr ""
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr ""
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8494,7 +8541,7 @@ msgid_plural ""
 msgstr[0] "Unidades militares no campo poderão causar infelicidade. "
 msgstr[1] "Unidades militares no campo poderão causar infelicidade. "
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8502,48 +8549,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8551,23 +8598,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8578,7 +8625,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8586,64 +8633,64 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 #, fuzzy
 msgid "* Your units cannot be bribed.\n"
 msgstr "Este tipo de unidade não pode ser lançada de paraquedas."
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 #, fuzzy
 msgid "* Your cities cannot be incited.\n"
 msgstr "Cidade não pode ser incitada!"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 #, fuzzy
 msgid "* Has no unhappy citizens.\n"
 msgstr "%d cidadãos descontentes adicionais."
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 #, fuzzy
 msgid "* Veteran units.\n"
 msgstr "Unidades marítimas"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8651,7 +8698,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8659,71 +8706,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, fuzzy, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "Permite aos %s construir bases aéreas.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, fuzzy, c-format
 msgid "%s%d %s"
 msgstr "%3d/%3d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d descontente(es)"
@@ -9140,16 +9187,16 @@ msgstr "Expressão de funcionalidade do servidor: %s"
 msgid "Start of turn %d"
 msgstr "Início do turno %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "Modo IA é agora %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "ACTIVO"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "INACTIVO"
 
@@ -9183,13 +9230,13 @@ msgstr "?city:Nome"
 msgid "Username"
 msgstr "Renomear"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Bandeira"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9205,7 +9252,7 @@ msgstr "Bóer"
 msgid "Score"
 msgstr "Obter Pontuação"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Equipa"
 
@@ -9240,37 +9287,37 @@ msgstr ""
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 #, fuzzy
 msgid "You cannot sell improvements."
 msgstr "Sabotar Construções"
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, fuzzy, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Vendido %d %s por %d moedas"
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, fuzzy, c-format
 msgid "No %s could be sold."
 msgstr "Nenhum %s pode ser vendido"
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr ""
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, fuzzy, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s não pode manter %s, unidade dissolvida."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, fuzzy, c-format
 msgid "Disbanded %d %s."
 msgstr "Foi dissolvida a sua %s em (%d, %d)."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, fuzzy, c-format
 msgid "No %s could be disbanded."
 msgstr "Nenhum %s pode ser vendido"
@@ -9587,64 +9634,69 @@ msgstr "Moedas: %d"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Impos:%d Luxo:%d Ciên:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "em %s"
+
+#: client/text.c:609
 #, fuzzy, c-format
 msgid "Moving: %s"
 msgstr "em %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr ""
 
-#: client/text.c:625
+#: client/text.c:629
 #, fuzzy, c-format
 msgid "%s People"
 msgstr "%s Bem vindo"
 
-#: client/text.c:629
+#: client/text.c:633
 #, fuzzy, c-format
 msgid "Turn: %d"
 msgstr "Terreno: %s"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Moedas: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr ""
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, fuzzy, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Impos:%d Luxo:%d Ciên:%d"
 
-#: client/text.c:639
+#: client/text.c:643
 #, fuzzy, c-format
 msgid "Researching %s: %s"
 msgstr "A Pesquisar %s: %d/%d"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Governo: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, fuzzy, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9652,58 +9704,58 @@ msgstr[0] " unidade"
 msgstr[1] " unidade"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr ""
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr ""
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, fuzzy, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "Selecção de unidade"
 msgstr[1] "Selecção de unidade"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 #, fuzzy
 msgid "No units selected."
 msgstr "Nação Seleccionada"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 #, fuzzy
 msgid "No units to upgrade!"
 msgstr "Nenhuma unidade pode ser actualizada."
 
-#: client/text.c:860
+#: client/text.c:864
 #, fuzzy
 msgid "None of these units may be upgraded."
 msgstr "Nenhuma unidade pode ser actualizada."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9718,14 +9770,14 @@ msgstr[1] ""
 "Actualizar %s para %s por %d moedas?\n"
 "Tesouro contém %d moedas."
 
-#: client/text.c:887
+#: client/text.c:891
 #, fuzzy
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 "Mostra o seu progresso na pesquisa da tecnologia actual.\n"
 "%s: %d/%d."
 
-#: client/text.c:893
+#: client/text.c:897
 #, fuzzy
 msgid "no research target."
 msgstr ""
@@ -9733,46 +9785,46 @@ msgstr ""
 "(nenhuma pesquisa)"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 #, fuzzy
 msgid "Shows the progress of global warming:"
 msgstr ""
 "Mostra o progresso no aquecimento global:\n"
 "%d."
 
-#: client/text.c:917
+#: client/text.c:921
 #, fuzzy, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Poluição:    %3d"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 #, fuzzy
 msgid "Shows the progress of nuclear winter:"
 msgstr ""
 "Mostra o progresso do inverno nuclear:\n"
 "%d."
 
-#: client/text.c:936
+#: client/text.c:940
 #, fuzzy, c-format
 msgid "Fallout rate: %d%%"
 msgstr "taxa máxima de %s: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 #, fuzzy
 msgid "Shows your current government:"
 msgstr ""
@@ -9780,25 +9832,25 @@ msgstr ""
 "%s."
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, fuzzy, c-format
 msgid "Population:      %5d"
 msgstr "População: %s"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, fuzzy, c-format
 msgid "Energy:          %5d %%"
 msgstr "Massa:           %5d ton"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9806,96 +9858,96 @@ msgstr[0] "Massa:           %5d ton"
 msgstr[1] "Massa:           %5d tons"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Tempo de viagem: %5.1f anos"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Tempo de viagem:    N/D     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr ""
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:infinito"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dd %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:excedida"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, fuzzy, c-format
 msgid "%s of the %s"
 msgstr "O %s dos %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, fuzzy, c-format
 msgid "Observer: %s"
 msgstr " (observador)"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Edifícios: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Nenhum. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Maravilhas: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Cidades: %d total, %d acima do patamar de %d cidades."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9903,7 +9955,7 @@ msgstr[0] "%d contentes antes de penalização com "
 msgstr[1] "%d contentes antes de penalização com "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9911,16 +9963,16 @@ msgstr[0] "%d cidadãos descontentes adicionais."
 msgstr[1] "%d cidadãos descontentes adicionais."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Lei marcial em prática ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "sem máximo, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9928,20 +9980,20 @@ msgstr[0] "%d unidade no máximo, "
 msgstr[1] "%d unidades no máximo, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d por unidade). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Unidades militares no campo poderão causar infelicidade. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Unidades militares não têm qualquer efeito na felicidade. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Luxo: %d total."
@@ -9988,12 +10040,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "nada"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "costumizado"
 
@@ -10050,12 +10102,14 @@ msgid "Ooops..."
 msgstr "Opções..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 #, fuzzy
 msgid "This unit cannot be bribed!"
 msgstr "Este tipo de unidade não pode ser lançada de paraquedas."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10072,6 +10126,7 @@ msgstr "Subornar Unidade Inimiga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10112,6 +10167,7 @@ msgstr "_Avanços:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "À Descrição do Espião"
 
@@ -10136,12 +10192,13 @@ msgstr "_Construções:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Produção da Cidade"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Você não pode incitar uma revolta em %s."
@@ -10153,6 +10210,7 @@ msgstr "Cidade não pode ser incitada!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10169,6 +10227,7 @@ msgstr "Incitar Revolta!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10178,6 +10237,7 @@ msgstr ""
 "Tesouro contém %d moedas."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10247,11 +10307,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Subverter Unidade Inimiga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Senhor, o diplomata aguarda as suas ordens"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Senhor, o espião aguarda as suas ordens"
@@ -10354,7 +10416,7 @@ msgstr "Poluição:"
 msgid "_Overview"
 msgstr "Supervisão"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10379,11 +10441,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d turnos"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Comprar"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "Produção"
@@ -10506,7 +10568,7 @@ msgstr "Unidades suportadas %d"
 msgid "Present units %d"
 msgstr "Unidades presentes %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Cen_trar"
 
@@ -10598,35 +10660,35 @@ msgstr "Renomear Cidade"
 msgid "What should we rename the city to?"
 msgstr "Para o que devemos renomear a cidade?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_Alterar"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 #, fuzzy
 msgid "Add _First"
 msgstr "Adicionar pré-definição"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 #, fuzzy
 msgid "Add _Next"
 msgstr "Adicionar pré-definição"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 #, fuzzy
 msgid "Add _Last"
 msgstr "Adicionar pré-definição"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "_Mostrar"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10636,13 +10698,13 @@ msgstr "_Mostrar"
 msgid "Cities"
 msgstr "Cidades"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "_Visualizar"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10651,85 +10713,90 @@ msgstr "_Visualizar"
 msgid "Improvements"
 msgstr "Construções"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Maravilhas"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Todas as Cidades"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Nenhuma Cidade"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Inverter Selecção"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Construir Unidades"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Construir Construções"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Construir Maravilhas"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Construir Unidade"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Construir Construção"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Construir Maravilha"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Cidades Costeiras"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Mesma Ilha"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Unidades Suportadas"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Unidades Presentes"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Construções na Cidade"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Maravilhas na Cidade"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Unidades Disponíveis"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Construções Disponíveis"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Maravilhas Disponíveis"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Custo Total:"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 #, fuzzy
 msgid ""
@@ -10797,129 +10864,129 @@ msgstr "Que nome deverá ter a pré-definição?"
 msgid "Remove this preset?"
 msgstr "Remover esta pré-definição?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "_Ir para localização"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "Visualizar _Cidade"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Então quer uma revolução?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revolução!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "O que Pilhar"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Seleccione o que pilhar:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 #, fuzzy
 msgid "Unit"
 msgstr "Unidades"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Nome"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Selecção de unidade"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "P_reparar todas"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "_Sentinela das inactivas"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Nações:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Que Nação Irá Personificar?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 #, fuzzy
 msgid "Pick Nation"
 msgstr "Esquadra de Polícia"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Nações Unidas"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Seleccione uma nação"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Lider:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Feminino"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Masculino"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "_Estilo das Cidades:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "L_egenda"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Tem de seleccionar o seu sexo."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Tem de seleccionar o estilo de cidade."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Tem de escrever um nome válido."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Actualizar Unidade!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11169,71 +11236,77 @@ msgstr ""
 msgid "Not _ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 #, fuzzy
 msgid "_Ready"
 msgstr "P_reparar todas"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 #, fuzzy
 msgid "_Start"
 msgstr "Estado"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Cidades"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 #, fuzzy
 msgid "Pick _Nation"
 msgstr "Esquadra de Polícia"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 #, fuzzy
 msgid "_Observe"
 msgstr " (observador)"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "controla agora"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 #, fuzzy
 msgid "<AI>"
 msgstr "IA"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 #, fuzzy
 msgid "<Easy AI>"
 msgstr "IA"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 #, fuzzy
 msgid "<Hard AI>"
 msgstr "IA"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 #, fuzzy
 msgid "Random"
 msgstr "Rádio"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Observer"
 msgstr " (observador)"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Detached"
 msgstr ", Morto"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr ""
 
@@ -12183,234 +12256,234 @@ msgstr ""
 msgid "Connect to Gaming _Zone"
 msgstr "Ligar a esta localização"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Nome Servidor"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Porto"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versão"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Estado"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Jogadores"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Observações"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 #, fuzzy
 msgid "Internet _Metaserver"
 msgstr "Metaservidor"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 #, fuzzy
 msgid "_Login:"
 msgstr "Legião"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 #, fuzzy
 msgid "C_onnect"
 msgstr "Ligar"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, fuzzy, c-format
 msgid "Connection name: %s"
 msgstr "A Ligar"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, fuzzy, c-format
 msgid "Player name: %s"
 msgstr "?city:Nome"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, fuzzy, c-format
 msgid "Host: %s"
 msgstr "Máquina:"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, fuzzy, c-format
 msgid "%s info"
 msgstr "Informação cidade"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 #, fuzzy
 msgid "Toggle player ready"
 msgstr "aitoggle <nome-de-jogador>"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 #, fuzzy
 msgid "Pick nation"
 msgstr "Esquadra de Polícia"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 #, fuzzy
 msgid "Take this player"
 msgstr "Cidades"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 #, fuzzy
 msgid "Cut connection"
 msgstr "A terminar a ligação %s."
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 #, fuzzy
 msgid "Aitoggle player"
 msgstr "aitoggle <nome-de-jogador>"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 #, fuzzy
 msgid "Remove player"
 msgstr "A remover o jogador %s."
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, fuzzy, c-format
 msgid "Put on %s"
 msgstr "População: %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "Número de jogadores a encher com IA's"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "_Pré-definições:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 #, fuzzy
 msgid "_More Game Options..."
 msgstr "Opções das Mensagens..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 #, fuzzy
 msgid "Record"
 msgstr "Relatório"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 #, fuzzy
 msgid "Rating"
 msgstr "A aguardar"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 #, fuzzy
 msgid "Ready"
 msgstr "Activar todas"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Lider"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 #, fuzzy
 msgid "Choose a Scenario"
 msgstr "Ler Cenário"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 #, fuzzy
 msgid "Choose a _Scenario:"
 msgstr "Ler Cenário"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Tipo"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 #, fuzzy
 msgid "Choose a _nation to play:"
 msgstr "Seleccionar actividade da unidade:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 #, fuzzy
 msgid "Select Location to Save"
 msgstr "Seleccione uma nação e nome"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Gravar Jogo"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 #, fuzzy
 msgid "Saved _Games:"
 msgstr "Gravar Jogo"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 #, fuzzy
 msgid "Save _Filename:"
 msgstr "Gravar Jogo"
@@ -12448,7 +12521,7 @@ msgstr "Nome do Edifício"
 msgid "Count"
 msgstr "Contagem"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12695,28 +12768,28 @@ msgstr "Listas de _Tarefas:"
 msgid "Edit Global _Worklists"
 msgstr "_Adicionar Lista de Tarefas Global"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Turnos"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "_Tarefas Origem:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Mostrar Objectivos _Futuros"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Lista de _Tarefas Objectivo:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "_Adicionar Lista de Tarefas Global"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 #, fuzzy
 msgid "Chan_ge Production"
 msgstr "Alterar Produção"
@@ -13022,8 +13095,8 @@ msgid "City shrinks: %d %s"
 msgstr "Cidade: %s(%s)"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13139,12 +13212,12 @@ msgstr "Relatório Final:"
 msgid "Maintenance Report"
 msgstr "Relatório da Investigação..."
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 #, fuzzy
 msgid "worklist"
 msgstr "(lista de tarefas)"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13584,21 +13657,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -14906,7 +14979,7 @@ msgstr "_Estilo das Cidades:"
 msgid "Unit Selection"
 msgstr "Selecção de unidade"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "NENHUM"
 
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index df9b321..bb21044 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f2540f4..4a5a462 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.1.0-beta3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-09-01 23:06+0300\n"
 "Last-Translator: Jose Carlos Medeiros <jose at psabs.com.br>\n"
 "Language-Team: Portuguese/Brazil <gnome-l10n-br at listas.cipsga.org.br>\n"
@@ -49,22 +49,22 @@ msgstr "Luxo"
 msgid "Science"
 msgstr "Ciência"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "B"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "w"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "O"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "B"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "w"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -484,81 +484,81 @@ msgstr "Mensagens de conectar/desconectar"
 msgid "AI Debug messages"
 msgstr "Mensagens de depuração da IA"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "Adepto ao Genocídio"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "Guerreador"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "Hostil"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "Não Cooperativo"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "Desconfortável"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "Neutro"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "Respeitoso"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "Ajudante"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "Entusiástico"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "Admirador"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "Honrado"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "Armistício"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "Guerra"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "Cessar Fogo"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "Paz"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "Aliança"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "Nunca Vi"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "Time"
 
@@ -604,13 +604,13 @@ msgstr "unidades %s"
 msgid "Size %d"
 msgstr "Tamanho %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Tecn. Futura %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -622,65 +622,65 @@ msgstr "Tecn. Futura %d"
 msgid "None"
 msgstr "Nenhum"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Tecn. Futura"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Desconhecido)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Estrada"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Irrigação"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Ferrovia"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Mina"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Poluição"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Cabana"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Fortaleza"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Rio"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Fazenda"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Base aérea"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "sobra"
 
@@ -786,11 +786,11 @@ msgstr "Nuclear"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " e "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?e:, "
 
@@ -950,81 +950,81 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (total de %d repetição)"
 msgstr[1] " (total de %d repetições)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Argumento vazio para \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Argumento em falta para \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d AC"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d DC"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH está definido mas vazio; utilizando o caminho padrão."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Incapaz de ler o diretório de dados %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "O caminho de dados pode ser definido através da variável de ambiente "
 "FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Caminho de dados atual é: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "O arquivo \"%s\" é requerido ... abortando!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Erro fatal: você esta tentanto me executar como super usuário!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Utilize uma conta sem privilégios (não 'root').\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "equivalência perfeita"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "única equivalência"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "ambíguo"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "vazio"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "muito longo"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "não-equivalente"
 
@@ -1053,22 +1053,22 @@ msgstr "Os %s começaram a construir: %s em %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s está vendido %s (não necessário) para %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (IA)* No modo de espera a IA não pode aceitar tal tratado."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (IA)* Primeiro quebre a aliança com %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (IA)* Vamos primeiro cessar as hostilidades, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1076,47 +1076,47 @@ msgid ""
 msgstr ""
 "*%s (IA)* Eu gostaria de ver você manter o cessar fogo um pouco mais, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (IA)* Eu simplesmente não acredito nesta aliança ainda, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (IA)* Eu não conheço a cidade que você mencionou."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (AI)* Desculpe, compartilhar a visão com você não é seguro."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (AI)* Esta negociação não foi boa para nós, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* Bem vindo a nossa aliança %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* Sim, podemos ficar unidos para sempre, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* Sim, paz em nosso tempo!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)* Aceito. Sem mais hostilidades, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1125,23 +1125,23 @@ msgstr ""
 "*%s (AI)* Parabéns %s! Podemos sugerir um cessar-fogo enquanto nós tentamos "
 "encontrar outra solução?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* O espaço nunca sera nosso. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "*%s (AI)* Eu ja tolerei seus antigos vícios o suficiente! Vamos às armas!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (AI)* Paz... talvez outra hora."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1150,17 +1150,17 @@ msgstr ""
 "*%s (IA)* Finalmente estou perto de você! Você pensou realmente que "
 "escaparia com seus crimes?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (IA)* Suas hostilidades secretas trouxeram esta guerra à você!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (IA)* Sua agressão contra %s foi seu último erro!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1177,7 +1177,7 @@ msgstr[1] ""
 "parar o lançamento espacial.*%s (IA)* Nós iremos lançar uma guerra total "
 "contra %s em %d turnos para parar o lançamento espacial."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1186,7 +1186,7 @@ msgstr ""
 "*%s (IA)* Sua ajuda neste assunto é esperada. Longa vida a nossa gloriosa "
 "aliança!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1209,7 +1209,7 @@ msgstr[1] ""
 "ganhos próprios. Responderemos com força em %d turno e esperamos que você "
 "honre nossa aliança e faça o mesmo!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1220,13 +1220,13 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1237,12 +1237,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1253,7 +1253,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1264,47 +1264,47 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
 "intentions, and I will have no more of our alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr ""
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
 "our enemy, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
 "s. Why do I need to remind you of your promises?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1312,26 +1312,26 @@ msgid ""
 "more!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
 "cessation of hostilities?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1339,104 +1339,109 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Todas as opções"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (veterano)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Isso não é um nome válido, tente de novo.\n"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Incapaz de encontrar ficheiro audio %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Convidados não são permitidos neste servidor. Desculpe."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s foi rejeitado: Convidados não são aceitos."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr ""
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr ""
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s foi rejeitado: Erro de banco e convidados não são permitidos."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Entre com a senha para %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Entre com uma senha (e lembre-se dela)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Este servidor apenas permite usuários pré registrados. Desculpe."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s foi rejeitado: Somente usuários pré-registrados são permitidos."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Desculpe, muitas tentativas erradas..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 "%s foi rejeitado: Excesso de tentativas com senha errada para o novo usuário."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1444,30 +1449,30 @@ msgstr ""
 "Aviso: Erro ao salvar o banco de dados. Continuando, mas sua estatística não "
 "será gravada."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s foi rejeitado: Excesso de tentativas com senha errada."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Sua senha está incorreta. Tente novamente."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Desculpe, sua conexão congelou..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s foi rejeitada: Conexão parou esperando pela senha."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "Sua senha é muito pequena, o tamanho mínimo é %d. Tente novamente."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2252,12 +2257,10 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2265,34 +2268,34 @@ msgstr ""
 "depuração [ jogador <player> | cidade <x> <y> | unidades <x> <y> | unidade "
 "<id> | tecn <player> | tempo | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Liga ou desliga a depuração de IA da entidade."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 "Mostra a depuração IA da entidade e liga ou desliga a exibição contínua."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <nome-de-opção> <valor>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Define opção do servidor."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <nome-de-jogador> [time]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Alterar, adicionar ou remover a filiação do time de um jogador."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2305,15 +2308,15 @@ msgstr ""
 "compartilhada e embaixadas, e lutam em conjunto para obter vitória em time "
 "com pontuações individuais iguais à média do time."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <diretório>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr ""
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2322,15 +2325,15 @@ msgstr ""
 "Invocar sem argumentos apresenta o conjunto de regras atual."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <meta-linha>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Define a linha de informação do metaservidor."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2339,19 +2342,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metainfo <meta-linha>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Define a linha de informação do metaservidor."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Controla a conexão ao metaservidor."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2362,33 +2365,33 @@ msgstr ""
 "'metaconnection up' ou 'metac u' estabelece conexão com o metaservidor."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaservidor <endereço>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <nome-de-jogador>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Alterna estado IA do jogador."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [nome da conexão] <nome-de-jogador>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Tomar o lugar de um jogador no jogo."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2398,15 +2401,15 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [nome da conexão] [nome-de-jogador]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr ""
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2416,35 +2419,35 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <nome-conexão>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "destaca de um jogador."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <nome-de-jogador>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Cria um jogador IA com o nome indicado."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "O comando 'create' só está disponível antes do jogo ser iniciado."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2452,16 +2455,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Coloque-se em modo ausente. A IA irá tomar conta do seu jogo."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "A IA irá governar a sua nação mas efetuar alterações mínimas."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2469,11 +2472,11 @@ msgstr ""
 "novice\n"
 "novice <nome-jogador>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Coloca um ou todos os jogadores IA em nível 'novice' (iniciante)."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2484,7 +2487,7 @@ msgstr ""
 "computador.  Com um argumento, define o nível apenas desse jogador."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2492,11 +2495,11 @@ msgstr ""
 "easy\n"
 "easy <nome-de-jogador>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Coloca um ou todos os jogadores IA em nível 'easy' (fácil)."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2507,7 +2510,7 @@ msgstr ""
 "define o nível de capacidade apenas desse jogador."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2515,11 +2518,11 @@ msgstr ""
 "normal\n"
 "normal <nome-de-jogador>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Coloca um ou todos os jogadores IA em nível 'normal' (normal)."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2531,7 +2534,7 @@ msgstr ""
 "jogador."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2539,11 +2542,11 @@ msgstr ""
 "hard\n"
 "hard <nome-de-jogador>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Coloca um ou todos os jogadores IA em nível 'hard' (difícil)."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2555,7 +2558,7 @@ msgstr ""
 "jogador."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2563,11 +2566,11 @@ msgstr ""
 "experimental\n"
 "experimental <nome-de-jogador>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Coloca um ou todos os jogadores IA em nível 'experimental'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 #, fuzzy
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
@@ -2582,7 +2585,7 @@ msgstr ""
 "servidores normais, esta opção não tem qualquer efeito."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2596,11 +2599,11 @@ msgstr ""
 "cmdlevel <nível> first\n"
 "cmdlevel <nível> <nome-de-conexão>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Questiona ou define acesso a nível de acesso de comandos."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2622,20 +2625,20 @@ msgid ""
 "now takes connection names, not player names."
 msgstr ""
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <turno> <increm_turno> <valor> <mult_valor>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Consulte \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 #, fuzzy
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
@@ -2648,39 +2651,39 @@ msgstr ""
 "0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "fim de jogo"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "rendeu-se"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Desiste do jogo."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <nome-de-jogador>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Remove completamente o jogador."
 
-#: server/commands.c:325
+#: server/commands.c:324
 #, fuzzy
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
@@ -2690,7 +2693,7 @@ msgstr ""
 "etc.  Utilizar com cautela!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2698,11 +2701,11 @@ msgstr ""
 "save\n"
 "save <nome-de-arquivo>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Salva o jogo num arquivo."
 
-#: server/commands.c:333
+#: server/commands.c:332
 #, fuzzy
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
@@ -2720,7 +2723,7 @@ msgstr ""
 "e utilize o comando 'start' após os jogadores se terem ligado novamente."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2728,11 +2731,11 @@ msgstr ""
 "load\n"
 "load <nome-de-arquivo>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Lê jogo do arquivo."
 
-#: server/commands.c:345
+#: server/commands.c:344
 #, fuzzy
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
@@ -2742,28 +2745,28 @@ msgstr ""
 "jogadores, conjuntos de regras e opções de servidor são perdidos.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <arquivo>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Processa comandos do servidor a partir do arquivo."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <arquivo>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Grava as opções do servidor como comandos para o arquivo."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Alternar saída de servidor entre 'Estilo RFC' e estilo normal."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Simplesmente retorna o id do servidor."
 
@@ -3277,28 +3280,37 @@ msgstr "Você causou um incidente ao incitar uma revolta em %s."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s causou um incidente ao incitar uma revolta em %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Ano: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 #, fuzzy
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "A expiração de turno excedeu o seu limite máximo, a corrigir para máximo"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 #, fuzzy
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "A expiração de turno é menor do que zero, a corrigir para zero."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3342,11 +3354,11 @@ msgstr "Não existe nenhuma ligação com o nome %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Não existe nenhum jogador or ligação com o nome %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Aconteceu um Aquecimento global!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
@@ -3354,17 +3366,17 @@ msgstr ""
 "As linhas costais foram alagadas e vastas áreas plantáveis tornaram-se "
 "desertos."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 #, fuzzy
 msgid "Nuclear winter has occurred!"
 msgstr "Ocorreu um inverno nuclear!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 #, fuzzy
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr "A costa marítima secou e vastas zonas de pastos tornaram-se em tundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 #, fuzzy
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
@@ -3376,7 +3388,7 @@ msgstr ""
 "      Os trabalhadores juntam-se espontâneamente e colocam carris em todas "
 "as cidades."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 #, fuzzy
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
@@ -3388,12 +3400,12 @@ msgstr ""
 "      Os trabalhadores juntam-se espontâneamente e colocam carris em todas "
 "as cidades."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, fuzzy, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Transferido %s em (%d, %d) de %s para %s."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, fuzzy, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Transferido %s em (%d, %d) de %s para %s."
@@ -3454,52 +3466,52 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr ""
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, fuzzy, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Taxa de imposto excede o máximo para %s; ajustada."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, fuzzy, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Taxa de ciência excede o máximo para %s; ajustada."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, fuzzy, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Taxa de luxo excede o máximo para %s; ajustada."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, fuzzy, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s já não nos dá visão partilhada!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, fuzzy, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "O senado passa a sua moção devido às constantes provocações dos %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, fuzzy, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "O estado diplomático entre os %s e os %s é agora de %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, fuzzy, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3508,68 +3520,68 @@ msgstr ""
 " %s cancelam o acordo diplomático! O estado diplomático entre os %s e os %s "
 "é agora de %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr ""
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, fuzzy, c-format
 msgid "Removing player %s."
 msgstr "A remover o jogador %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 #, fuzzy
 msgid "You've been removed from the game!"
 msgstr "Você foi removido do jogo!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, fuzzy, c-format
 msgid "%s has been removed from the game."
 msgstr "%s foi removido do jogo."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, fuzzy, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Estabeleceu contacto com os %s, governados por %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr ""
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr ""
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr "Sua nação entrou em guerra civil, %s é declarado o líder dos rebeldes."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s declara lealdade a %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3808,21 +3820,21 @@ msgstr "º"
 msgid "th"
 msgstr "º"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Expressão demográfica contém caracteres inválidos. Consulte \"help demography"
 "\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Relatório Demográfico:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Desculpe, o relatório Demográfico não se encontra disponível."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "O %s de %s (%s)"
@@ -3833,11 +3845,11 @@ msgstr "O %s de %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Não pude abrir arquivo de roteiro '%s'."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Lendo o conjunto de regras"
 
@@ -3853,7 +3865,7 @@ msgstr ""
 "com jogos gravados antigos, ou pode indicar um jogo gravado inválido. "
 "Prossiga por sua conta e risco."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Jogo gravado muito antigo, requerida pelo menos versão 1.9.0."
@@ -3877,13 +3889,13 @@ msgstr ""
 "A utilizar '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3918,7 +3930,7 @@ msgstr "Interno"
 msgid "Networking"
 msgstr "Rede de Comunicação"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Todas"
@@ -3939,56 +3951,61 @@ msgstr "Raro"
 msgid "Changed"
 msgstr "Alterado"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
 msgstr ""
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
 msgstr ""
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr ""
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Você não está autorizado a definir esta opção."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr ""
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
 "  size = 20 is a huge map of 20,000 tiles"
 msgstr ""
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Índice de topoliga do mapa"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4024,11 +4041,11 @@ msgid ""
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 msgstr ""
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Método utilizado para gerar o mapa"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4040,11 +4057,11 @@ msgid ""
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr ""
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr ""
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4057,35 +4074,35 @@ msgid ""
 "of start pos and to the number of players"
 msgstr ""
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Presença de ilhas 1x1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = sem ilhas 1x1; 1 = algumas ilhas 1x1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Se os polos são ou não continentes distintos"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr ""
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr ""
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr ""
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4103,92 +4120,92 @@ msgid ""
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr ""
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr ""
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Quant. de colinas/montanhas"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
 msgstr ""
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr ""
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
 msgstr ""
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Raíz aleatória de geração do mapa"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
 "usually only of interest while debugging the game."
 msgstr ""
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Raíz aleatória de geração do mapa"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr ""
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Quant. de quadrados de recursos \"especiais\""
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
 msgstr ""
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Quant. de cabanas (aldeias de tribos menores)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
 msgstr ""
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Número mínimo de jogadores"
 
-#: server/settings.c:419
+#: server/settings.c:410
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Número máximo de jogadores"
 
-#: server/settings.c:427
+#: server/settings.c:418
 #, fuzzy
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
@@ -4199,21 +4216,21 @@ msgstr ""
 "este número de jogadores é atingido no estado pré-jogo, qualquer novo "
 "jogador que se tente ligar será rejeitado."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr ""
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
 msgstr ""
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Área onde as unidades iniciais são colocadas"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4229,27 +4246,27 @@ msgid ""
 "    A   = Strong attack unit (eg., Catapult)\n"
 msgstr ""
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Área onde as unidades iniciais são colocadas"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Moedas iniciais por jogador"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr ""
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4257,33 +4274,33 @@ msgid ""
 "next techs really expensive."
 msgstr ""
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
 "determined by the ruleset or other game settings."
 msgstr ""
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Percentagem de penalização por mudar de tecnologia"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
 "does not apply when you have just gained a technology this turn."
 msgstr ""
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr ""
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4291,22 +4308,22 @@ msgid ""
 "to gold transfers in diplomatic treaties."
 msgstr ""
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Penalização por obter tecn. por conquista"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
 "this is non-zero, you can end up with negative research points."
 msgstr ""
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Penalização por obter uma tecnologia grátis"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4315,23 +4332,23 @@ msgid ""
 "points."
 msgstr ""
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Comida necessária para que uma cidade cresça"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
 "the size of the city."
 msgstr ""
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Percentagem de comida perdida por necessitar de aqueduto"
 
-#: server/settings.c:554
+#: server/settings.c:545
 #, fuzzy
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
@@ -4342,21 +4359,21 @@ msgstr ""
 "(ou Sistema de Esgotos), ela perderá esta percentagem da sua comida (ou "
 "metade desta quantidade se possuir um Celeiro)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Tamanho mínimo da cidade para obter comércio total"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4364,32 +4381,32 @@ msgid ""
 "also notradesize."
 msgstr ""
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Tamanho máximo de uma cidade sem comércio"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
 "notradesize and smaller than fulltradesize. See also fulltradesize."
 msgstr ""
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr ""
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
 msgstr ""
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr ""
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4397,11 +4414,11 @@ msgid ""
 "numbers of cities."
 msgstr ""
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Número mínimo de cidades para guerra civil"
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4409,31 +4426,31 @@ msgid ""
 "(default), the ruleset value will be used."
 msgstr ""
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Número de turnos entre efeito de celebração"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
 msgstr ""
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Hipótese de destruição de um edifício conquistado"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr ""
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Hip. de se mover para uma casa após atacá-la"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4442,21 +4459,21 @@ msgid ""
 "\"occupying\" territory."
 msgstr ""
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Reduz a população de uma cidade após um ataque"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4473,32 +4490,32 @@ msgstr ""
 "  4 = helitransportado\n"
 "  8 = aéreo"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Diminuir raio da sombra"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
 "tiles or tiles within range of more than one nation's cities."
 msgstr ""
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr ""
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr ""
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4507,11 +4524,11 @@ msgid ""
 "4 = diplomacy is disabled for everyone."
 msgstr ""
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Nomes de cidades permitidos"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4526,11 +4543,11 @@ msgid ""
 "another nations unless it is a default for their nation also."
 msgstr ""
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Frequência com que aparecem bárbaros"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4539,82 +4556,82 @@ msgid ""
 "4 = raging hordes, lots of barbarians"
 msgstr ""
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Ano da invasão bárbara"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Os bárbaros não aparecerão antes deste ano."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Modo de jogo de turnos de duração fixa"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
 msgstr ""
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Se ativar ou não o nevoeiro de guerra"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
 "cities or terrain changes in tiles not observed."
 msgstr ""
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Se é permitida a corrida espacial"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr ""
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Número mínimo de cidades para guerra civil"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
 "civil wars are turned off altogether."
 msgstr ""
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr ""
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
 "players cannot meet unless they have an embassy."
 msgstr ""
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Reconstruir palácio se a capital for conquistada"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4622,11 +4639,11 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Se utilizar ou não nomes reais de cidades"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -4634,11 +4651,11 @@ msgstr ""
 "Se ativo, os nomes das cidades serão determinados baseados no terreno ao "
 "redor."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr ""
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4672,11 +4689,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Se o estado IA é alternado com a conexão"
 
-#: server/settings.c:871
+#: server/settings.c:862
 #, fuzzy
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
@@ -4685,74 +4702,76 @@ msgstr ""
 "Se definido como 1, estado IA é desligado quando um jogador se liga, e "
 "activado quando um jogador se desliga."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Ano em que o jogo termina"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr ""
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Número máximo de segundos por turno"
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 #, fuzzy
 msgid "Whether to have simultaneous player phases."
 msgstr "Se registar estatísticas dos jogadores"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr ""
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
 "connections will be automatically disconnected eventually)."
 msgstr ""
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr ""
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
 "not wait at all."
 msgstr ""
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Segundos entre PINGs"
 
-#: server/settings.c:933
+#: server/settings.c:926
 #, fuzzy
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
@@ -4761,40 +4780,40 @@ msgstr ""
 "O civserver irá questionar os clientes com um pedido PING de cada vez que "
 "este período expirar."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Tempo para cortar um cliente"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Modo de jogo de bloqueio de turno"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
 msgstr ""
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Modo de jogo de turnos de duração fixa"
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
 msgstr ""
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "O que é apresentado no relatório Demográfico"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -4816,42 +4835,42 @@ msgid ""
 "The order of characters is not significant, but their capitalization is."
 msgstr ""
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Turnos por auto-gravação"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
 msgstr ""
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Nível de compressão do jogo gravado"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
 "this server was not compiled to use zlib."
 msgstr ""
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Prefixo de nome de auto-gravação"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
 msgstr ""
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Se registar estatísticas dos jogadores"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -4863,7 +4882,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Servidor incapaz de ler da consola. A ignorar consola."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Servidor: endereço inválido: [%s:%d]."
@@ -5008,104 +5027,104 @@ msgstr "Falha ao salvar jogo como %s"
 msgid "Game saved as %s"
 msgstr "Jogo salvo como %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "O jogo já está sendo jogado."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Iniciando jogo."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, fuzzy, c-format
 msgid "request for unknown report (type %d)"
 msgstr "pedido de relatório desconhecido (tipo %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Aviso: rejeitando cliente antigo %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, fuzzy, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Obtido um pacote do tipo %d de um jogador morto ou observador"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 #, fuzzy
 msgid "Please choose a non-blank name."
 msgstr "Seleccione um nome não-vazio."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 #, fuzzy
 msgid "That nation is already in use."
 msgstr "O jogo já está sendo jogado."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, fuzzy, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "Já existe outro jogador de nome '%s'.  Seleccione outro nome."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr ""
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, fuzzy, c-format
 msgid "%s nation is already in use."
 msgstr "A sub-categoria esta em uso"
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, fuzzy, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s é o governante %s %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr ""
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr ""
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Jogador %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s regra o %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, fuzzy, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "A enviar informação para o metaservidor [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "O jogo acabou..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Agora aceitando novas conexões de clientes."
 
@@ -5126,7 +5145,7 @@ msgstr "(ambíguo)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5318,7 +5337,7 @@ msgstr "Não podem ser removidos jogadores após se ter iniciado o jogo."
 msgid "Removed player %s from the game."
 msgstr "Removido do jogo o jogador %s."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, fuzzy, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Porta restringida por motivos de segurança"
@@ -5398,752 +5417,778 @@ msgstr ""
 "Não pode aumentar nível de acesso de comando para '%s'; você apenas possui '%"
 "s'."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, fuzzy, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Nível de acesso de comando definido como '%s' para a ligação %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, fuzzy, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 "Nível de acesso de comando não pode ser definido como '%s' para a ligação %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, fuzzy, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Nível de acesso de comando definido como '%s' para novos jogadores."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, fuzzy, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 "Nível de acesso de comando definido como '%s' para o primeiro jogador a obte-"
 "lo"
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, fuzzy, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Você já possui o nível de acesso de comando '%s' ou superior."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Argumento inválido %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 #, fuzzy
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 "Utilização: timeoutincrease <turno> <increm_turn> <valor> <mult_valor>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, fuzzy, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Expiração dinâmica definida como %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Opção:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Descrição:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "alterável"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fixo"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, fuzzy, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Valor: %d, Mínimo: 0, Por Omissão: %d, Máximo 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, fuzzy, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Valor: %d, Mínimo: %d, Por Omissão: %d, Máximo %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, fuzzy, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Valor: \"%s\", Por Omissão: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 #, fuzzy
 msgid "Explanations are available for the following server options:"
 msgstr "Explicações disponíveis para as seguintes opções do servidor:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 #, fuzzy
 msgid "No explanation for that yet."
 msgstr "Ainda não existe explicação para essa opção."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 #, fuzzy
 msgid "Ambiguous option name."
 msgstr "Nome de opção ambígua."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, fuzzy, c-format
 msgid "Server Operator: %s"
 msgstr "Operador do Servidor: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, fuzzy, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Jogador '%s' possui agora o nível de capacidade IA '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, fuzzy, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s não é controlado por IA."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, fuzzy, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Nível de capacidade por omissão da IA definido para '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 #, fuzzy
 msgid "This command is client only."
 msgstr "Este comando é apenas de cliente."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Utilização: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s colocado em modo ausente."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s voltou ao jogo."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Desculpe, você não possui acesso para ver a opção '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Opção '%s' desconhecida."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr ""
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Todas as opções"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Opções vitais"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 #, fuzzy
 msgid "Situational options"
 msgstr "Opções de marcador"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 #, fuzzy
 msgid "Rarely used options"
 msgstr ""
 "\n"
 "Uso: %s [opções] [nome dos ficheiros ...]\n"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 #, fuzzy
 msgid "+ means you may change the option"
 msgstr "+ significa que pode alterar a opção"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 #, fuzzy
 msgid "= means the option is on its default value"
 msgstr "= significa que a opção está com o valor por omissão"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, fuzzy, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s valor   (mín,máx)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Opção"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "descrição"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 #, fuzzy
 msgid "Cannot change teams once game has begun."
 msgstr "Impossível alterar equipas após iniciar o jogo."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 #, fuzzy
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Argumento indefinido.  Utilização: set <opção> <valor>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 #, fuzzy
 msgid "Cannot team a barbarian."
 msgstr "Impossível alternar um jogador bárbaro."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, fuzzy, c-format
 msgid "Player %s set to team %s."
 msgstr "Jogador %s incluida na equipa %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr ""
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 #, fuzzy
 msgid "Observers cannot vote."
 msgstr "não pode aceder ao arquivo"
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, fuzzy, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "valor vazio para %s"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 #, fuzzy
 msgid "There are no votes going on."
 msgstr "Não há novas mensagens no servidor"
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr ""
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 #, fuzzy
 msgid "Value must be integer."
 msgstr "Valor tem de ser um inteiro."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, fuzzy, c-format
 msgid "No such vote (%d)."
 msgstr "(sem descrição disponível)"
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, fuzzy, c-format
 msgid "You voted for \"%s\""
 msgstr "Você vende %s em %s por %d moedas."
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, fuzzy, c-format
 msgid "You voted against \"%s\""
 msgstr "Tem a certeza?"
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr ""
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "%s sem depuração para a diplomacia"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "%s depuração da diplomacia"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "%s sem depuração para a tecnologia"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "%s depuração para a tecnologia"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 #, fuzzy
 msgid "Value 2 & 3 must be integer."
 msgstr "Valor tem de ser um inteiro."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 #, fuzzy
 msgid "Bad map coordinates."
 msgstr "Efeito de Mapa da Janela"
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr ""
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s sem depuração"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "%s de %s sem depuração."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "%s do %s em depuração."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 #, fuzzy
 msgid "Value 2 must be integer."
 msgstr "Valor tem de ser um inteiro."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, fuzzy, c-format
 msgid "Unit %d does not exist."
 msgstr "Pasta %s não existe"
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 #, fuzzy
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Argumento indefinido.  Utilização: set <opção> <valor>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 #, fuzzy
 msgid "You are not allowed to set this option."
 msgstr "Você não está autorizado a definir esta opção."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 #, fuzzy
 msgid "This setting can't be modified after the game has started."
 msgstr "Esta opção não pode ser alterada após o ínicio do jogo."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 #, fuzzy
 msgid "Value must be an integer."
 msgstr "Valor tem de ser um inteiro."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 #, fuzzy
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Valor fora do intervalo (mínimo: %d, máximo 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, fuzzy, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Opção: %s foi alterada para %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, fuzzy, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Valor fora do intervalo (mínimo: %d, máximo %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 #, fuzzy
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr ""
 "Valor de expressão demasiado comprida.  Utilização: set <opção> <valor>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, fuzzy, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Opção: %s foi alterada para \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 #, fuzzy
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 #, fuzzy
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 #, fuzzy
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 #, fuzzy
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 #, fuzzy
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 #, fuzzy
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 #, fuzzy
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 #, fuzzy
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 #, fuzzy
 msgid "Sorry, one can't take human players in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 #, fuzzy
 msgid "Sorry, one can't observe in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 #, fuzzy
 msgid "Sorry, one can't take players in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 #, fuzzy
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "Desculpe, você não poderá jogar. Não restam mais naçoes."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 #, fuzzy
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 #, fuzzy
 msgid "Usage: observe [player-name]"
 msgstr "Utilização: take <nome-de-jogador>"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, fuzzy, c-format
 msgid "%s is already observing %s."
 msgstr "%s já é a versão mais recente.\n"
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, fuzzy, c-format
 msgid "%s is already observing."
 msgstr "%s já é a versão mais recente.\n"
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, fuzzy, c-format
 msgid "%s now observes %s"
 msgstr "Lançar agora?"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, fuzzy, c-format
 msgid "%s now observes"
 msgstr "Lançar agora?"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 #, fuzzy
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 #, fuzzy
 msgid "Usage: take <player-name>"
 msgstr "Utilização: take <nome-de-jogador>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 #, fuzzy
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
 
-#: server/stdinhand.c:2951
+#: server/stdinhand.c:3010
 #, fuzzy, c-format
-msgid "%s already controls %s"
+msgid "%s already controls %s."
 msgstr "'%s' já está ligado."
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Não existe nenhum jogador or ligação com o nome %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, fuzzy, c-format
 msgid "being detached from %s."
 msgstr "Remover da Barra Rápida"
 
-#: server/stdinhand.c:3076
+#: server/stdinhand.c:3135
 #, fuzzy, c-format
-msgid "%s now controls %s (%s, %s)"
+msgid "%s now controls %s (%s, %s)."
 msgstr "Lançar agora?"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Bárbaro"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "IA"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Humano"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Ativar unidade"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Morto"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s não é um nome válido."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Uso: detach <conexão>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 #, fuzzy
 msgid "You can not detach other users."
 msgstr "Você apenas pode ?? unidades de transporte."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, fuzzy, c-format
 msgid "%s is not attached to any player."
 msgstr "%s não é um nome válido."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, fuzzy, c-format
 msgid "%s detaching from %s"
 msgstr "A descompactar %s (desde %s) ...\n"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, fuzzy, c-format
 msgid "%s no longer observing."
 msgstr "Os %s já não controlam %s! Tratado cancelado!"
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, fuzzy, c-format
 msgid "detaching from %s."
 msgstr "A descompactar %s (desde %s) ...\n"
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Uso: load <jogo>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 #, fuzzy
 msgid "Cannot load a game while another is running."
 msgstr "O jogo já está sendo jogado."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, fuzzy, c-format
 msgid "Could not load savefile: %s"
 msgstr "incapaz de ler ficheiro de regras \"%s\"."
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, fuzzy, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Directório de conjunto de regras actual é \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, fuzzy, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Directório de conjunto de regras \"%s\" não encontrado"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, fuzzy, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Directório de conjunto de regras actual é \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, fuzzy, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Directório de conjunto de regras definido como \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Adeus."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 #, fuzzy
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Desculpe, você não está autorizado a utilizar comandos do servidor."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, fuzzy, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr "Aviso: '%s' interpretado como '%s', mas é ambíguo.  Consulte '%shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, fuzzy, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Comando desconhecido.  Consulte '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr ""
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 #, fuzzy
 msgid "You are not allowed to use this command."
 msgstr "Você não está autorizado a utilizar este comando."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 #, fuzzy
 msgid "(server prompt)"
 msgstr "(linha de comando do servidor)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 #, fuzzy
 msgid "Game ended in a draw."
 msgstr "Jogo terminou com um empate"
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 #, fuzzy
 msgid "Cannot end the game: no game running."
 msgstr "Incapaz de terminar o jogo: nenhum jogo em curso."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 #, fuzzy
 msgid "You cannot surrender now."
 msgstr "Não é possível imprimir durante a visualização da impressão."
 
-#: server/stdinhand.c:3815
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
+msgstr "Não existem jogadores suficientes, o jogo não pode começar."
+
+#: server/stdinhand.c:3888
 #, fuzzy
-msgid "Not enough players, game will not start."
+msgid "No players, game will not start."
 msgstr "Não existem jogadores suficientes, o jogo não pode começar."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Não existem jogadores suficientes, o jogo não pode começar."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr ""
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 #, fuzzy
 msgid "Cannot start the game: it is already running."
 msgstr "Incapaz de iniciar o jogo: este já foi iniciado."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, fuzzy, c-format
 msgid "Cutting connection %s."
 msgstr "A terminar a ligação %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 #, fuzzy
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
@@ -6181,124 +6226,124 @@ msgstr ""
 "  save   -  para gravar o jogo actual\n"
 "  quit   -  para sair"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Comando:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Sinopse: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Nível: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 #, fuzzy
 msgid "The following server commands are available:"
 msgstr "Os comandos de servidor disponíveis são os seguintes:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, fuzzy, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "O argumento da ajuda '%s' é ambíguo."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, fuzzy, c-format
 msgid "No match for help argument '%s'."
 msgstr "Não existe qualquer ocorrência na ajuda do argumento '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, fuzzy, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Lista de argumentos inválida: '%s'.  Consulte '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Lista de jogadores:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<nenhum jogador>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "utilizador %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Morto"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", nível de dificuldade %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", pronto"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", não pronto"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d conexão:"
 msgstr[1] " %d conexões:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, fuzzy, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s de %s (nível de acesso %s), bufsize=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (modo observador)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Lista dos times:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, fuzzy, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : '%s' : %d jogador"
 msgstr[1] "%2d : '%s' : %d jogador"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 jogador : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Time vazio: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Lista de conexões ao servidor:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<nenhuma conexão>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Lista de cenários disponíveis:"
 
@@ -6368,17 +6413,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Falta %s; deixando %s"
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, fuzzy, c-format
 msgid "You steal %s from the %s."
 msgstr "Você recebeu a cidade %s dos %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, fuzzy, c-format
 msgid "The %s stole %s from you!"
 msgstr "Você recebeu a cidade %s dos %s."
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, fuzzy, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "A descompactar %s (desde %s) ...\n"
@@ -6910,22 +6955,22 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr "A Sua Caravana Chegou"
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 #, fuzzy
 msgid "High landmass - this may take a few seconds."
 msgstr "Massa terrestre elevada - isto pode levar alguns segundos."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, fuzzy, c-format
 msgid "Falling back to generator %d."
 msgstr "caíndo para o frontend; %s"
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 #, fuzzy
 msgid "Generator 3 didn't place all big islands."
 msgstr "Gerador 3 não colocou todas as ilhas maiores."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, fuzzy, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Gerador 3 deixou %li massas terrestres por colocar."
@@ -7016,122 +7061,123 @@ msgstr "Talvez exista uma configuração incorrecta ou falta de permissões"
 msgid "Cannot find audio file %s"
 msgstr "Incapaz de encontrar ficheiro audio %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 #, fuzzy
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX turnos"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, fuzzy, c-format
 msgid "%3d gold per turn"
 msgstr "%3d moedas por turno"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d turno"
 msgstr[1] "%3d turnos"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "nunca"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/turno"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d turno"
 msgstr[1] "%s (%d) %d turnos"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Obsoleta"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Construída"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Maravilha Grande"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Maravilha Pequena"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/turno"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, fuzzy, c-format
 msgid "%+4d : Citizens\n"
 msgstr "Novos cidadãos são"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, fuzzy, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "Comércio total das rotas comerciais: %d"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, fuzzy, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "Estas rotas comerciais foram estabelecidas com %s:\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, fuzzy, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "Construindo Árvore de Dependências"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, fuzzy, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "Remover da Barra Rápida"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, fuzzy, c-format
 msgid "%+4d : Waste\n"
 msgstr "?waste:Des"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, fuzzy, c-format
 msgid "%+4d : Disorder\n"
 msgstr "Desordem pública em %s."
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, fuzzy, c-format
 msgid "%+4d : Used\n"
 msgstr "Nome do tema utilizado"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 #, fuzzy
 msgid "==== : Adds up to\n"
 msgstr "desviado por %s para: %s\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Excedente total"
@@ -7245,8 +7291,8 @@ msgid "Best defending units"
 msgstr "Unidades com melhor defesa"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7427,8 +7473,8 @@ msgstr "Pol"
 msgid "?cma:Governor"
 msgstr "Governo"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7695,19 +7741,19 @@ msgid ""
 "%d times"
 msgstr ""
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "iniciante"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "fácil"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "difícil"
 
@@ -7715,31 +7761,31 @@ msgstr "difícil"
 msgid "experimental"
 msgstr ""
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Iniciando servidor..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Impossível iniciar o servidor."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr ""
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Impossível conectar ao servidor."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr ""
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr ""
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 
@@ -7845,27 +7891,27 @@ msgstr ""
 "Requer o tamanho mínimo de %d.\n"
 "\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Permite %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Permite %s (com %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr "Rios"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Desculpe, mas não existe ajuda para %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -7876,7 +7922,7 @@ msgstr ""
 "Esta página foi gerada automaticamente.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
@@ -7885,212 +7931,212 @@ msgstr ""
 "Requer o edifício %s.\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* A descoberta de %s tornará %s obsoleta.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, fuzzy, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 "Permite a todos os jogadores com o conhecimento de %s construir unidades de %"
 "s.  "
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Permite %s (com %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Permite %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 #, fuzzy
 msgid "* May not be built in cities.\n"
 msgstr "Ajuda a construir Maravilha"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr ""
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr ""
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr ""
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, fuzzy, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "Falha ao processar as dependências de compilação"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, fuzzy, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* * Pode transportar e reabastecer %d unidades aéreas.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, fuzzy, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* * Pode transportar e reabastecer %d unidades aéreas.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, fuzzy, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* * Pode transportar e reabastecer %d unidades aéreas.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, fuzzy, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "Ajuda a construir Maravilha"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Não podem ser dissolvidas.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Pode construir novas cidades.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 #, fuzzy
 msgid "* Can build roads and railroads.\n"
 msgstr "Ajuda a construir Maravilha"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 #, fuzzy
 msgid "* Can build mines on tiles.\n"
 msgstr "Ajuda a construir Maravilha"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 #, fuzzy
 msgid "* Can build irrigation on tiles.\n"
 msgstr "Ajuda a construir Maravilha"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 #, fuzzy
 msgid "* Can build farmland.\n"
 msgstr "%s ainda não podem construir %s."
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 #, fuzzy
 msgid "* Can build fortresses.\n"
 msgstr "%s ainda não podem construir %s."
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 #, fuzzy
 msgid "* Can transform tiles.\n"
 msgstr "debconf: não pode fazer chmod: %s"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 #, fuzzy
 msgid "* Can build airbases.\n"
 msgstr "%s ainda não podem construir %s."
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* Pode executar ações diplomáticas e ações especiais de espionagem.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Pode executar ações diplomáticas.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr ""
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 #, fuzzy
 msgid "* May not be bribed.\n"
 msgstr "não pode ser uma string vazia"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Pode atacar unidades aéreas inimigas.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 #, fuzzy
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* É invisível excepto quando junto a uma unidade ou cidade enimiga.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 #, fuzzy
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr ""
 "* Apenas pode atacar unidades em quadrados de oceano (não ataca em terra).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 #, fuzzy
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
@@ -8099,78 +8145,78 @@ msgstr ""
 "Pode atacar a bordo de unidades navais: contra cidades inimigas e contra "
 "quadrados terrestres."
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr ""
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Tem o dobro da defesa contra unidades definidas como 'montadas'.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Conta como unidade 'montada' contra certos defensores.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 #, fuzzy
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Uma unidade míssil: é gasta após um ataque.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Executar um ataque termina a vez desta unidade.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* O ataque desta unidade causa uma explosão nuclear!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr ""
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignora os efeitos das muralhas.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Dá 5x mais defesa contra mísseis e aeronaves.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Ignora efeitos do terreno (trata os quadrados como estradas).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignora zonas de controle.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 "* Uma unidade não-militar (não pode atacar; não pode impôr lei marcial).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 #, fuzzy
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "* Unidade de campo: gera um descontente mesmo quando não-agressiva.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr ""
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, fuzzy, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8179,12 +8225,12 @@ msgstr ""
 "* Deve acabar a sua vez numa cidade ou próxima da costa, ou tem uma chance "
 "de 50%% de ser perdida no mar."
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, fuzzy, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "A descoberta de %s reduzirá este valor por 1.  "
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr ""
@@ -8193,27 +8239,27 @@ msgstr ""
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " ou "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, fuzzy, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* Unidade tem de estar numa cidade, ou num %s após %d turno.\n"
 msgstr[1] "* Unidade tem de estar numa cidade, ou num %s após %d turno.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, fuzzy, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Se fossemos agora começar com %s iriamos necessitar de %d lâmpadas."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, fuzzy, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8222,95 +8268,95 @@ msgstr ""
 "Para atingir %s temos de obter %d outras tecnologias primeiro. A globalidade "
 "do projecto irá necessitar de %d lâmpadas para terminar."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 #, fuzzy
 msgid "You cannot research this technology."
 msgstr "Você não pode assinar digitalmente esta mensagem."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 #, fuzzy
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 " Este número pode variar dependendo do que outros jogadores pesquisarem.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, fuzzy, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "O primeiro jogador a pesquisar %s recebe um avanço técnico "
 "instantâneamente.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 #, fuzzy
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "Aumenta a poluição gerada pela população.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, fuzzy, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "Permite aos %s construir estradas em quadrados com rios.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, fuzzy, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "Falha ao processar as dependências de compilação"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, fuzzy, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "Falha ao processar as dependências de compilação"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, fuzzy, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "Permite aos %s transformar as estradas em ferrovias.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, fuzzy, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "Permite aos %s transformar as estradas em ferrovias.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 #, fuzzy
 msgid "* You cannot build cities on this terrain."
 msgstr "Não é possível comprar em uma cidade criada neste turno."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr ""
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr ""
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr ""
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Recursos:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8321,7 +8367,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8329,48 +8375,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8378,23 +8424,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8405,7 +8451,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8413,64 +8459,64 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 #, fuzzy
 msgid "* Your units cannot be bribed.\n"
 msgstr "Você não possui mais pontos de movimento"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 #, fuzzy
 msgid "* Your cities cannot be incited.\n"
 msgstr "%s não pode manter %s, unidade debandada."
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 #, fuzzy
 msgid "* Has no unhappy citizens.\n"
 msgstr "  %s não possui entrada override\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, fuzzy, c-format
 msgid "* Veteran %s units.\n"
 msgstr "Unidades suportadas %d"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 #, fuzzy
 msgid "* Veteran units.\n"
 msgstr "Unidades suportadas %d"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8478,7 +8524,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8486,71 +8532,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, fuzzy, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "Você dá a cidade de %s aos %s."
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d infelizes"
@@ -8964,16 +9010,16 @@ msgstr "Capacidade do servidor: %s"
 msgid "Start of turn %d"
 msgstr "Início do turno %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "Modo IA agora está %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "LIGADO"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "DESLIGADO"
 
@@ -9004,13 +9050,13 @@ msgstr "Nome"
 msgid "Username"
 msgstr "Usuário"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Bandeira"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9024,7 +9070,7 @@ msgstr "Borda"
 msgid "Score"
 msgstr "Pontuação"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Time"
 
@@ -9057,37 +9103,37 @@ msgstr "Ocioso"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 #, fuzzy
 msgid "You cannot sell improvements."
 msgstr "Você vende %s em %s por %d moedas."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, fuzzy, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Vender %s por %d moedas?"
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, fuzzy, c-format
 msgid "No %s could be sold."
 msgstr "Nenhuma unidade pode ser actualizada."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Você não pode dissolver as unidades."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s não pode ser dissolvida."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Dissolvido %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Nenhum %s pode ser dissolvido."
@@ -9396,64 +9442,69 @@ msgstr "Ouro: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Tax: %d Lux: %d Ciê: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Movendo: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Movendo: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Clique para informações)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s Pessoas"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Turno: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Moedas: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, fuzzy, c-format
 msgid "Net Income: %d"
 msgstr "Taxa de Entrada"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Taxas: Moedas:%d%% Luxo:%d%% Ciência:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Pesquisando %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, fuzzy, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Ocorreu um aquecimento global!"
 
-#: client/text.c:649
+#: client/text.c:653
 #, fuzzy, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Ocorreu um inverno nuclear!"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Governo: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9461,55 +9512,55 @@ msgstr[0] "%d unidade"
 msgstr[1] "%d unidades"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Turnos para alcançar: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Turnos para alcançar: %d para %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d unidade selecionada"
 msgstr[1] "%d unidades selecionadas"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Nenhuma unidade selecionada."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, fuzzy, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Desordem pública em %s."
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Outros: %d civil"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Outros: %d militar"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Nenhuma unidade para atualizar!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Nenhuma destas unidades podem ser atualizadas."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9524,74 +9575,74 @@ msgstr[1] ""
 "Atualizar %s para %s por %d moedas?\n"
 "O Tesouro contém %d moedas."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "sem nada a pesquisar"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 #, fuzzy
 msgid "Shows the progress of global warming:"
 msgstr "Ocorreu um aquecimento global!"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Taxa de poluição: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 #, fuzzy
 msgid "Shows the progress of nuclear winter:"
 msgstr "Ocorreu um inverno nuclear!"
 
-#: client/text.c:936
+#: client/text.c:940
 #, fuzzy, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Taxa de Atualização"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Mostra seu sistema de governo atual:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "População:      %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Suporte:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energia:          %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, fuzzy, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9599,96 +9650,96 @@ msgstr[0] "Massa:           %5d ton"
 msgstr[1] "Massa:           %5d ton"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Tempo de viagem: %5.1f anos"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Tempo de viagem:    N/D     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, fuzzy, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Massa:           %5d ton"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, fuzzy, c-format
 msgid "Year of arrival: %8s"
 msgstr "Ano da invasão bárbara"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "desligado"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "%02dd %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "excedida"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s de %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Observador: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Edifícios: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Nenhum. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Maravilhas: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, fuzzy, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Cidades: %d total, %d acima do patamar de %d cidades."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9696,7 +9747,7 @@ msgstr[0] "%d contentes antes de penalização com "
 msgstr[1] "%d contentes antes de penalização com "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9704,40 +9755,40 @@ msgstr[0] "%d cidadãos descontentes adicionais."
 msgstr[1] "%d cidadãos descontentes adicionais."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 #, fuzzy
 msgid "Martial law in effect ("
 msgstr "Lei marcial em prática ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 #, fuzzy
 msgid "no maximum, "
 msgstr "sem máximo, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, fuzzy, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
 msgstr[0] "%d unidade no máximo, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, fuzzy, c-format
 msgid "%d per unit). "
 msgstr "%d por unidade). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 #, fuzzy
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Unidades militares no campo poderão causar infelicidade. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 #, fuzzy
 msgid "Military units have no happiness effect. "
 msgstr "Unidades militares não têm qualquer efeito na felicidade. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, fuzzy, c-format
 msgid "Luxury: %d total."
 msgstr "Luxo: %d total."
@@ -9786,12 +9837,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "nenhum"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "custumizado"
 
@@ -9845,11 +9896,13 @@ msgid "Ooops..."
 msgstr "Ooops..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "A unidade não pode ser subornada!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -9866,6 +9919,7 @@ msgstr "Subornar Unidade Inimiga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -9906,6 +9960,7 @@ msgstr "_Avanços"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 #, fuzzy
 msgid "At Spy's Discretion"
 msgstr "À Descrição do Espião"
@@ -9931,12 +9986,13 @@ msgstr "_Melhoramentos:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Produção da Cidade"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Você não pode incitar uma revolta em %s."
@@ -9948,6 +10004,7 @@ msgstr "Cidade não pode ser incitada!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -9964,6 +10021,7 @@ msgstr "Incitar Revolta!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -9973,6 +10031,7 @@ msgstr ""
 "O tesouro contém %d moedas."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, fuzzy, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10042,11 +10101,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Subverte Unidade Inimiga"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Mestre, o diplomata aguarda pelas suas ordens"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Mestre, o espião aguarda pelas suas ordens"
@@ -10150,7 +10211,7 @@ msgstr "Poluição:"
 msgid "_Overview"
 msgstr "_Visão Geral"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10175,11 +10236,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d turnos"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Comprar"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "Pro_dução"
@@ -10299,7 +10360,7 @@ msgstr "Unidades suportadas %d"
 msgid "Present units %d"
 msgstr "Unidades presentes %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Cen_tralizar"
 
@@ -10391,32 +10452,32 @@ msgstr "Renomear Cidade"
 msgid "What should we rename the city to?"
 msgstr "Para o que devemos renomear a cidade?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_Alterar"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Adicionar _Antes"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Adicionar _Após"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Adicionar por Ú_ltimo"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Selecionar"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "_Mostrar"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10426,13 +10487,13 @@ msgstr "_Mostrar"
 msgid "Cities"
 msgstr "Cidades"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "_Visualizar"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10441,87 +10502,92 @@ msgstr "_Visualizar"
 msgid "Improvements"
 msgstr "Construções"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Maravilhas"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Todas as Cidades"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Nenhuma Cidade"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Inverter Seleção"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Construir Unidades"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Construir Construções"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Construir Maravilhas"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Construir Unidade"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Construir Construção"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Construir Maravilha"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Cidades Costeiras"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Mesma Ilha"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Unidades Suportadas"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Unidades Presentes"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 #, fuzzy
 msgid "Improvements in City"
 msgstr "Construções na Cidade"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Maravilhas na Cidade"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Unidades Disponíveis"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 #, fuzzy
 msgid "Available Improvements"
 msgstr "Construções Disponíveis"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Maravilhas Disponíveis"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Custo Total:"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10586,130 +10652,130 @@ msgstr "Que nome deverá ter a pré-definição?"
 msgid "Remove this preset?"
 msgstr "Remover esta pré-definição?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "_Ir para localização"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "Visualizar _Cidade"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Quer dizer que você quer uma revolução?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revolução!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "O que Pilhar"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Selecione o que pilhar:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Unidade"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Nome"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Seleção de Unidade"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "P_reparar todas"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "_Sentinela das inativas"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Nações:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 #, fuzzy
 msgid "What Nation Will You Be?"
 msgstr "Que Nação Irá Personificar?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 #, fuzzy
 msgid "Pick Nation"
 msgstr "Seleccione uma nação"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Nação Aleatória"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Selecione uma nação"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Propriedades"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Lider:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Feminino"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Masculino"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "_Estilo das Cidades:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "L_egenda"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Você deve escolher seu sexo."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 #, fuzzy
 msgid "You must select your city style."
 msgstr "Tem de seleccionar o estilo de cidade."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Você deve escrever um nome válido."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Atualizar Unidade!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -10969,69 +11035,75 @@ msgstr ""
 msgid "Not _ready"
 msgstr "P_reparar todas"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Pronto"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 #, fuzzy
 msgid "_Start"
 msgstr "Iniciar : "
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "take [nome-ligação] <nome-de-jogador>"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 #, fuzzy
 msgid "Pick _Nation"
 msgstr "Seleccione uma nação"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_Observar"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "Não _observar"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 #, fuzzy
 msgid "<Novice AI>"
 msgstr "Alterna estado IA do jogador."
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 #, fuzzy
 msgid "<Easy AI>"
 msgstr "Alterna estado IA do jogador."
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 #, fuzzy
 msgid "<Normal AI>"
 msgstr "  Pacotes Normais: "
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 #, fuzzy
 msgid "<Hard AI>"
 msgstr "Disco Rígido 3:"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Aleatório"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Observer"
 msgstr " (observador)"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Detached"
 msgstr "Holandês"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 #, fuzzy
 msgid "Are you sure you want to quit?"
 msgstr "Tem certeza que deseja apagar \"%s\" ?"
@@ -12001,236 +12073,236 @@ msgstr "Grava jogo para ficheiro."
 msgid "Connect to Gaming _Zone"
 msgstr "Não foi possível ligar em %s:%s (%s)."
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Servidor"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Porta"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versão"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Estado"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Jogadores"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Comentário"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 #, fuzzy
 msgid "Local _Area Network"
 msgstr "Escolha o servidor de rede"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 #, fuzzy
 msgid "Internet _Metaserver"
 msgstr "metaservidor <endereço>"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Conectar..."
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 #, fuzzy
 msgid "Pass_word:"
 msgstr "Palavra errada:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 #, fuzzy
 msgid "Conf_irm Password:"
 msgstr "Digite a senha do pacote"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, fuzzy, c-format
 msgid "Connection name: %s"
 msgstr "cut <nome-ligação>"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, fuzzy, c-format
 msgid "Player name: %s"
 msgstr "aitoggle <nome-de-jogador>"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Servidor: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Jogador/info conec"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s info"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 #, fuzzy
 msgid "Toggle player ready"
 msgstr "Alterna estado IA do jogador."
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 #, fuzzy
 msgid "Pick nation"
 msgstr "Seleccione uma nação"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 #, fuzzy
 msgid "Observe this player"
 msgstr "aitoggle <nome-de-jogador>"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 #, fuzzy
 msgid "Take this player"
 msgstr "take [nome-ligação] <nome-de-jogador>"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 #, fuzzy
 msgid "Cut connection"
 msgstr "cut <nome-ligação>"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 #, fuzzy
 msgid "Aitoggle player"
 msgstr "aitoggle <nome-de-jogador>"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 #, fuzzy
 msgid "Remove player"
 msgstr "remove <nome-de-jogador>"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 #, fuzzy
 msgid "Give info access"
 msgstr "não pode aceder ao arquivo"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 #, fuzzy
 msgid "Give ctrl access"
 msgstr "não pode aceder ao arquivo"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, fuzzy, c-format
 msgid "Put on %s"
 msgstr "Debconf em %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "Nível de _depuração:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "Escolha o seu _sexo"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "_Mais Opções..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Record"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 #, fuzzy
 msgid "Rating"
 msgstr "Escrita"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Pronto"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Lider"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 #, fuzzy
 msgid "Choose Saved Game to Load"
 msgstr "Selecione um dispositivo PKCS#11 para carregar"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 #, fuzzy
 msgid "Choose Saved Game to _Load:"
 msgstr "Selecione um dispositivo PKCS#11 para carregar"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Navegar..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 #, fuzzy
 msgid "Choose a Scenario"
 msgstr "Escolha o senário"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 #, fuzzy
 msgid "Choose a _Scenario:"
 msgstr "Escolha o senário"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Tipo"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 #, fuzzy
 msgid "Choose a _nation to play:"
 msgstr "Escolha o tipo do pacote a ser criado"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 #, fuzzy
 msgid "Select Location to Save"
 msgstr "Grava jogo para ficheiro."
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Salvar o Jogo"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "_Jogos Salvos"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Salvar _Arquivo:"
 
@@ -12266,7 +12338,7 @@ msgstr "Nome"
 msgid "Count"
 msgstr "Contagem"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12506,30 +12578,30 @@ msgstr "Listas de _Tarefas:"
 msgid "Edit Global _Worklists"
 msgstr "Editar Listas _Tarefas Global"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Turnos"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "_Tarefas Origem:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Mostrar Objectivos _Futuros"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 #, fuzzy
 msgid "Target _Worklist:"
 msgstr "Lista de _Tarefas Objectivo:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 #, fuzzy
 msgid "_Add Global Worklist"
 msgstr "_Adicionar Lista de Tarefas Global"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 #, fuzzy
 msgid "Chan_ge Production"
 msgstr "Produção de Cidade Concisa"
@@ -12832,8 +12904,8 @@ msgid "City shrinks: %d %s"
 msgstr "Retrocesso da cidade: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12940,11 +13012,11 @@ msgstr "Relatório dos Viajantes:"
 msgid "Maintenance Report"
 msgstr "Relatório de Manutenção"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "lista de tarefas"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13370,21 +13442,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr "  -t,  --theme TEMA\tUtilizar o TEMA gráfico\n"
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Utilizando a Saída de Vídeo: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Inicializando o Cliente"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 #, fuzzy
 msgid "Waiting for the beginning of the game"
 msgstr "Jogo terminou com a vitória de %s"
@@ -14700,7 +14772,7 @@ msgstr "_Estilo da Cidade:"
 msgid "Unit Selection"
 msgstr "Seleção de unidade"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "NENHUM"
 
diff --git a/po/ro.gmo b/po/ro.gmo
index 6187e7c..22b1c4d 100644
Binary files a/po/ro.gmo and b/po/ro.gmo differ
diff --git a/po/ro.po b/po/ro.po
index 55820f7..96fa8f0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: po-debconf://kdebase\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-09-05 03:37+0300\n"
 "Last-Translator: stan ioan-eugen <stan.ieugen at gmail.com>\n"
 "Language-Team: romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -50,22 +50,22 @@ msgstr "Lux"
 msgid "Science"
 msgstr "Ştiinţă"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?built:B"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?wonder:w"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?obsolete:O"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?redundant:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?built:B"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?wonder:w"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -485,81 +485,81 @@ msgstr "Mesaje de conectare/deconectare"
 msgid "AI Debug messages"
 msgstr "Mesaje de depanare de la AI"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:Criminal"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:Beligerant"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:Ostil"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:Necooperant"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:Dificil"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?attitude:Neutru"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:Respectuos"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:Săritor"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:Entuyiasmat"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:Admirativ"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:Plin de adoraţie"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:Armistiţiu"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:Război"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:ÃŽncetarea focului"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:Pace"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:Alianţă"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:Fără contact"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:Echipă"
 
@@ -605,13 +605,13 @@ msgstr "%s unităţi"
 msgid "Size %d"
 msgstr "Mărime %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Teh. Avansată %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -623,65 +623,65 @@ msgstr "Teh. Avansată %d"
 msgid "None"
 msgstr "NIci o"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Teh. Avansată"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Necunoscută)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Drum"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Irigaţie"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Calea ferată"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Mină"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Poluare"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Cocioabă"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Fortăreaţa"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Râu"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Teren arabil"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Bază aeriană"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Contaminare Radioactivă"
 
@@ -793,11 +793,11 @@ msgstr "Bomba atomică"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " ÅŸi "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?and:, "
 
@@ -957,84 +957,84 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (total %d repetare)"
 msgstr[1] " (total de %d repetări)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Argument gol pentru \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Argument lipsă pentru \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d î.e.n."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d e.n."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "Variablia FREECIV_PATH este setatată, dar este goala; folosesc valoarea "
 "predefinită."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Nu am putu citi directorul pentru date %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "Calea pentru date poate fi stabilită prin intermediul variabilei "
 "FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Calea curentă pentru date este: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Este necesar fişierul \"%s\"...se abandonează!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 "%s: Eroare fatală: încerci să rulezi jocul cu drepturi de super-utilizator!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Foloseşte în schimb un cont de utilizator fără privilegii.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "potrivire exactă"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "only match"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "ambiguu"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "gol"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "prea lung"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "nepotrivire"
 
@@ -1063,22 +1063,22 @@ msgstr "%si construiesc %s în %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s vinde %s (nenecesar) pentru %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (AI)* ÃŽn modul absent  AI-ul nu poate semna un asemenea tratat."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (AI)* Mai întâi rupe alianţa cu %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (AI)* Mai întâi să întrerupem ostilităţile, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1087,49 +1087,49 @@ msgstr ""
 "*%s (AI)* Vreau să menţii starea curentă de încetare a focului ceva mai mult "
 "timp, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 "*%s (AI)* Pur şi simplu nu am încă destulă  încredere în tine pentru a forma "
 "o alianţă, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (AI)* Nu cunosc oraÅŸul pomenit de tine."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (AI)* Îmi pare rău, nu mai este prudent să împart vederea cu tine."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (AI)* Această propunere nu a fost foarte bună pentru noi, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* Bun venit în alianţa noastră %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* Da, să stam uniţi pentru totdeauna, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* Da, să fie pace în vremea noastră!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)*de acord. Sa încetăm ostilităţile, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1138,23 +1138,23 @@ msgstr ""
 "*%s (AI)* Salutare %s! Pot să propun încetarea focului pentru a ne cunoaşte "
 "mai bine ?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* Spaţiul nu va fi niciodată al vostru. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "*%s (AI)*Am tolerat maimuţăriile tale vicioase vreme îndelungată!La război!!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (AI)* Pace ... altădată."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1163,17 +1163,17 @@ msgstr ""
 "*%s (AI)* În sfârşit te+am ajuns! Chiar credeai că vei scăpa nepedepsit "
 "pentru crimele comise?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (AI)* Duşmania ta ascună a adus acest război asupra ta!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)* Agresiunea faţă de %s a fost ultima ta greşeală!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1188,7 +1188,7 @@ msgstr[1] ""
 "*%s (AI)* Vom lansa un război total împotriva lui %s în %d runde pentru a "
 "opri lansarea navei spaţiale."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1197,7 +1197,7 @@ msgstr ""
 "*%s (AI)* Ajutorul tău va fi aşteptat în această problemă.Fie ca glorioasa "
 "noastră alianţă să dureze!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1216,7 +1216,7 @@ msgstr[1] ""
 "Vom raspunde cu forţa în %d runde şi te aşteptăm să'-ţi onorezi alianţa cu "
 "noi şi să faci la fel!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1231,13 +1231,13 @@ msgstr[1] ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
 "declare war in %d turns."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr "*%s (AI)* Dacă vrei o parte din pradă, ni te poţi alătura!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1252,12 +1252,12 @@ msgstr[1] ""
 "*%s (AI)* Ne-am săturat de %s. să distrugem această civilizaţie patetică. "
 "Vom declara război în %d runde."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr "*%s (AI)* Ca aliat de nadejde, aşteptăm ajutorul tău în acest război."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1272,7 +1272,7 @@ msgstr[1] ""
 "*%s (AI)* Vom onora alianţa şi-i vom declara război lui %s în %d runde.  "
 "Rezistă - suntem pe drum!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1287,7 +1287,7 @@ msgstr[1] ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
 "turns.  We expect you to do likewise."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1296,7 +1296,7 @@ msgstr ""
 "*%s (AI)* Încercarea ta de a cucerii spaţiul de unul singur îţi tradează "
 "adevaratele intenţii, si voi renunţa la alianţa noastră!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1304,7 +1304,7 @@ msgid ""
 msgstr ""
 "*%s (AI)* Încercarea ta de a domina spaţiul de unul singur este insultătoare."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1313,12 +1313,12 @@ msgstr ""
 "*%s (AI)* Dacă nu încetezi construcţia navei spaţiale, voi fi nevoit să iau "
 "măsuri!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr "*%s (AI)* Regret, nu mai este sigur să împart vederea cu tine."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1327,7 +1327,7 @@ msgstr ""
 "*%s (AI)* Salutări aliatul nostru de încredere. Îţi solicităm să distrugi "
 "inamicul nostru, %s."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1336,7 +1336,7 @@ msgstr ""
 "*%s (AI)* Salutări aliatule, Văd că încă nu ai declarat război inamicului "
 "nostru, %s. De ce este nevoie să-ţi amintesc promisiunile tale?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1347,7 +1347,7 @@ msgstr ""
 "ataci duşmanul nostru de moarte, %s! Nu putem accepta acest lucru; alianţa "
 "noastrâ nu mai existâ !"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1356,12 +1356,12 @@ msgstr ""
 "*%s (AI)* Salutări prietene, pot sugera aderarea la o cauză comuna şi "
 "formarea unei alianţe?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr "*%s (AI)* Salutâri vecine, putem oare sugera relaţii mai paşnice?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1370,7 +1370,7 @@ msgstr ""
 "*%s (AI)* Această vărsare de sânge este obositoare. Sunteţii de acord cu "
 "încetarea ostilităţilor?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1380,60 +1380,65 @@ msgstr ""
 "tău! Onorează alianţa noastra şi numele tău nu va fi amintit pe veci!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "Toate opţiunile"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (veteran)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Numele acesta nu este permis."
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Nu s-a găsit fişierul audio %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 "Avertizare: numele de oaspete '%s' a fost luat, redenumesc ca utilizator '%"
 "s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Oaspeţii nu au acces pe acest server."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s a fost respins: Oaspeţii nu au acces"
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1442,7 +1447,7 @@ msgstr ""
 "A fost o erare la citirea bazei de date cu utilizatori, conexiunea '%s' "
 "autentificată ca oaspete."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1450,44 +1455,44 @@ msgstr ""
 "A fost o erare la citirea bazei de date cu utilizatori şi autentificările ca "
 "oaspete nu sunt permise. Îmi pare rău"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 "%s a fost respins: Eroare la baza de date ÅŸi conexiunile ca oaspete nu sunt "
 "permise."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Introduceţi parola pentru %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Introduceţi o parolă nouă (şi memoraţi-o)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 "Ne pare rău. Acest server permite accesul numai utilizatorilor înregistraţi."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s a fost respins: Sunt permişi numai utilizatorii înregistraţi."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Imî pare rău, prea multe încercări nereuşite..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 "%s a fost respins: Prea multe verificări de parolă incorecte pentru noul "
 "utilizator."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1495,32 +1500,32 @@ msgstr ""
 "Avertizare: A apărut o eroare la salvarea bazei de date. Se continuă, dar "
 "scorul nu va fi salvat."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s a fost respins: Prea multe încercări de înregistrare eşuate"
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Parola furnizată este incorectă. Mai încercaţi odată."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Din păcate conexiunea dumneavoastră a expirat..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s a fost respins: Conexiunea a expirat aştepând parola."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 "Parola furnizată este prea scurtă, lungimea minimă este %d. Mai încearcaţi "
 "odată."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2326,16 +2331,14 @@ msgid "Cast a vote."
 msgstr "Votează."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
@@ -2346,7 +2349,7 @@ msgstr ""
 "it.  If one full turn elapses the vote may pass in any case if nobody votes "
 "against it."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2354,12 +2357,12 @@ msgstr ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 "Activează/Dezactivează opţiunea de depanare pentru AI pentru entitatea dată."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2368,23 +2371,23 @@ msgstr ""
 "activează/dezactivează afişarea mesajelor de depanare continuă pentru "
 "această entitate."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <nume-opţiune> <valoare>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Setează opţiunile server."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <jucător> [team]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Modifică, adaugă sau elimină un jucător de la o echipă."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2397,15 +2400,15 @@ msgstr ""
 "jocul ca aliaţi, cu viziune comună şi ambasade, şi se luptă împreună pentru "
 "a obţine victoria ca echipă cu scor individual."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <director>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Alege un director nou pentru reguli de joc sau un nou mod(modpack)."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2414,15 +2417,15 @@ msgstr ""
 "regulile de joc selectate."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <linie de meta informaţii>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Setează linia de informaţie a metaserver-ului."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2431,19 +2434,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <linie-meta>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Setează linia metaserver-ului."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Controlează conexiunea la metaserver."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2454,33 +2457,33 @@ msgstr ""
 "'metaconnection up' sau 'metac u' realizează legătura cu metaserver-ul."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <adresa>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Setează adresa (URL) la care metaserverul să raporteze."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <nume-jucător>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Schimbă statutul de AI (inteligenţa artificială) al jucătorului."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [nume-conexiune] <nume-jucător>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Din păcate un jucător nou nu poate fi admis."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2495,15 +2498,15 @@ msgstr ""
 "un jucător, se crează unul şi se atribuie conexiunii."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [nume-conexiune] [nume-jucător]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Urmareşte un jucător sau întregul joc."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2518,15 +2521,15 @@ msgstr ""
 "argument, atunci conexiunea ca fi ataşată unui observator global."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <nume-conexiune>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "deataşează de la un jucător"
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2535,20 +2538,20 @@ msgstr ""
 "alte conexiuni să se deataşeze de la un jucător."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <nume-jucător>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Crează un jucător AI cu acest nume."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "Comanda 'create' este doar accesibilă înainte de pornirea jocului."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2556,16 +2559,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Schimbă-ţi starea în plecat. AI-ul va juca în locul tău."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "AI-ul va conduce naţiunea ta dar va face doar schimbări minore."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2573,11 +2576,11 @@ msgstr ""
 "novice\n"
 "novice <nume-jucător>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Setează unul sau toţi jucătorii AI la nivelul 'novice'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2588,7 +2591,7 @@ msgstr ""
 "Cu argument, setează doar nivelul de dificultate al jucătorului respectiv."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2596,11 +2599,11 @@ msgstr ""
 "easy\n"
 "easy <nume-jucător>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Setează unul sau toţi jucătorii AI la nivelul 'uşor'."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2611,7 +2614,7 @@ msgstr ""
 "argument, setează doar nivelul de dificultate al jucătorului respectiv."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2619,11 +2622,11 @@ msgstr ""
 "normal\n"
 "normal <nume-jucător>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Setează unul sau toţi jucătorii AI la nivelul 'normal'."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2634,7 +2637,7 @@ msgstr ""
 "Cu argument, setează doar nivelul de dificultate al jucătorului respectiv."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2642,11 +2645,11 @@ msgstr ""
 "hard\n"
 "hard <nume-jucător>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Setează unul sau toţi jucătorii AI la nivelul 'greu'."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2657,7 +2660,7 @@ msgstr ""
 "argument, setează doar nivelul de dificultate al jucătorului respectiv."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2665,11 +2668,11 @@ msgstr ""
 "experimental\n"
 "experimental <nume-jucător>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Setează unul sau toţi jucătorii AI la nivelul 'experimental'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2683,7 +2686,7 @@ msgstr ""
 "ului! Pentru servere normale, această opţiune nu are nici un efect."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2697,11 +2700,11 @@ msgstr ""
 "cmdlevel <nivel> first\n"
 "cmdlevel <nivel> <numele conexiunii>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Află sau setează acesul la nivelul accesului la comandă."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2745,20 +2748,20 @@ msgstr ""
 "untrusted person could reconnect with the same name.  Note that this command "
 "now takes connection names, not player names."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "Dacă nu există,devii organizatorul jocului cu permisiuni sporite."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <rundă> <turninc> <value> <valuemult>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Vezi \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2770,24 +2773,24 @@ msgstr ""
 "0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Termină jocul imediat cu o remiză."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "surrender"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Abandonează jocul."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2797,15 +2800,15 @@ msgstr ""
 "atunci jocul se termină."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <nume-jucător>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Îndepărtează complet jucătorul din joc."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2814,7 +2817,7 @@ msgstr ""
 "oraşele şi unităţile sale. Folosiţi cu prudentă!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2822,11 +2825,11 @@ msgstr ""
 "save\n"
 "save <nume-fiÅŸier>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Salvează jocul într-un fişier."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2844,7 +2847,7 @@ msgstr ""
 "şi foloseşte comanda 'start' după ce s-au conectat toţi jucătorii."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2852,11 +2855,11 @@ msgstr ""
 "load\n"
 "load <nume-fiÅŸier>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Încarcă jocul dintr-un fişier."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2865,30 +2868,30 @@ msgstr ""
 "inclusiv jucătorii regulile de joc şi opţinile serverului vor fi pierdute.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <nume-fiÅŸier>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Execută comenzile server din fişier."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <nume-fiÅŸier>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Salvează setările curente în fişier."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr ""
 "Schimbă modul de afişare a informaţiilor de ieşire ale serverului intre "
 "stilul RFC ÅŸi stilul normal."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "ÃŽntoarce pur ÅŸi simplu indicativul server-ului."
 
@@ -3411,30 +3414,39 @@ msgstr "Aţi cauzat un incident în timp ce incitaţi la revoltă în %s."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s au cauzat un incident în timp ce incita o revoltă în %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "Unităţi de început care se pot deplasa pe mare nu sunt încă suportate. "
 "Nimeni nu primeÅŸte %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Anul: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Timpul maxim de gândire pentru rundă a depăşit valoarea maximă, se fixează "
 "la valoarea maximă."
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr ""
 "Timpul de gândire pentru rundă este mai mic decât zero, se fixează la zero."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Doar clientul GGZ trebuie să apeleze civclient în modul ggz!\n"
 
@@ -3477,27 +3489,27 @@ msgstr "Nu există o conexiune cu numele %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Nu există jucător sau conexiune cu numele %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "S-a produs încălzirea globală!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 "Ţărmurile au fost inundate şi mari porţiuni de câmpie au devenit deşert."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "S-a produs iarna nucleară!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "Zonele inundate s-au uscat şi mari regiuni de câmpie au devenit tundră."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3508,7 +3520,7 @@ msgstr ""
 "      Muncitorii se adună în mod spontan şi modernizează toate oraşele "
 "construind căi ferate."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3519,12 +3531,12 @@ msgstr ""
 "      Muncitorii se adună în mod spontan şi modernizează toate oraşele "
 "construind căi ferate."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "%sul dumneavoastră a fost mutat datorită schimbării terenului."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "%s a fost dizolvat datorită modificării terenului."
@@ -3587,27 +3599,27 @@ msgstr "Revoluţie: se revine la anarhie."
 msgid "You should choose a new government from the government menu."
 msgstr "Ar trebui să alegeţi o nouă formă de guvernare din meniul Guvernare."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Rata de impozit depăşeşte rata maximă sub %s; ajustez."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Rata de ştiinţă depăşeşte rata maximă sub %s; ajustez."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Rata de lux depăşeşte rata maximă sub %s; ajustez."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s nu vă mai oferă vedere comună."
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3616,13 +3628,13 @@ msgstr ""
 "Senatul nu vă permite să rupeţi alianţa cu %s. Va trebui să dizolvaţi "
 "senatul sau să aşteptaţi un moment mai oportun."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "Senatul vă aprobă petiţia datorită provocărilor neîncetate ale %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3631,12 +3643,12 @@ msgstr ""
 "Senatul refuză să rupă tratatul cu %s, dar nu aveţi probleme în a gasii un "
 "alt senat."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Starea diplomatică intre %s şi %s este acum %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3644,14 +3656,14 @@ msgid ""
 msgstr ""
 "%s a anulat înţelegerea! Starea diplomatică între %s şi %s este acum %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 "%s l-a atacat pe aliatul dumneavoastră %s! Aţi anulat alianţa  cu agresorul."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3660,26 +3672,26 @@ msgstr ""
 "Co-echipierul dumneavoastră %s i-a declarat război lui %s. Sunteţi obligat "
 "să anulaţi alianţa cu %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Se îndepărtează jucătorul %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Aţi fost îndepărtat din joc!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s a fost îndepărtat din joc."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Aţi făcut contact cu %si conduşi de %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3687,17 +3699,17 @@ msgstr ""
 "%s şi %s s-au întâlnit şi au pornit imediat război. Aţi anulat alianţa cu "
 "amândoi."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Nu aţi putut să aruncaţi %s în război civil - prea mulţi jucători"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Nu aţi putut să aruncaţi %s în război civil - prea mulţi jucători"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3706,12 +3718,12 @@ msgstr ""
 "Naţiunea dumneavoastră a fost aruncată într-un război civil, %s a fost "
 "declarat liderul statelor rebele."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s declară alianţă lui %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3949,21 +3961,21 @@ msgstr "-lea"
 msgid "th"
 msgstr "-lea"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Şirul de caractere demografic conţine caractere nepermise. Încercaţi \"help "
 "demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Raport demografic:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Raportul demografic nu este disponibil."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%s al %slor (%s)"
@@ -3974,11 +3986,11 @@ msgstr "%s al %slor (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Nu se poate gasi un fiÅŸier de reguli \"%s.%s\" care poate fi citit."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Se încarcă setul de reguli"
 
@@ -3994,7 +4006,7 @@ msgstr ""
 "salvări mai vechi, sau poate indica un fişier salvat invalid. Continuaţi pe "
 "propria dumneavoastră raspundere."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr ""
@@ -4020,13 +4032,13 @@ msgstr ""
 "mai sunt suportate. Se foloseÅŸte '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4063,7 +4075,7 @@ msgstr "Interne"
 msgid "Networking"
 msgstr "Reţelistic"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Tot"
@@ -4084,7 +4096,7 @@ msgstr "Rar"
 msgid "Changed"
 msgstr "A fost modificat"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4092,7 +4104,7 @@ msgstr ""
 "Şirul de caractere conţine caractere\n"
 "nepermise.  Încercaţi \"help allowtake\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4100,7 +4112,7 @@ msgstr ""
 "Şirul de caractere cu unităţi de început conţine\n"
 "caractere nepermise. Încercaţi \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4110,15 +4122,15 @@ msgstr ""
 "conţine nici măcar un fondator de oraş.\n"
 "Încercaţi \"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "Nu se poate schimba maxplayers în modul GGZ."
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -4127,11 +4139,16 @@ msgstr ""
 "Numărul de jucători este mai mare decât valoarea solicitatăşâ; Se păstrează "
 "valoarea precedentă."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Nu puteţi modifica valoarea aceastei opţiuni."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Mărimea hărţii (în milioane de forme)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4141,12 +4158,12 @@ msgstr ""
 "  mărime = 4 este o hartă normală de 4000 de forme (implicit)\n"
 "  mărime = 20 este o hartă uriaşa de 20000 de forme"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Indicele de topologie a hărţii"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4215,11 +4232,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Metoda folosită pentru generarea hărţii"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4242,11 +4259,11 @@ msgstr ""
 "început.  Dacă se foloseşte valoarea implicită startpos atunci se va folosi "
 "setarea startpos aleasă pe baza generatorului. Vezi setarea \"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Metoda folosită pentru alegerea poziţiilor de început"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4268,38 +4285,38 @@ msgstr ""
 "Notă: generatoarele încearcă să creeze numărul potrivit de continente pe "
 "baza numărului de jucători şi a poziţiei de start."
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Prezenţa insulelor de marimea 1x1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = fără insule 1x1; 1 = câteva insule 1x1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Polii sunt continente separate"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = continentele pot avea legătură cu poli; 1 = poli vor fi de obicei "
 "separaţi"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Toată harta este în zona de climă tempereată"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr ""
 "0 = planetă normală, asemănătoare Pământului; 1 = toată planetă temperată"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Temperatura medie a planetei"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4332,21 +4349,21 @@ msgstr ""
 "\n"
 "0 înseamnă o planetă foarte rece cu zone polare foarte mari şi fără tropice"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Procentul din hartă ocupat de insule"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr "Această setare dă procentul din hartă care va fi pământ."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Cantitatea de dealuri/munţi"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4354,11 +4371,11 @@ msgstr ""
 "Valori mici generează hărţi plane, în timp ce valori mai mari generează o "
 "hartă mai abruptă cu mai multe dealuri, mai mulţi munţi."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Cantitate de apă pe pământ"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4366,11 +4383,11 @@ msgstr ""
 "Valori mici înseamnă mai multe zone uscate, deşertice; valori mai ridicate "
 "generează o hartă cu mai multe zone mlăştinoase, jungle şi râunri."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Sămânţa aleatoare pentru generarea hărţii."
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4380,11 +4397,11 @@ msgstr ""
 "implicită) se va alege o sămânţă pe baza ceasului sistemului şi se va genera "
 "o hartă. Această setare este folosită doar la depanarea jocului."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Rădăcină aleatoare pentru generarea jocului"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4392,11 +4409,11 @@ msgstr ""
 "Pentru valoarea zero (implicită) sămânţa va fi aleasă pe baza ceasului "
 "sistemului. Această setare este de folos doar când se depanează jocul"
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Cantitatea de pătrăţele de resurse \"special\""
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4404,11 +4421,11 @@ msgstr ""
 "Resursele speciale îmbunătăţesc terenul pe care se găsesc. Scara de variaţie "
 "a serverului este de părţi la mie."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Cantitatea de colibe (triburi minore)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4416,22 +4433,23 @@ msgstr ""
 "Această setare dă numărul exact de colibe ce vor fi amplasate pe întreaga "
 "hartă. Colibele sunt sate mici de triburi care pot fi vizitate de unităţi."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Număr minim de jucători"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Numărul minim de jucători (conectaţi sau AI) pentru a putea porni jocul."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Număr maxim de jucători"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4441,12 +4459,12 @@ msgstr ""
 "număr este atins, jucători noi care încearcă să se conecteze, v-or fi "
 "refuzaţi."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr ""
 "Numărul total de jucători (inclusiv jucători cu inteligenţă artificială AI)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4454,11 +4472,11 @@ msgstr ""
 "Dacă este o valoare pozitivă, jucători noi AI vor fi creaţi până la "
 "atingerea acestui număr total de jucători."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "O listă cu unităţile iniţiale ale jucătorului"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4486,28 +4504,28 @@ msgstr ""
 "    a   = unitate rapidă de atac (ex. călăreţii)\n"
 "    A   = unitate puternică de atac (ex. catapultă)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Aria unde unităţile iniţiale sunt locate"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "Aceasta este raza de împrăştiere a unităţilor iniţiale."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Număr iniţial de galbeni pentru fiecare jucător"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 "Numărul de galbeni de care beneficiază fiecare jucător la începutul jocului."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "NUmărul iniţial de tehnologii pentru fiecare jucător"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4519,11 +4537,11 @@ msgstr ""
 "funcţie de valoarea din setul de reguli a tech_cost_style, o valoare mare "
 "pentru techlevel poate face următoarele tehnologii foarte costisitoare."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Procentul de multiplicare a costurilor tehnologiilo"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4534,11 +4552,11 @@ msgstr ""
 "procent). Costurile de bază a tehnologiei sunt determinate prin setul de "
 "reguli sau alte setări ale jocului."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Procentul de penalizare aplicat când se schimbă tehnologia "
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4548,11 +4566,11 @@ msgstr ""
 "veţi pierde acest procent din acele puncte de cercetare. Acest lucru nu se "
 "aplică dacă aţi câştigat o tehnologie în această rundă."
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Penalizare pentru obţinerea de tehologii sau galbeni printr-un tratat"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4566,11 +4584,11 @@ msgstr ""
 "această valoare este diferită de zero. Acest procent se aplică şi "
 "transferului de galbeni prin tratate diplomatice."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Penalizare pentru obţinerea unei tehnologii prin cucerire"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4581,11 +4599,11 @@ msgstr ""
 "cercetare a noii tehnologii. Puteţi să ajungeţi cu puncte de cercetare "
 "negative dacă această valoare este diferită de zero."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Penalizare pentru obţinerea unei tehnologii gratuit"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4599,11 +4617,11 @@ msgstr ""
 "cercetării unei noi tehnologii. Puteţi să ajungeţi cu puncte negative de "
 "cercetare dacă această valoare este diferită de zero."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Provizii necesare pentru creÅŸterea unui oraÅŸ"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4613,12 +4631,12 @@ msgstr ""
 "Această valoare este multiplicată cu un alt factor ce provine din setul de "
 "reguli şi este dependentă de mărimea oraşului."
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "Procentul de hrană ce se pierde când este necesar un apeduct"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4628,11 +4646,11 @@ msgstr ""
 "apeduct (sau un sistem de canalizare), pierde acest procentaj din hrană (sau "
 "jumătate din această valoare dacă există un grânar)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Procentul de multiplicare pentru costurile de producţie"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4640,12 +4658,12 @@ msgstr ""
 "Acesta afectează cât de repede pot fi produse unităţi sau clădiri. Costurile "
 "de bază sunt multiplicate cu această valoare (ca procent)."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr ""
 "Mărimea minimă a oraşului pentru care se obţine rata întreagă a comerţului"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4657,11 +4675,11 @@ msgstr ""
 "până la notradesize, şi descreşte gradat până la 0% (fără penalizare, în "
 "afară de corupţie) pentru mărime=fulltradesize. Vezi şi notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Mărimea maximă a unui oraş fără comerţ"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4671,11 +4689,11 @@ msgstr ""
 "creÅŸte gradat pentru oraÅŸe mai mari ca notradesize ÅŸi mai mici ca "
 "fulltradesize. Vezi de asemenea ÅŸi fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Mărimea oraşului înainte ca locuitori să devină nemulţumiţi"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4684,11 +4702,11 @@ msgstr ""
 "unhappysize cetăţeni dintr-un oraş vor fi mulţumiţi, iar următorii cetăţeni "
 "nefericiţî. Vedeţi şi cytifactor"
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Numărul de oraşe pentru care se crează nefericire suplimentară"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4701,11 +4719,11 @@ msgstr ""
 "este Democraţia; pentru alte forme de guvernare efectele apar la un număr de "
 "oraÅŸe mai mic."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Distanţa minimă dintre oraşe"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4719,11 +4737,11 @@ msgstr ""
 "direcţie. dacă este setat la 0 (valoarea implicită) se va folosi valoarea "
 "din setul de reguli."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "NUmărul de runde dintre efectele de sărbătorire"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4732,11 +4750,11 @@ msgstr ""
 "Dacă valoarea este stabilită la n, un oraş va creşte după ce sărbătoreşte "
 "timp de n+1 runde. "
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Şansa de prăbuşire a clădirilor din oraşele cucerite"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4744,11 +4762,11 @@ msgstr ""
 "Dacă un jucător cucereşte un oraş, fiecare îmbunătăţire a oraşului are "
 "această probabilitate de a fi distrusă."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Şansa de a se deplasa într-o formă după un atac"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4763,11 +4781,11 @@ msgstr ""
 "între 0 şi 100, aceasta va fi folosită ca procentul din şansa de a \"ocupa\" "
 "teritoriul."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Porniţi/opriţi atacul automat al unităţilor pe partea de server"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4775,11 +4793,11 @@ msgstr ""
 "Dacă această opţiune este activată, unităţile ce se pot mişca vor ataca "
 "automat nităţile care se deplasează într-o poziţie adiacentă."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Reduce populaţia oraşului după atac"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4796,11 +4814,11 @@ msgstr ""
 "  4 = elicopter\n"
 "  8 = aer"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Raza graniţelor naţionale"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4812,11 +4830,11 @@ msgstr ""
 "mare sau în cazul existenţei unor oraşe ce aparţin unor naţiuni diferite, se "
 "vor aplica reguli speciale."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Unităţile care se află între graniţele ţării nu produc nefericire"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4824,11 +4842,11 @@ msgstr ""
 "Dacă este setată această opţiune, unităţile nu vor provoca nefericire atunci "
 "când sunt în interiorul graniţelor naţionale."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Posibilitatea de a avea relaţii diplomatice cu ceilalţi jucători"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4842,11 +4860,11 @@ msgstr ""
 "3 = relaţiile diplomatice sunt permise restricţionate la echipe .\n"
 "4 = nu sunt permise relaţii diplomatice."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Nume de oraÅŸe permise"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4874,11 +4892,11 @@ msgstr ""
 "decât dacă se gaseşte şi printre denumirile implicite de oraşe ale naţiunii "
 "sale."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Frecvenţa apariţiei barbarilor"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4892,19 +4910,19 @@ msgstr ""
 "3 = răzvrătiri frecvente ale barbarilor\n"
 "4 = hoarde dezlănţuite, foarte mulţi barbari"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Anul de început al atacului barbarilor"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbari nu vor apărea inainte de acest an."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Lungimea în runde a revoluţiei"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4913,11 +4931,11 @@ msgstr ""
 "schimbări de guvern. Stabilind această valoare la 0 va determina alegerea "
 "unei perioade aleatoare cu durata între 1-6 runde."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Dacă se activează ceaţa de război"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4927,11 +4945,11 @@ msgstr ""
 "se află în câmpul vizual ale propriilor unităţi sau oraşe. Nu veţi putea "
 "observa schimbările ce se produc în zonele pe care nu le puteţi vedea."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Şansa iniţială de reuşită a diplomaţilor şi spionilor."
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4940,21 +4958,21 @@ msgstr ""
 "Şansa ca un spion să se întoarcă dintr-o misiune reuşită şi şansa intiţială "
 "de succes pentru diplomaţi şi spioni."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Dacă este permisă cursa spaţială"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr ""
 "Dacă această opţiune are valoarea 1, jucătorii vor putea construii nave "
 "spaţiale."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Numărul minim de oraşe pentru un război civil"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4964,11 +4982,11 @@ msgstr ""
 "capitala sa este cucerită. Dacă această valoare este cea maximă, războaiele "
 "civile vor fi dezactivate."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Runde până când se pierde contactul diplomatic dintre jucători."
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4979,12 +4997,12 @@ msgstr ""
 "Dacă această valoare este zero atunci jucătorii nu se pot întâlni decât dacă "
 "au ambasadă. "
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Reconstruieşte palatul după pierderea capitalei"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4996,11 +5014,11 @@ msgstr ""
 "cucerit. Acest lucru este important deoarece tehnologiile necesare pentru "
 "construcţia palatului vor fi ignorate."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Dacă se va folosi nume naturale pentru oraşe"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -5008,11 +5026,11 @@ msgstr ""
 "Dacă este activată, numele implicite ale oraşelor vor fi determinate pe baza "
 "terenului înconjurător."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Jucători pe care utilizatorii îi pot controla"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -5080,12 +5098,12 @@ msgstr ""
 "4 = Nu este permis controlul,doar observarea;\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr ""
 "Dacă se permite trecerea în/din modul AI la schimbarea stării conexiunii"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5093,24 +5111,27 @@ msgstr ""
 "Dacă această opţiune are valoarea 1, se trece în modul AI când un jucător se "
 "deconectează şi se revine la modul normal când acesta se conectează."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Anul în care se termină jocul"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Jocul se va termina la sfârşitul anului dat."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Număr maxim de secunde pe rundă"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Dacă jucătorii au apăsat \"Termină runda\" înainte ca timpul să expire, "
 "atunci runda se încheie automat. Valoarea zero înseamnă ca timpul nu expiră. "
@@ -5118,11 +5139,11 @@ msgstr ""
 "temporizator trece jocul în modul de testare auto. Folosiţi acet mod cu "
 "comanda \"timeoutincrease\" pentru a avea un temporizator dinamic."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "Pauză de cel puţin n secunde atunci când inamicul s-a mişcat"
 
-#: server/settings.c:896
+#: server/settings.c:889
 #, fuzzy
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
@@ -5131,11 +5152,11 @@ msgstr ""
 "Atunci când o unitate se mişcă în câmpul vizual al unui jucător inamic,"
 "timpul de pauză este stabilit la această valoare dacă era mai mic."
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Dacă sunt permisa fazele de joc simultane ale jucătorilor."
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5143,12 +5164,12 @@ msgstr ""
 "Dacă este selectată, toate fazele de mişcare ale jucătorilor vor fi "
 "simultane; dacă nu este selectată, jucătorii vor mişca alternativ."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr ""
 "Numărul de secunde permise unui client să blocheze conexiunea de reţea. "
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5159,11 +5180,11 @@ msgstr ""
 "perioada de timp după care expiră este infinită (deşi conexiunile vor fi "
 "închise automat într-un final)."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Numărul maxim de secunde pentru golirea zonei tampon a reţelei"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5173,11 +5194,11 @@ msgstr ""
 "toate zonele  tampon ale conexiunilor de reţea ale clienţilor să se "
 "deblocheze. Valoarea zero înseamnă că serverul nu va aştepta deloc."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Secunde intre PINGuri"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -5185,22 +5206,22 @@ msgstr ""
 "Programul civserver va trimite periodic cereri PING clienţilor, cu perioada "
 "egală cu această valoare."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Timpul de deconectare al clientului"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Dacă un client nu răspunde la o ceerere PING în acest timp el va fi "
 "deconectat."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Modul de joc cu blocarea rundei"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5209,11 +5230,11 @@ msgstr ""
 "decât după ce toţi jucătorii (inclusiv cei deconectaţi) au terminat de jucat "
 "runda."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "MOdul de joc cu runde de lungime fixă"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -5223,11 +5244,11 @@ msgstr ""
 "decât după ce timpul afectat rundei s-a terminat, chiar dacă toţî jucătorii "
 "au apăsat \"Termină runda\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Ce apare în raportul demografic"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5267,11 +5288,11 @@ msgstr ""
 "    b = afişează coloana \"cea mai bună naţiune\"\n"
 "Ordinea caracterelor nu este importantă, dar mărimea lor este."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Numărul de runde salvează automat"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5279,11 +5300,11 @@ msgstr ""
 "Jocul va fi salvat automat la fiecare trecere a acestui număr de runde. "
 "Valoarea zero înseamnă că nu se va face salvare automată."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Nivelul de compresie al fiÅŸierului salvare"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5294,11 +5315,11 @@ msgstr ""
 "compresia durează mai mult timp. Dacă valoarea maximă este zero, acest "
 "server nu a fost compilat să includă zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Prefixul salvărilor efectuate automat"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5306,11 +5327,11 @@ msgstr ""
 "Salvările efectuate automat vor avea numele de forma \"<prefix><an>.sav\". "
 "Această opţiune stabileşte partea <prefix>"
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Dacă se înregistrează statistici despre jucători"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5324,7 +5345,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Serverul nu poate citi intrarea standard. Se ignoră intrarea."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Server: adresă invalidă: [%s:%d]."
@@ -5466,105 +5487,105 @@ msgstr "Salvarea jocului ca %s a eÅŸuat"
 msgid "Game saved as %s"
 msgstr "Jocul salvat ca %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Jocul rulează deja."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%s a pierdut nivelul de control al comenzii la începutul jocului. Folosiţi "
 "sistemul de votare de acum încolo."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Pornesc jocul."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "cerere pentru raport necunoscut (tip %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Avertisment: refuz o versiune veche de client %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr ""
 "Am obţinut un pachet de date tip %d de la un jucător decedat sau observator"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Alegeţi un nume diferit de spaţiu."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Naţiunea este deja aleasă de către cineva."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "Un alt jucător are deja numele '%s'.  Alegeţi un alt nume."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Alegeţi un nume care să conţină doar caractere ASCII."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "Naţiunea %s nu este disponibilă în acest scenariu."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "Naţiunea %s este deja aleasă."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s este conducătorul %s %s"
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Se aşteptă începutul jocului: %d din %d jucători sunt gata să înceapă."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s a fost adăugat ca jucător AI de nivelul %s."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Jucătorul %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s îi conduce pe %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Se trimite informaţia la metaserver [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Jocul sa terminat ..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Se acceptă jucători ..."
 
@@ -5589,7 +5610,7 @@ msgstr "(ambiguu)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5763,7 +5784,7 @@ msgstr "Jucătorii nu pot fi îndepărtaţi odată ce jocul a început."
 msgid "Removed player %s from the game."
 msgstr "Jucătorul %s a fost îndepărtat din joc."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Numele \"%s\" nu este permis din motive de siguranţă."
@@ -5844,204 +5865,204 @@ msgstr ""
 "Nu se poate mări nivelul de acces la comandă la'%s'; şi dumneavoastră aveţi "
 "doar '%s'."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr ""
 "Nivelul de acces la comandă afost stabilit la '%s' pentru noile conexiuni %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 "Nivelul de acces la comandă nu a putut fi stabilit la '%s' pentru conexiunea "
 "%s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr ""
 "NIvelul de acces la comandă a fost stabilit la '%s' pentru noii jucători."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "Primul jucător va primi nivelul de acces la comandă '%s'."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "Comanda 'first' nu are sens de la linia de comandă a serverului."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Aveţi deja nivelul de acces la comandă '%s' sau unul mai bun."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Este deja altcineva organizatorul jocului."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "Conexiunea %s a optat să devină organizatorul jocului."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Argument invalid %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Mod de folosire: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Timpul de expirare dinamică a fost stabilit la %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Opţiunea:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Descriere:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Stare: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "modificabil"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fix"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Valoare: %d, Minim: 0, Implicit: %d, Maxim: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Valoare: %d, Minim: %d, Implicit: %d, Maxim: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Valoare: \"%s\", Implicit: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Există explicaţii pentru următoarele opţiuni ale serverului:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Nu există încă explicaţie pentru aceasta."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Numele opţiunii este ambiguu."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Operatorul serverului: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Jucătorul '%s' are acum nivelul de îndemânare AI '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s nu este controlat de AI."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Nivelul de îndemânare implicit al AI-ului a fost stabilit la '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Această comandă este valabilă doar pentru client."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Mod de folosire: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Doar jucătorii pot folosi comanda 'away'."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s a intrat în modul plecat."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s s-a întors la joc."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Nu aveţi acces la opţiunea de vizualizare '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Optiune necunoscută '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Toate opţiunile cu valori neimplicite"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Toate opţiunile"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Opţiuni vitale"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Stabileşte opţiunile locale"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Opţiuni folosite rar"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ înseamnă că puteţi schimba opţiunea"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= înseamnă că optiunea are valoarea ei implicită"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s valoare (min,max)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Opţiune"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "deschriere"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -6050,37 +6071,37 @@ msgstr ""
 "opţiuni.\n"
 "Încercaţi 'show changed' pentru a vedea setările cu valori neimplicite."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Echipele nu se mai pot schimba după începerea jocului."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Argument nedefinit.  Mod de folosire: team <player> <team>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr "Nu există echipa %s.  Introduceţi un nume sau număr de echipă valid."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Nu puteţi forma echipă cu un jucător barbar."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Jucătorul %s a fost adăugat la echipa %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Argumente nedefinite: Mod de folosire: vote yes|no [vote number]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Observatorii nu pot vota."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -6088,39 +6109,39 @@ msgstr ""
 "Puteţi vota doar într-un joc care rulează. Folosiţi comanda 'first' pentru a "
 "deveni organizatorul jocului dacă nu există deja unul."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Votaţi %d \"%s\": %d voturi pentru, %d voturi împotriva"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Nu se votează nimic momentan."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Nici un ultim vot legal."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Valoarea trebuie să fie un număr întreg."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Nu există un asemenea vot (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "AÅ£i votat pentru \"%s\""
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Aţi votat împotriva \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6128,426 +6149,453 @@ msgstr ""
 "Argumente nedefinite. Mod de folosire: debug <diplomacy <player> | city <x> "
 "<y> | units <x> <y> | unit <id> | tech <player> | timing | info>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Comanda poate fi folosită după începerea jocului."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "Nu se mai depanează diplomaţia lui %s"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "Se depanează diplomaţia lui %s."
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "Nu se mai depanează tehnologia %s"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "Se depanează tehnologia %s"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Valoarile 2 şi 3 trebuie să fie numere întregi."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Coordonate de hartă greşite."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Nu există oraş la aceste coordonate."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "Nu se mai depanează %s"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "Nu se mai depanează a lui %s %s."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "Se depanează a lui %s %s"
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Valoarea 2 trebuie să fie un număr întreg."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Unitatea %d nu există."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Argument nedefinit. Mod de folosire: set <option> <value>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Nu puteţi modifica valoarea aceastei opţiuni."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Această opţiune nu poate fi modificată după pornirea jocului."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Valoarea trebuie să fie un întreg."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Valoare în afara limitelor (minim: 0, maxim: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Opţiunea: %s a fost setată la %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Valoare în afara limitelor (minim: %d, maxim: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr ""
 "Lungimea ÅŸirului este prea mare. Mod de folosire: set <option> <value>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Opţiunea: %s a fost setată la \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Nu se poate observa global jocul acesta."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 "Nu poţi lua controlul asupra unui observator global. Observă-l în schimb."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Nu se poate lua controlul asupra jucătorilor umani în acest joc."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Nu se poat observa barbari în jocul acesta."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Nu se poate alege naţiunea barbară în jocul acesta."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Nu pot fi urmăriţi jucătorii decedaţi în acest joc."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Nu se poate lua controlul asupra jucătorilor decedeţi în acest joc."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Nu se pot observa jucători AI în acest joc."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Nu se pot preua jucătorii AI în acest joc."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Nu se pot observa jucătorii umani în acest joc."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "Nu se poate lua controlul asupra jucătorilor umani în acest joc."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Nu se poate observa în acest joc."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Nu se pot prelua jucătorii în acest joc."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "Nu se pot prelua jucătorii conectaţi la acest joc."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Mod de folosire: observe [nume-conexiune [nume-jucător]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Mod de folosire: observe [nume-jucător]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s deja controlează %s. Folosind comanda 'observe' se va îndepărta %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s observă deja %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s observă deja."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s observă acum %s."
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s observă acum"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Mod de folosire: take <nume-conexiune> <nume-jucător>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Mod de folosire : take <nume-jucător>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Mod de folosire: take [nume-conexiune] <nume-jucător>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s controlează deja %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Nu există jucător sau conexiune cu numele %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "se deataşează de la %s"
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s controlează acum %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbar"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "AI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Om"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Activ"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Decedat"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s nu este ataşat nici unui jucător."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Mod de folosire: detach <nume-conexiune>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Nu poţi deataşa alţi utilizatori."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s nu este ataşat nici unui jucător."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s se detaşează de %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s nu mai observă."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "se deataşează de la %s"
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Mod de folosire: load <nume joc>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "Nu pot încărca un joc cât timp rulează deja altul."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "Nu s-a găsit nici o salvare sau scenariu cu numele \"%s\"."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "Nu am putut încărca salvarea: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Cirectorul curent pentru setul de reguli este \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Directorul \"%s\" pentru setul de reguli nu a fost găsit"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Directorul pentru setul de reguli este deja \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "directorul pentru setul de reguli a fost stabilit la  \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "La revedere."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Nu puteţi folosi comenzile pentru server."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Atenţie: '%s' înterpretat ca '%s', dar este ambigu.  Încercaţi '%shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Comandă necunoscută.  Încearcaţi '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Noul vot l-a anulat pe cel precedent."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Vot nou (numărul %d) de către %s: %s"
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Nu aveţi dreptul să folosiţi această comandă."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(prompter server)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Jocul s-a terminat cu o remiză."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Se încheie jocul. Serverul se va reporni imediat ce toţi clienţii s-au "
 "deconectat."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Nu se poate încheia jocul: nu rulează nici un joc."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s a acceptat înfrângerea şi nu mai poate câştiga."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Nu vă puteţi preda acum."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Prea puţini jucători; jocul nu va porni."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Prea puţini jucători; jocul nu va porni."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Prea puţini jucători; jocul nu va porni."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Toţi jucătorii sunt gata; înceape jocul."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr "Nu se poate porni jocul: se aşteaptă deconectarea tuturor clienţilor."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Nu se pate porni jocul deoarece a fost deja pornit."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "ÃŽnchid conexiunea %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6584,123 +6632,123 @@ msgstr ""
 "  save   - salvează jocul\n"
 "  quit   - opreÅŸte serverul."
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Comandă:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Rezumat: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Nivel: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Serverul cunoaşte următoarele comenzi:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Argumentul '%s' al comenzi 'help' este ambiguu."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Nici o potrivire pentru argumentul comenzii help: '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Argument de listă greşit: '%s'. Încercaţi '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Lista jucătorilor:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<nici un jucător>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "jucător %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Decedat"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", nivel %s de dificultate"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", pregătit"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", nepregătit"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d conexiune:"
 msgstr[1] " %d conexiuni:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s de la %s (nivelul de acces la comandă %s), bufsize=%dko"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (mod de observator)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Lista echipelor:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : '%s' : %d jucător"
 msgstr[1] "%2d : '%s' : %d jucători"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : jucătorul 1: %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Echipă goală: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Lista conexiunilor la server:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<nici o conexiune>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Listă cu scenariile de joc disponibile:"
 
@@ -6773,17 +6821,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Scopul cercetărilor este %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "AÅ£i furat %s de la %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%si au furat %s de la dvs.!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%si au furat %s de la %s."
@@ -7321,20 +7369,20 @@ msgstr "ÃŽncercarea de a construi o minune pentru %s a eÅŸuat."
 msgid "Your %s has invalid orders."
 msgstr "%s dvs a primit ordine invalide."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Suprafaţă mare - posibil să dureze câteva secunde."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "întoarcere la generator %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Generatorul 3 nu a amplasat toate insulele mari."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Generatorul 3 a lăsat suprafaţa%li neamplasată."
@@ -7426,120 +7474,121 @@ msgstr "Este posibil să fie o eroare de configurare sau permisiuni greşite"
 msgid "Cannot find audio file %s"
 msgstr "Nu s-a găsit fişierul audio %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX runde"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d galbeni pe rundă"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d rundă"
 msgstr[1] "%3d runde"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "niciodată"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/rundă"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d rundă"
 msgstr[1] "%s (%d) %d runde"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Învechită"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Construită"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Mare Minune"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Minune Mică"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/rundă"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Cetăţeni\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Taxe din comerţ\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : Rută comercială cu %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : Impozit pe clădire\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : Bonus de la %s (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : DeÅŸeuri\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Dezordine\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Folosiţi\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : Se adaugă până la \n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Surplus total"
@@ -7660,8 +7709,8 @@ msgid "Best defending units"
 msgstr "Cele mai bune unităţi de apărare"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7849,8 +7898,8 @@ msgstr "?pollution [short]:Pol"
 msgid "?cma:Governor"
 msgstr "?cma:Guvernator"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -8121,19 +8170,19 @@ msgstr ""
 "Conectarea automată la serverul \"%s\" la portul %d ca \"%s\" la fiecare %f "
 "secunde pentru %d încercări"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "novice"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "uÅŸor"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "greu"
 
@@ -8141,31 +8190,31 @@ msgstr "greu"
 msgid "experimental"
 msgstr "experimental"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Se porneÅŸte serverul..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Nu s-a putut porni serverul."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Va trebui să porniţi unul manual."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Nu s-a putut face conexiunea la server."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Se poate să nu fie posibilă pornirea din această locaţie."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Am preluat controlul serverului (cu nivelul hack de acces la comandă)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 "Nu se poate prelua controlul asupra serverului, se încearcă oprirea sa."
@@ -8270,27 +8319,27 @@ msgstr ""
 "Necesită o mărime minimă de %d.\n"
 "\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Permite %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Permite %s (cu %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Râuri"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Nici o referinţă pentru %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8301,7 +8350,7 @@ msgstr ""
 "Această pagină a fost generată automat.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
@@ -8310,81 +8359,81 @@ msgstr ""
 "Este necesară clădirea %s.\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Descoperirea %s va învechi %s.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 "* Permite jucătorilor care au cunoştinţă de %s să construiască unităţile %"
 "s.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Permite %s (cu %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Permite %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, fuzzy, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Poate fi construită doar sub forma de guvernământ %s.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Poate fi construită doar sub forma de guvernământ %s.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Nu poate fi construită în oraşe.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Nu poate avea un oraÅŸ natal.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Dacă pierdeţi această unitate veţi pierde jocul!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Fiecare jucător poate avea o singură unitate de acest tip.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Este necesară o populaţie de %d pentru a construi.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Poate transporta şi realimenta %d unitate aerienă.\n"
 msgstr[1] "* Poate transporta şi realimenta %d unităţi aeriene.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Poate transporta şi realimenta %d rachetă.\n"
 msgstr[1] "* Poate transporta ÅŸi realimenta %d rachete.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Poate transporta %d unitate peste mare.\n"
 msgstr[1] "* Poate transporta %d unităţi peste mare.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8393,170 +8442,170 @@ msgstr ""
 "destinaţie care trebuie să fie la 9 unităţi geometrice distanţă [distanţă "
 "Manhattan] faţă de oraşul natal).\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Poate ajută la construcţia minunilor (adaugă %d producţie).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Nu poate fi dizolvată.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Poate fi dizolvată într-un oraş pentru a recupera 50%% din costul "
 "producţiei.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Poate întemeia oraşe.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Poate adăuga o populaţie de %d oraşelor mai mici decât %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Poate construi drumuri şi căi ferate.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Poate construi mine.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Poate construi irigaţii.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Poate construi teren arabil.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Poate construi teren arabil (dacă se cunoaşte %s).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 "* Poate construi teren arabil (dacă se cunoaşte una din următoarele: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Poate construi fortăreţe.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Poate construi fortăreţe (dacă se cunoaşte %s).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 "* Poate construi fortăreţe (dacă se cunoaşte una din următoarele: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Poate curăţa poluarea din formele geometrice.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Poate decontamina formele geometrice.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Poate transforma formele geometrice.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Poate construi baze aeriene.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Poate fortifica, cu un bonus de la apărare de 50%%.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Poate prăda formele geometrice distrugând infrastructura.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Poate executa acţiuni diplomatice, având abilităţi speciale de spionaj.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Poate executa acţiuni diplomatice.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Nu va pierde niciodată o luptă diplomat-contra-diplomat.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Nu pot fi mituiţi.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Poate ataca unitaţi aeriene inamice.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* Este invizibil, mai puţin când se afla lângă o unitate sau un oraş "
 "inamic.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Poate ataca doar unităţi aflate pe pătrate de ocean.\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr ""
 "* Poate ataca de pe mare: împotriva oraşelor inamice sau zonelor de pământ.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Poate fi paraşutat dintr-un oraş aliat (Rază de acţiune: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Beneficiază de apărare dublă împotriva unităţilor 'călare'.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Este considerată unitate 'călare' împotriva unor apărători.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* O rachetă: explodează în urma atacului.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Atacul acestei unităţi termină runda ei.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Atacul acestei unităţi provoacă o explozie nucleară!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Beneficiază de putere de foc dublă când atacă un oraş.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Ignoră efectul zidului oraşului.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8565,38 +8614,38 @@ msgstr ""
 "* Efectuează bombardamente (%d pe rundă). Aceste atacuri doar rănesc (nu-l "
 "omoară niciodată) apărătorul dar nu implică nici un risc atacatorului.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr ""
 "* Beneficiază de apărare de cinci ori mai mare împotriva rachetelor şi "
 "avioanelor.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Ignoră efectul terenului (orice teren este considerat ca drum).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Ignoră zonele de control.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* O unitate civilă (nu poate ataca; nu impune legea marţială).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 "* O unitate de luptă: crează nefericire şi atunci când nu este agresivă.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Nu va ajunge niciodată veterean.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Poate ajunge veterean prin antrenamente şi luptă.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8605,12 +8654,12 @@ msgstr ""
 "* Trebuie să termine runda într-un oraş sau în apropierea ţarmului, sau "
 "riscă să fie pierdută în larg cu o probalitate de 50%%.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* Descoperirea %s reduce riscul la 25%%\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s reduce riscul la 12%%.\n"
@@ -8619,15 +8668,15 @@ msgstr "* %s reduce riscul la 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " sau "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
@@ -8636,12 +8685,12 @@ msgstr[0] ""
 msgstr[1] ""
 "* Unitatea trebuie să fie într-un oraş sau pe un %s după %d runde.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Dacă aţi începe cu %s aţi avea nevoie de %d bulbi."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8650,92 +8699,92 @@ msgstr ""
 "Pentru a ajunge la %s aveţi mai întâi nevoie de alte %d tehnologii. Întreg "
 "proiectul va avea nevoie de %d bulbi pentru a fi terminat."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Nu puteţi cerceta această tehnologie."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 " Acest număr poate varia în funcţie de cea ce vor cerceta ceilalţi jucători "
 "vor.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr "* Primul jucător care descoperă %s obţine imediat un avans.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 "* Reduce pericolul de a pierde navele aflate în largul mării la 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 "* Reduce pericolul de a pierde navele aflate în largul mării la 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Creşte poluarea generată de populaţie.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Permite %silor construcţia de drumuri pe pătrate cu un râu.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Permite %silor construcţia de fortăreţe.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Permite %silor să construiască baze aeriene.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Permite %silor să transforme străzile în căi ferate.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Permite %silor să transforme terenul irigat în teren agricol.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Acest teren nu poate produce poluare."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Nu puteţi construi oraşe pe acest teren."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Linia de coastă a acestui teren nu este sigură."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Terenul este nesigur pentru unităţi."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Unităţile terestre nu pot merge pe ocean."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Caracteristici:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8750,7 +8799,7 @@ msgstr[1] ""
 "* Unităţi militate aflate departe de oraşul natal şi unităţile de luptă vor "
 "face  nefericiţi %d cetăţeni.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8760,23 +8809,23 @@ msgstr ""
 "unităţilor.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* Plătiţi de %d ori mai mult %s pentru întreţinerea unităţilor.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* Plătiţi de %d ori mai mult pentru întreţinerea unităţilor.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, fuzzy, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* Plătiţi de %d ori mai mult %s pentru întreţinerea unităţilor.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 #, fuzzy
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* Plătiţi de %d ori mai mult pentru întreţinerea unităţilor.\n"
@@ -8784,7 +8833,7 @@ msgstr "* Plătiţi de %d ori mai mult pentru întreţinerea unităţilor.\n"
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
@@ -8792,19 +8841,19 @@ msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr "* Fiecare oraş va evita să plătească %d pentru întreţinere.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 "* Pericolul unui război civil este de %d%% în cazul pierderii capitalei.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8814,7 +8863,7 @@ msgstr ""
 "oraş, va apărea când aveţi %d oraşe.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8823,18 +8872,18 @@ msgstr ""
 "* După primul cetăţean nefericit datorat mărimii oraşului, pentru fiecare "
 "alte %d oraşe, un alt cetăţean va fi nefericit.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 "Rata maximă pe care o puteţi pune pentru ştiinţă, galbeni sau lux este %d%"
 "%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "Rate nelimitate pentru ştiinţă/galbeni/lux.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, fuzzy, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8849,7 +8898,7 @@ msgstr[1] ""
 "* Unităţile dvs. pot impune legea marţială. Fieacre unitate militară din "
 "oraş va forţa %d cetăţeni nefericiţi din acel oraş să fie mulţumiţi.\n"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, fuzzy, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8857,7 +8906,7 @@ msgstr[0] "* Un număr maxim de %d unităţi în oraş pot impune legea marţial
 msgstr[1] "* Un număr maxim de %d unităţi în oraş pot impune legea marţială.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8866,15 +8915,15 @@ msgstr ""
 "* Puteţi creşte oraşele prin sărbătoare.  Oraşele dumneavoastră trebuie să "
 "fie cel puţin mărimea %d pentru a creşte prin această metodă.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Unităţile dumneavoastră nu pot fi mituite.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Oraşele dumneavoastră nu pot fi incitate la revoltă.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8882,17 +8931,17 @@ msgstr ""
 "* Guvernarea va ajunge anarhie dacă orice oraş este în dezordine pentru mai "
 "mult de două runde la rând.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Are un senat care ar putea preveni declararea războiului.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 "* Permite apariţia partizanilor atunci când oraşele sunt capturate de "
 "inamici.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
@@ -8900,25 +8949,25 @@ msgstr ""
 "* Construcţiile care în mod normal ofereau bonusuri pentru fericire vor "
 "oferi în schimb galbeni.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* Nu se plăteşte întreţinere pentru fanatici.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* Nu are cetăţeni nefericiţi.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* Unităţi %s veterane.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Unităţi veterane.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8928,7 +8977,7 @@ msgstr ""
 "suferi o penalitate de -1 atunci când nu sărbătoreşte.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, fuzzy, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8938,7 +8987,7 @@ msgstr ""
 "în plus %d %s atunci când sărbătoreşte.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, fuzzy, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
@@ -8946,66 +8995,66 @@ msgstr ""
 "în plus %d %s.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, fuzzy, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* Producţia de %s va suferi pierderi uriaşe.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* Producţia de %s va suferi pierderi uriaşe.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* Producţia de %s va suferi pierderi apreciabile.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* Producţia de %s va suferi pierderi neglijabile.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* Pierderile de %s vor creşte rapid odată cu depărtarea de capitală.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* Pierderile de %s vor creşte cu distanţa până la capitală.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 "* Pierderile de %s vor creşte încet odată cu distanţa până la capitală.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Permite contruirea %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s "
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d nemulţumiţi"
@@ -9466,16 +9515,16 @@ msgstr "Şirul de capabilităţi al serverului: %s"
 msgid "Start of turn %d"
 msgstr "ÃŽnceputul rundei %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "Modul AI este acum %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "Activat"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "Dezactivat"
 
@@ -9506,13 +9555,13 @@ msgstr "?Player:Nume"
 msgid "Username"
 msgstr "Nume utilizator"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Drapel"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9526,7 +9575,7 @@ msgstr "graniţă"
 msgid "Score"
 msgstr "Scor"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Echipa"
 
@@ -9559,36 +9608,36 @@ msgstr "?Player_dlg:Inactiv"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Nu puteţi vinde îmbunătăţirile."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Aţi vândut %d %s pentru %d galbeni."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Nici un %s n-a putut fi vândut."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Nu puteţi dizolva unităţi."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s nu poate fi dizolvat."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "AÅ£i dizolvat %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Nici un %s n-a putut fi dizolvat."
@@ -9898,64 +9947,69 @@ msgstr "Galbeni: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Imp:%d Lux:%d Åžti:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "în mişcare: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "în mişcare: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Apasă pentru informaţii suplimentare)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s populaţie"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Runda: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Galbeni: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Venit net: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Rata taxelor: Galbeni:%d%% Lux:%d%% Ştiinţă:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Cercetând %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Şansă de încălzire globală: %d%% (%+d%%/rundă)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Şansă de iarnă nucleară: %d%% (%+d%%/rundă)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Guvern: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9963,55 +10017,55 @@ msgstr[0] "%d unitate"
 msgstr[1] "%d unităţi"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Runde până la ţintă: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Runde până la ţintă: %d la %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d unitate selectată"
 msgstr[1] "%d unităţi selectate"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Nu aţi selectat nici o naţiune."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Alţii: %d civili; %d militari"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Alţii: %d civili"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Alţii: %d militari"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Nici o unitate pentru modernizare!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Nici una din unităţi nu poate fi modernizată."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -10026,72 +10080,72 @@ msgstr[1] ""
 "Modernizează %s în %s pentru %d galbeni?\n"
 "Trezoreria conţine %d galbeni."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Arată progresul în cercetarea tehnologiei curente."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "fără ţintă de cercetare."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Arată evoluţia încălzirii globale:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Rata poluării: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Şansa unei încălziri catastrofale: %d%%(pe rundă)"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Arată evoluţia iernii nucleare:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Rata împrăştierii nucleare: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Şansa unei ierni catastrofale: %d%%(pe rundă)"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Arată forma de guvernământ curentă:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Populaţia:       %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Suport:          %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energie:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -10099,96 +10153,96 @@ msgstr[0] "Masă:            %5d tonă"
 msgstr[1] "Masă:            %5d tone"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Durata de zbor: %5.1f ani"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Durata de zbor:necunoscută"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Prob.de succes: %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Anul sosirii:    %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:fără"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?min/sec:%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dh %02dm"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dz %02dh"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?durată:depăşire"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s al %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Observator: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Edificii: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Nimic. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr ". "
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Minuni: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "OraÅŸe: %d total, %d peste limita de %d oraÅŸe."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10196,7 +10250,7 @@ msgstr[0] "%d mulţumiţi inainte de penalti cu "
 msgstr[1] "%d mulţumiţi inainte de penalti cu "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10204,16 +10258,16 @@ msgstr[0] "%d cetăţieni nemulţumiţi în plus."
 msgstr[1] "%d cetăţieni nemulţumiţi în plus."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Legea marţială în efect ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "fără maxim, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10221,20 +10275,20 @@ msgstr[0] "%d unitate maxim, "
 msgstr[1] "%d unităţi maxim, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d pe unitate). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Unităţi militate în afara oraşului pot produce nefericire. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Unităţi militare n-au efect asupra fericirii. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Lux: %d total."
@@ -10286,12 +10340,12 @@ msgstr ""
 "Guvernatorul oraşului este confuz în legătură cu %s.  Ar fi bine să aruncaţi "
 "o privire."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "nimic"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "individual"
 
@@ -10345,11 +10399,13 @@ msgid "Ooops..."
 msgstr "Hopa...."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Această unitate nu poate fi mituită!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10366,6 +10422,7 @@ msgstr "Mituieşte unitatea inamică"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10406,6 +10463,7 @@ msgstr "_Avansuri:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "La discreţia Spionului"
 
@@ -10430,12 +10488,13 @@ msgstr "_Înbunătăţiri:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Producţia Oraşului"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Nu puteţi incita la revoltă în %s."
@@ -10447,6 +10506,7 @@ msgstr "OraÅŸul nu poate fi incitat!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10463,6 +10523,7 @@ msgstr "Incită la Revoltă!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10472,6 +10533,7 @@ msgstr ""
 "Trezoreria conţine %d galbeni."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10541,11 +10603,13 @@ msgid "Subvert Enemy Unit"
 msgstr "Subvertează Unitatea Inamică"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "Domnule, Diplomatul aşteaptă ordinele dumnavoastră"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "Domnule, Spionul aşteaptă ordinele dumnavoastră"
@@ -10646,7 +10710,7 @@ msgstr "Poluare:"
 msgid "_Overview"
 msgstr "Privire generală"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10671,11 +10735,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d runde"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Cumpără"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "Pro_ducţie"
@@ -10795,7 +10859,7 @@ msgstr "Unităţi întreţinute %d"
 msgid "Present units %d"
 msgstr "Unităţi prezente %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "_Centrează"
 
@@ -10884,32 +10948,32 @@ msgstr "RedenumeÅŸte oraÅŸul"
 msgid "What should we rename the city to?"
 msgstr "Care să fie numele oraşului?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_Schimbă"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Adaugă prima"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Adaugă următoarea"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Adaugă ultima"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Selectează"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "Ar_ată"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10919,13 +10983,13 @@ msgstr "Ar_ată"
 msgid "Cities"
 msgstr "OraÅŸe"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "Afişează oraşul"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10934,85 +10998,90 @@ msgstr "Afişează oraşul"
 msgid "Improvements"
 msgstr "Înbunătăţiri"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Minuni"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Toate oraÅŸele"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Nici un oraÅŸ"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Invertează Selecţia"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Constuind Unităţi"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Construind Înbunătăţiri"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Construind Minuni"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Construind Unitatea"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Construind Îmbunătăţirea"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Construind Minunea"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Oraşe de Coastă"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Aceaşi Insulă"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Unităţi întreţinute"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Unităţi Prezente"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Înbunătăţiri în oraş"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Minuni în oraş"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Unităţi disponibile"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Înbunătăţiri disponibile"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Minuni disponibile"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Cost total: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -11078,127 +11147,127 @@ msgstr "Care să fie numele setării?"
 msgid "Remove this preset?"
 msgstr "Îndepărtaţi această presetare?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "Mergi la _locul"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "Afişează oraşul"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Zici că vrei o revoluţie?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revoluţie!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Ce Să Prad"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Alegeţi pentru prădare"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Unitate"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Nume"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Selectarea unităţi"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_Activează tot"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "_Ţine poziţia"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_Naţiuni:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Cărei naţii vreţi să-i aparţineţi?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Alegeţi naţiunea"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Naţiune aleatoare"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Alegeţi o naţie"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "_Proprietăţi"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Conducător:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Feminin"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Masculin"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "Stilul _OraÅŸelor:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "L_egendă"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Trebuie să alegeţi sexul."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Trebuie să alegeţi stilul de oraş"
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Trebuie să introduceţi un nume valid."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Modernizează Unitatea!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11459,61 +11528,67 @@ msgstr ""
 msgid "Not _ready"
 msgstr "Nepregătit"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "P_regătit"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Start"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Preluaţi acest jucător"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Alege _naţiunea"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_Observă"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "Nu _observa"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<AI novice>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<AI uÅŸor>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<AI normal>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<AI greu>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Aleator"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr " Observator"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "DeataÅŸat"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Sigur vrei să renunţi?"
 
@@ -12429,217 +12504,217 @@ msgstr "C_onexiune la joc în reţea"
 msgid "Connect to Gaming _Zone"
 msgstr "Concetează-te la Gaming _Zone"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Parolele diferă, introduceţi parola."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Nume Server"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Versiune"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Stare"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Jucători"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Comentariu"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Reţea loc_ală"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Internet _Metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Gazdă:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Port:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Login:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Parola:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Conf_irmaţi parola:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "_Conectează"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Numele conexiunii: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Nume jucător: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Gazdă: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Informaţii jucător/conexiune"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "info %s "
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Schimbă starea jucătorului"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Alege naţiunea"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Observă acest jucător"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Preluaţi acest jucător"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Terminaţi conexiunea"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "Schimbă modul AI pentru jucător"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Îndepărtează jucătorul"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Oferă acces info"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "Oferiţi acces ctrl"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "Pune în %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "_Număr de jucători (inclusiv AI):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "Nivel de dificultate _AI:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "P_resetări:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "_Opţiuni suplimentare pentru joc..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "ÃŽnregistrare"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Rating"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Gata"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Conducător"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Alegeţi jocul pentru încărcat"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Alegeţi jocu_l pentru încărcat"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "Răsfoieşte..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Alegeţi un scenariu"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Alegeţi un _scenariu:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Tipul"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Alegeţi o _naţiune cu care să jucaţi:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Alegeţi locaţia pentru salvat"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Salvează joc"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Jocuri salvate:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Nume fiÅŸier salvare:"
 
@@ -12675,7 +12750,7 @@ msgstr "?Building:Nume"
 msgid "Count"
 msgstr "Număr"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12918,28 +12993,28 @@ msgstr "_Plan de lucru:"
 msgid "Edit Global _Worklists"
 msgstr "Editare _plan de lucru global"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Runde"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr ""
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Arată obiective viitoare"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Ţintă plan de lucru:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "_Adaugă plan de lucru global"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Schimbă producţia"
 
@@ -13246,8 +13321,8 @@ msgid "City shrinks: %d %s"
 msgstr "OraÅŸ descreÅŸte: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13353,11 +13428,11 @@ msgstr "Raportul garnizoanelor"
 msgid "Maintenance Report"
 msgstr "Raportul întreţinerii"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "plan de lucru"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13785,21 +13860,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Se foloseÅŸte ieÅŸirea video: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Se iniţializează clientul"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Se aşteaptă începutul jocului"
 
@@ -15120,7 +15195,7 @@ msgstr "Stilul oraÅŸelor:"
 msgid "Unit Selection"
 msgstr "Selectare unităţi"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "NIMIC"
 
diff --git a/po/ru.gmo b/po/ru.gmo
index a2883e6..b0313ba 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index d91dec7..65a7523 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv-2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2008-01-21 21:55+3400\n"
 "Last-Translator: Egor Vyscrebentsov <evyscr at murom.net>\n"
 "Language-Team: Russian <ru at li.org>\n"
@@ -52,22 +52,22 @@ msgstr "Роскошь"
 msgid "Science"
 msgstr "Наука"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?построено:П"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?чудо:ч"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?устарело:У"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?лишнее:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?построено:П"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?чудо:ч"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -496,81 +496,81 @@ msgstr "Сообщения подключения/отключения"
 msgid "AI Debug messages"
 msgstr "Сообщения отладки AI"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:Геноцид"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:Воинственные"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:Враждебные"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:Несговорчивые"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:Беспокойные"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?attitude:Нейтральные"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:Вежливые"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:Полезные"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:Восторженные"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:Восхищённые"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:Враждебные"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?дипсост:Перемирие"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?дипсост:Война"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?дипсост:Прекращение огня"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?дипсост:Мир"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?дипсост:Альянс"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?дипсост:Не встречал"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?дипсост:Союз"
 
@@ -616,13 +616,13 @@ msgstr "%s соединения"
 msgid "Size %d"
 msgstr "Размер %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Технология будущего %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -634,65 +634,65 @@ msgstr "Технология будущего %d"
 msgid "None"
 msgstr "Ничего"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Технология будущего"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Неизвестно)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Дорога"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Орошение"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Железная дорога"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Шахта"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Загрязнение"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Хижина"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Крепость"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Река"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Ферма"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Аэродром"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Радиация"
 
@@ -800,11 +800,11 @@ msgstr "Атомная ракета"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " и "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?и:, "
 
@@ -965,82 +965,82 @@ msgstr[0] "(всего %d повтор)"
 msgstr[1] "(всего %d повтора)"
 msgstr[2] "(всего %d повторов)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Пустой аргумент для \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Отсутствует аргумент для \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d до н.э."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d н.э."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH установлено, но пусто; используем путь по умолчанию."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Не удалось прочитать каталог данных %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr ""
 "Путь для данных может быть установлен в переменной окружения FREECIV_PATH"
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Текущий путь для данных: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Необходим файл \"%s\" ... прерываем исполнение!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 "%s: Фатальная ошибка: Вы пытаетесь запустить меня будучи "
 "суперпользователем!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Используйте лучше непривелегированный счет.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "точное совпадение"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "единственное совпадение"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "неоднозначно"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "пусто"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "слишком длинно"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "не совпадает"
 
@@ -1069,24 +1069,24 @@ msgstr "%s начали строить чудо %s в %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s продают %s (не нужны) за %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 "*%s (компьютер)* В режиме 'ушел от компьютера' компьютер не может подписать "
 "такой договор."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (компьютер)* Сначала откажитесь от союза с %s, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (компьютер)* Давайте сначала прекратим военные действия, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1095,49 +1095,49 @@ msgstr ""
 "*%s (компьютер)* Мне хотелось бы вначале ещё немного посмотреть, как Вы "
 "соблюдаете текущее прекращение огня, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 "*%s (компьютер)* Я пока не настолько доверяю Вам, чтобы заключить альянс, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (Компьютер)* Я не знаю город, который Вы запросили."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 "*%s (компьютер)* Извините, но общее зрение с Вами для меня очень опасно."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (компьютер)* Эта сделка не слишком хороша для нас, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (компьютер)* Приветствую Вас как союзника, %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (компьютер)* Хорошо, и пусть наш союз будет вечным, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (компьютер)* Миру - мир!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (компьютер)* Договорились, прекращаем военные действия, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1146,24 +1146,24 @@ msgstr ""
 "*%s (компьютер)* Приветствую Вас, %s! Может быть нам следует заключить "
 "соглашение о прекращении огня, пока мы не узнаем друг друга получше?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (компьютер)* Космос никогда не будет твоим! "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "%s (компьютер)* Я достаточно долго терпел твои злобные выходки! Готовься к "
 "войне!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (компьютер)* Мир.. как-нибудь в другой раз."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1172,17 +1172,17 @@ msgstr ""
 "*%s (компьютер)* Наконец у меня дошли до тебя руки! Ты, небось, думал - тебе "
 "удастся увильнуть от ответственности за свои преступления?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (компьютер)* Ваши скрытые военные действия ввергают нас в войну!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (компьютер)* Агрессия против %s была твоей последней ошибкой!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1200,7 +1200,7 @@ msgstr[2] ""
 "*%s (компьютер)* Мы начнём всеобщую войну против %s через %d ходов, чтобы "
 "остановить запуск космического корабля."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1209,7 +1209,7 @@ msgstr ""
 "*%s (компьютер)* Мы ждём от Вас помощи в этом вопросе. Пусть наш славный "
 "союз будет вечен!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1232,7 +1232,7 @@ msgstr[2] ""
 "собственной выгоды. Мы ответим им силой через %d ходов и ожидаем, что Вы, "
 "уважая наш союз, поступите так же!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1250,7 +1250,7 @@ msgstr[2] ""
 "*%s (компьютер)* Мы собираемся пограбить богатую цивилизацию народа %s. Мы "
 "объявим им войну через %d ходов."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1258,7 +1258,7 @@ msgstr ""
 "*%s (компьютер)* Если Вы хотите получить свой кусок пирога - присоединяйтесь "
 "к нашей акции!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1276,14 +1276,14 @@ msgstr[2] ""
 "*%s (компьютер)* Мы разобрались с %s. Дайте нам разорвать эту патетичную "
 "цивилизацию в клочья! Мы объявим им войну через %d ходов."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (компьютер)* Мы ждём от Вас, наших славных союзников, помощи в этой "
 "войне."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1301,7 +1301,7 @@ msgstr[2] ""
 "*%s (компьютер)* Мы чтим наш союз и объявляем войну народу %s через %d "
 "ходов. Держитесь - помощь идёт!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1319,7 +1319,7 @@ msgstr[2] ""
 "*%s (компьютер)* Мы чтим наш союз с народом %s и объявляем войну народу %s "
 "через %d ходов. Мы ожидаем, что Вы поступите так же."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1328,7 +1328,7 @@ msgstr ""
 "*%s (компьютер)* Ваши попытки овладеть космическим пространством только для "
 "Вас самих выдают Ваши истинные замыслы. Я разрываю наш союз!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1337,7 +1337,7 @@ msgstr ""
 "*%s (компьютер)* Ваши попытки овладеть космическим пространством вызывают в "
 "нас сильное недовольство."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1346,13 +1346,13 @@ msgstr ""
 "*%s (компьютер)* Если Вы не прекратите строить космический корабль, мы будем "
 "вынуждены принять меры!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 "*%s (компьютер)* Извините, но общее зрение с Вами для меня не безопасно."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1361,7 +1361,7 @@ msgstr ""
 "*%s (компьютер)* Приветствуем нашего самого надёжного союзника. Помогите нам "
 "уничтожить нашего врага - %s."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1370,7 +1370,7 @@ msgstr ""
 "*%s (компьютер)* Приветствую Вас, союзник. Я вижу Вы все ещё не напали на "
 "нашего врага (%s). Неужели я должен напоминать Вам о Ваших обещаниях?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1381,7 +1381,7 @@ msgstr ""
 "прежнему в мире с нашими смертельными врагами (%s)! Это неприемлемо; нашего "
 "союза с Вами более не существует!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1390,14 +1390,14 @@ msgstr ""
 "*%s (компьютер)* Здравствуйте, друг мой. Можем ли мы предложить Вам "
 "объединить наши цели и вступить в альянс?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 "*%s (компьютер)* Приветствую Вас, сосед. Не желаете ли перейти к более "
 "мирным отношениям?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1406,7 +1406,7 @@ msgstr ""
 "*%s (компьютер)* Мы устали от бесконечного кровопролития. Давайте "
 "приостановим военные действия?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1417,60 +1417,65 @@ msgstr ""
 "забыто!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, c-format
 msgid "Auth option \"%s\":"
 msgstr "Параметры авторизации \"%s\":"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 " отсутствуют в конфигурационном файле (используем параметры по умолчанию)"
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr " (по умолчанию)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr " (конфигурационный файл)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr " (установлено из командной строки)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Имя файла конфигурации авторизации \"%s\" не разрешено!"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Невозможно загрузить файл конфигурации авторизации \"%s\"!"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 "Предупреждение: имя гостя \"%s\" используется кем-то другим, переименовываем "
 "в \"%s\"."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Гости не разрешены на этом сервере. Извините."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s было отказано в подключении: гостевые подключения не разрешены."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1479,7 +1484,7 @@ msgstr ""
 "При чтении базы данных пользователей произошла ошибка, регистрируемся как "
 "гостевое подключение '%s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1487,47 +1492,47 @@ msgstr ""
 "При чтении базы данных пользователей произошла ошибка, а гостевые "
 "регистрации не разрешены. Извините"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 "%s было отказано в подключении: ошибка базы данных и запрет гостевых "
 "подключений."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Введите пароль для %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Введите новый пароль (и запомните его)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 "На этом сервере разрешены только уже зарегистрированные пользователи. "
 "Извините."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr ""
 "%s было отказано в подключении: разрешены только уже зарегистрированные "
 "пользователи."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Извините, слишком много неверных попыток..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 "%s было отказано в подключении: слишком много неверных подтверждений пароля "
 "для нового пользователя."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1535,32 +1540,32 @@ msgstr ""
 "Предупреждение: При сохранении в базу данных произошла ошибка. Продолжаем, "
 "но Ваша статистика не будет сохранена."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s было отказано в подключении: слишком много неверных паролей."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Ваш пароль неверен. Попробуйте ещё раз."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr ""
 "Извините, Ваше подключение было отсоединено вследствие превышения таймаута..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s было отказано в подключении: превышение таймаута ожидания пароля."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 "Ваш пароль слишком короткий, минимальная длина - %d. Попробуйте ещё раз."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2360,16 +2365,14 @@ msgid "Cast a vote."
 msgstr "Подсчёт голоса."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Игрок, имеющий уровень доступа \"info\", использовав команду контролирующего "
 "уровня начинает голосование по поводу этой команды. \"/vote yes [номер-"
@@ -2381,7 +2384,7 @@ msgstr ""
 "половины голосует против. Если прошел один ход и никто не проголосовал "
 "против, голосование также проходит с положительным исходом."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2389,11 +2392,11 @@ msgstr ""
 "debug [ player <имя-игрока> | city <x> <y> | units <x> <y> | unit <id> | "
 "tech <имя-игрока> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Включает или выключает AI отладку заданного предмета."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2401,23 +2404,23 @@ msgstr ""
 "Выводит информацию AI отладки заданного предмета и изменяет дальнейший вывод "
 "отладочной информации для заданного предмета на включенный или выключенный."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <имя-настройки> <значение>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Установить настройку сервера."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <имя-игрока> [команда]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Изменить, добавить или удалить принадлежность игрока к команде."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2430,15 +2433,15 @@ msgstr ""
 "посольствами, и ведут войну вместе для достижения коамдндной победы с "
 "усредненным индивидуальным счетом."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <каталог>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Выберите новую директорию или модуль."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2448,15 +2451,15 @@ msgstr ""
 "момент."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <мета-строка>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Установить строку информации метасервера."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2469,19 +2472,19 @@ msgstr ""
 "метасообщение, а не автосгенерированное, если оно доступно."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <мета-строка>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Установить строку патчей метасервера."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Контролировать связь с метасервером."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2492,33 +2495,33 @@ msgstr ""
 "'metaconnection up' или 'metac u' подключается к метасерверу."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <адрес>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Установить адрес (URL) метасервера, которому будем слать сообщения."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <имя-игрока>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Переключает компьютерное управление игроком на обычное и наоборот."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [имя-подключения] <имя-игрока>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Занять место игрока в игре."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2533,15 +2536,15 @@ msgstr ""
 "будет создан и связан с подключением."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [имя-подключения] [имя-игрока]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Наблюдать за игроком или за всей игрой."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2556,15 +2559,15 @@ msgstr ""
 "подключается к глобальному наблюдателю."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <имя-соединения>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "отключить от игрока."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2573,20 +2576,20 @@ msgstr ""
 "заставить чужие подключения потерять контроль над игроком."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <имя-игрока>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Создать компьютерного игрока с данным именем."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "Команда 'create' доступна только до начала игры."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2594,19 +2597,19 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 "Устанавливает у Вас режим 'ушел от компьютера'. Компьютер будет пока играть "
 "за Вас."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr ""
 "Компьютер будет управлять Вашей страной, но постарается ничего не менять."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2614,11 +2617,11 @@ msgstr ""
 "novice\n"
 "novice <имя-игрока>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Установить уровень одного или нескольких игроков в 'новичок'."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2629,7 +2632,7 @@ msgstr ""
 "'новичок'. С аргументом устанавливает уровень только этого игрока."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2637,11 +2640,11 @@ msgstr ""
 "easy\n"
 "easy <имя игрока>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Установить уровень одного или нескольких игроков как лёгкий."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2652,7 +2655,7 @@ msgstr ""
 "аргументом устанавливает уровень только этого игрока."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2660,12 +2663,12 @@ msgstr ""
 "normal\n"
 "normal <имя игрока>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr ""
 "Установить уровень одного или нескольких компьютерных игроков в нормальный."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2676,7 +2679,7 @@ msgstr ""
 "аргументом устанавливает уровень только этого игрока."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2684,11 +2687,11 @@ msgstr ""
 "hard\n"
 "hard <имя игрока>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Установить уровень одного или нескольких игроков в тяжелый."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2699,7 +2702,7 @@ msgstr ""
 "аргументом устанавливает уровень только этого игрока."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2707,11 +2710,11 @@ msgstr ""
 "experimental\n"
 "experimental <имя игрока>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Сделать одного или нескольких игроков 'экспериментальным'."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2725,7 +2728,7 @@ msgstr ""
 "серверах, эта настройка не играет никакой роли."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2739,11 +2742,11 @@ msgstr ""
 "cmdlevel <уровень> first\n"
 "cmdlevel <уровень> <имя-подключения>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Запросить или установить уровень доступа к командам."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2784,21 +2787,21 @@ msgstr ""
 "другой может подключиться под его именем. Обратите внимание, что указывается "
 "название подключения, не имя игрока."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 "Если никого нет, станьте организатором игры с увеличенными полномочиями."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <ход> <инкремент-хода> <значение> <множитель-значения>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Смотрите \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2810,24 +2813,24 @@ msgstr ""
 "по умолчанию: 0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "конец игры"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Немедленно завершить игру вничью."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "сдался"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Сдаться."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2836,15 +2839,15 @@ msgstr ""
 "участники, кроме одного (или одной команды), игра заканчивается."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <имя-игрока>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Удалить игрока из игры полностью."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2853,7 +2856,7 @@ msgstr ""
 "осторожны!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2861,11 +2864,11 @@ msgstr ""
 "save\n"
 "save <имя-файла>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Сохранить игру в файл."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2882,7 +2885,7 @@ msgstr ""
 "и используйте команду start как только игроки подключились."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2890,11 +2893,11 @@ msgstr ""
 "load\n"
 "load <имя-файла>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Загрузить игру из файла."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2903,28 +2906,28 @@ msgstr ""
 "правил и настройки сервера, теряются.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <имя-файла>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Выполнить команды сервера из файла."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <имя-файла>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Записать текущие настройки в файл как команды сервера."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Переключить стиль исходящей информации сервера между нормальным и RFC."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Просто возвращает id код сервера."
 
@@ -3441,28 +3444,37 @@ msgstr "Вы вызвали инцидент при попытке взбунт
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s вызвали инцидент при попытке взбунтовать город %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "Морские начальные соединения пока ещё не поддерживаются. Никто не получает %"
 "s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Год: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Тайм-аут хода превысил максимальное значение, устанавливаем в максимум."
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Тайм-аут хода меньше нуля, устанавливаем в 0."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Только GGZ-клиент должен вызывать civclient в режиме ggz!\n"
 
@@ -3505,25 +3517,25 @@ msgstr "Нет подключения с именем %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Нет игрока или подключения с именем %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Произошло глобальное потепление!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr "Берега затоплены и большие пространства степей стали пустыней."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Произошла ядерная зима!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr "Влажные области высохли и большие пространства степей стали тундрой."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3533,7 +3545,7 @@ msgstr ""
 "железных дорог.\n"
 "      Рабочие неожиданно собираются и строят железные дороги во всех городах."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3542,12 +3554,12 @@ msgstr ""
 "Люди рады слышать, что Ваши ученые наконец узнали о железных дорогах.\n"
 "      Рабочие неожиданно собираются и строят железные дороги во всех городах."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Передвинули Ваш %s в связи с изменением рельефа."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Распустили Ваши %s в связи с изменением рельефа."
@@ -3613,28 +3625,28 @@ msgstr "Революция: возвращаемся к анархии."
 msgid "You should choose a new government from the government menu."
 msgstr "Вы должны выбрать новую форму правления из меню Форма правления."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr ""
 "Налоговая ставка превысила максимально допустимый уровень для %s, исправлено."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Уровень науки превысил максимально допустимый для %s, исправлено."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Уровень роскоши превысил максимально допустимый для %s, исправлено."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s больше не делятся своим зрением!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3643,13 +3655,13 @@ msgstr ""
 "Сенат не разрешает вам нарушить мирный договор с %s. Либо распустите сенат, "
 "либо подождите, пока не наступит более благоприятный момент."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "Сенат принимает Ваше предложение из-за постоянных провокаций %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3658,12 +3670,12 @@ msgstr ""
 "Сенат отказывается разорвать договор с народом %s, но у Вас нет проблем с "
 "поисками нового сената."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Дипломатическое состояние между %s и %s сейчас %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3671,13 +3683,13 @@ msgid ""
 msgstr ""
 "%s разорвали договор! Дипломатическое состояние между %s и %s сейчас %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr "%s атаковал Вашего союзника %s! Вы отменили Ваш союз с агрессором."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3685,42 +3697,42 @@ msgid ""
 msgstr ""
 "Игрок из Вашей команды %s объявил войну %s. Вы обязаны отменить союз с %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Убираем игрока %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Вы были удалены из игры!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s был удален из игры."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Вы вступили в контакт с народом, именуемым %s, их лидер - %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr "%s и %s встретились и перешли к войне. Вы отменили Ваш союз с обоими."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "%s не могут начать гражданской войны - слишком много игроков"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "%s не могут начать гражданской войны - слишком много игроков"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3728,12 +3740,12 @@ msgid ""
 msgstr ""
 "В Вашей стране началась гражданская война, %s объявлен лидером повстанцев."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s перешел на сторону %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3972,21 +3984,21 @@ msgstr "-ий"
 msgid "th"
 msgstr "-ый"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Строка демографии содержит неправильные символы. Попробуйте \"help demography"
 "\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Демографический отчет:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Извините, демографический отчет недоступен."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%s %s (%s)"
@@ -3997,11 +4009,11 @@ msgstr "%s %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Не могу найти читаемый файл с набором правил \"%s.%s\""
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr "В наборе правил нет варварских народов, необходим хотя бы один!"
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Загрузка правил"
 
@@ -4016,7 +4028,7 @@ msgstr ""
 "со старыми сохранёнными играми, или может означать испорченный файл. Будет "
 "ли оно работать - неизвестно."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Сохранённая игра слишком старая, нужна по крайней мере версия 1.9.0."
 
@@ -4038,13 +4050,13 @@ msgstr ""
 "Используем '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr "У %s - недопустимый народ; изменяем на %s."
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4081,7 +4093,7 @@ msgstr "Внутренние"
 msgid "Networking"
 msgstr "Сетевые"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Все"
@@ -4102,7 +4114,7 @@ msgstr "Редкие"
 msgid "Changed"
 msgstr "Изменено"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4110,7 +4122,7 @@ msgstr ""
 "Строка разрешенных перехватов соединений содержит неправильные\n"
 "символы. Попробуйте \"help allowtake\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4118,7 +4130,7 @@ msgstr ""
 "Строка начальных соединений содержит неправильные\n"
 "символы. Попробуйте \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4128,15 +4140,15 @@ msgstr ""
 "ни одного создателя городов. Попробуйте\n"
 "\"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr "Невозможно установить год конца игры ранее текущего года."
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "Невозможно менять параметр maxplayers в режиме GGZ."
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
@@ -4144,11 +4156,16 @@ msgstr ""
 "Число игроков выше, чем запрашиваемое значение;\n"
 "Оставляем старое значение."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Вам не позволено изменять эту настройку."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Размер карты (в тысячах квадратов)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4158,12 +4175,12 @@ msgstr ""
 "  size = 4 нормальная карта из 4 000 квадратов (значение по умолчанию)\n"
 "  size = 20 огромная карта из 20 000 квадратов"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Индекс топологии карты"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4232,11 +4249,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Метод используемый для генерации карты"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4257,11 +4274,11 @@ msgstr ""
 "\" указывает на значение по выбору генератора. См. также справку по "
 "\"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Метод используемый для выбора начальных позиций"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4283,36 +4300,36 @@ msgstr ""
 "Комментарий: генераторы пытаются создать подходящее число континентов в "
 "зависимоти от выбора начальной позиции и числа игроков."
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Наличие островов 1 на 1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = нет островов 1 на 1; 1 = есть острова 1 на 1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Являются ли полюса отдельными континентами"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = континенты могут быть соединены с полюсами; 1 = полюса обычно отдельны"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Вся карта имеет умеренный климат"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = обычная планета земного типа; 1 = везде умеренный климат "
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Средняя температура планеты"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4345,21 +4362,21 @@ msgstr ""
 "\n"
 "0 означает очень холодную планету с большими полярными зонами и без тропиков"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Процент от карты, который будет сушей"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr "Эта опция устанавливает приблизителный процент суши на карте."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Количество холмов и гор"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4367,11 +4384,11 @@ msgstr ""
 "Меньшие значения дают равнинную карту, тогда как высокие значения дают карту "
 "с большим количеством холмов и гор."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Количество воды на суше"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4380,11 +4397,11 @@ msgstr ""
 "значения дают более влажную карту с большим количеством болот, джунглей и "
 "рек."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Случайное зерно для генерации карты"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4394,11 +4411,11 @@ msgstr ""
 "по умолчанию) зерно будет выбрано в зависимости от времени, чтобы создать "
 "случайную карту. Данная опция обычно используется только для отладки игры."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Случайное зерно в игре"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4406,11 +4423,11 @@ msgstr ""
 "Для ноля (значение по умолчанию) зерно будет выбрано в зависимости от "
 "времени. Данная опция обычно используется только для отладки игры."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Количество квадратов со \"специальными\" ресурсами"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4418,11 +4435,11 @@ msgstr ""
 "Специальные ресурсы улучшают основной тип рельефа, на котором они находятся. "
 "Шкала переменных сервера - количество частей на тысячу."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Количество хижин (небольших селений)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4431,23 +4448,24 @@ msgstr ""
 "всей карте. Хижины - это небольшие племенные деревни, которые могут быть  "
 "исследованы соединениями."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Минимальное число игроков"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Должно быть хотя бы столько игроков (подключенных и компьютерных) прежде чем "
 "игра может начаться."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Максимальное число игроков"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4457,11 +4475,11 @@ msgstr ""
 "игре. Когда такое число игроков подключено до начала игры, новым игрокам "
 "будет отказано при попытке подключиться."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Общее число игроков (Включая компьютерных игроков)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4469,11 +4487,11 @@ msgstr ""
 "Если установлено положительное значение, тогда компьютерные игроки будут "
 "автоматически созданы пока количество игроков не достигнет этого числа."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Список начальных соединений игрока"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4501,27 +4519,27 @@ msgstr ""
 "    a   = Быстрое атакующее соединение (например, Всадники)\n"
 "    A   = Сильное атакующее соединение (например, Каптапульта)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Место, где начальные соединения будут находится"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "Это радиус, в пределах которого будут разбросаны начальные соединения."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Стартовое количество золота на игрока"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "В начале игры каждый игрок получает указанное количество золота."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Начальное число технологий на каждого игрока"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4534,11 +4552,11 @@ msgstr ""
 "переменной для уровня технологий означает, что следующая технология будет "
 "стоить дороже."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Стоимость технологии процентный коэффициент"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4548,11 +4566,11 @@ msgstr ""
 "цены на технологии умножаются на данную величину (в процентах). Базовая "
 "стоимость технологии зависит от набора правил или от других настроек игры."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Процент потери при изменении технологии"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4562,11 +4580,11 @@ msgstr ""
 "число исследовательских очков, Вы теряете такой процент этих очков. Это "
 "правило не действует, если Вы только что получили технологию в этот ход."
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Процент потери при получении технологии или золота по договору"
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4578,11 +4596,11 @@ msgstr ""
 "может оказаться отрицательное число очков. То же самое касается передачи "
 "золота при димломатических переговорах."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Процент потери при получении технологии в результате завоеваний"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4592,11 +4610,11 @@ msgstr ""
 "количество очков, равное этому проценту от стоимости новой технологии. В "
 "результате у Вас может оказаться отрицательное число очков."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Процент потери при получении технологии даром"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4609,11 +4627,11 @@ msgstr ""
 "теряете количество очков, равное этому проценту от стоимости новой "
 "технологии. В результате у Вас может оказаться отрицательное число очков."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Количество пищи необходимое городу для роста"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4623,11 +4641,11 @@ msgstr ""
 "оно умножается на другую величину, которая берется из набора правил и "
 "зависит от размера города."
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr "Количество пищи, теряемой когда требуется здание"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4637,11 +4655,11 @@ msgstr ""
 "Канализация, он теряет такой процент запаса еды (или половину этого если "
 "есть амбар)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Процентный множитель стоимости продукции"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4649,11 +4667,11 @@ msgstr ""
 "Этот параметр влияет на то, как быстро будут создаваться соединения и "
 "здания. Базовая стоимость умножается на это значение (в процентах)."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Минимальный размер города для получения полной торговли"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4666,11 +4684,11 @@ msgstr ""
 "штрафа, кроме обычной коррупции), когда размер города равен fulltradesize. "
 "Смотрите также notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Максимальный размер города без торговли"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4681,11 +4699,11 @@ msgstr ""
 "размера, достигая максимума для городов, чей размер fulltradesize или выше. "
 "Смотрите также fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Размер города прежде, чем люди становятся несчастны"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4693,11 +4711,11 @@ msgstr ""
 "До других изменений, первые unhappysize граждан в городе создаются "
 "нейтральными, а все последующие несчастными. Смотрите также cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Число городов для более высокого несчастья"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4709,11 +4727,11 @@ msgstr ""
 "см. также unhappysize. Это предполагает демократию, для других форм "
 "правления эффект происходит раньше."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Минимальное расстояние между городами"
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4725,11 +4743,11 @@ msgstr ""
 "любыми двумя городами должно быть минимум два квадрата. Если это число равно "
 "0 (значение по умолчанию), то оно определяется текущим набором правил."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Число ходов между Бумовыми эффектами"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4737,11 +4755,11 @@ msgstr ""
 "Устанавливает число ходов между бумовым ростом города. Если установлено в n, "
 "город вырастет после пребывания в состоянии праздника в течение n+1 ходов."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Вероятность уничтожения здания при захвате города"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4749,11 +4767,11 @@ msgstr ""
 "Когда игрок захватывает город, каждое здание имеет такой процент вероятности "
 "уничтожения."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Вероятность движения вперёд после атаки"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4766,11 +4784,11 @@ msgstr ""
 "двигаются вперед после атаки, если они победили и на этом месте нет войск "
 "противника. Если установлено между 0 и 100, означает вероятность продвижения."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Включить/выключить авто-атаку на сервере"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4779,11 +4797,11 @@ msgstr ""
 "автоматически расссматривать возможность атаки соединений противника, "
 "двигающихся рядом с ними."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Уменьшить население города после атаки"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4799,11 +4817,11 @@ msgstr ""
 "  4 = вертолёт\n"
 "  8 = воздушный"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Радиус государственных границ"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4814,11 +4832,11 @@ msgstr ""
 "отношении морских квадратов и квадратов вблизи городов более, чем одной "
 "страны."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Соединения внутри границ не вызывают недовольства"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4826,11 +4844,11 @@ msgstr ""
 "Если установлено, соединения не вызывают недовольства, когда они внутри "
 "ваших границ."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Возможность дипломатических отношений с другими игроками"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4844,11 +4862,11 @@ msgstr ""
 "3 = дипломатия ограничена командами.\n"
 "4 = дипломатия запрещена для всех."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Разрешенные названия городов"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4875,11 +4893,11 @@ msgstr ""
 "умолчанию городов другого народа, если только они не в его собственном "
 "списке по умолчанию."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Частота появления варваров"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4893,19 +4911,19 @@ msgstr ""
 "3 = частые вторжения варваров \n"
 "4 = орды варваров"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Год начала нападений варваров"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Варвары не начнут нападать до этого года."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Количество ходов в состоянии революции"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4914,11 +4932,11 @@ msgstr ""
 "Если значение параметра - 0, то его длительность будет случайным числом от 1 "
 "до 6 ходов."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Включать ли туман войны"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4928,11 +4946,11 @@ msgstr ""
 "расстояние зрения от Ваших городов и соединений будут показаны Вам. Вы не "
 "увидите новые города или изменения рельефа на ненаблюдаемых квадратах."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Базовый шанс для дипломатов и шпионов на успех."
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4941,20 +4959,20 @@ msgstr ""
 "Шанс для шпиона возвратиться после успешно завершённого задания и базовый "
 "шанс успеха для дипломатов и шпионов."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Допускать ли гонку за космосом"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr ""
 "Если данная опция установлена в 1, игроки могут строить космические корабли."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Минимальное число городов для гражданской войны"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4964,11 +4982,11 @@ msgstr ""
 "столица игрока захвачена. Если эта настройка установлена в максимальное "
 "значение, гражданские войны отключены совсем."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Число ходов до потери контакта между игроками"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4978,11 +4996,11 @@ msgstr ""
 "ходов после последней встречи их соединений. Если установлено в ноль, игроки "
 "не могут встретится, если у них нет посольства."
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Построить новый дворец, если столица захвачена врагом"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4994,11 +5012,11 @@ msgstr ""
 "что это не зависит от того, выполнены ли технологические требования для "
 "постройки Дворца."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Использовать ли \"естественные\" имена"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -5006,11 +5024,11 @@ msgstr ""
 "Если включено, имена городов будут определены, основываясь на окружающем "
 "рельефе."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Игроки, место которых может занять пользователь"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -5074,11 +5092,11 @@ msgstr ""
 "4 = контроль запрещён, наблюдение разрешено;\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Переключается ли компьютерный статус с подключением"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5086,24 +5104,27 @@ msgstr ""
 "Если установлено в 1, компьютерный контроль выключается когда игрок "
 "подключается, и наоборот."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Год завершения игры"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Игра закончится в конце заданного года"
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Макс. количество секунд на ход"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Если все игроки не нажали \"Конец хода\" пока это время не истекло, ход "
 "заканчивается автоматически. Ноль значит время не ограничено. В серверах в "
@@ -5111,12 +5132,12 @@ msgstr ""
 "Используйте вместе с командой \"timeoutincrease\", если Вам нужен "
 "динамический таймер."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 "Оставить до конца хода по крайней мере n секунд при движении противника"
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
@@ -5124,11 +5145,11 @@ msgstr ""
 "При движении соединения в зоне зрения противника, время, оставшееся до конца "
 "хода, увеличивается до этого значения."
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Иметь ли одновременные фазы игроков"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5136,11 +5157,11 @@ msgstr ""
 "Если включено, игроки совершают свои ходы одновременно; если выключено, то "
 "поочередно."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Секунд для разрешения блокировки подключения клинета."
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5150,11 +5171,11 @@ msgstr ""
 "подключение закрывается. Ноль означает, что подключение не закрывается (на "
 "самом деле рано или поздно оно все равно отключится автоматически)."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Макс. секунд до освобождения сетевых буферов"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5164,30 +5185,30 @@ msgstr ""
 "сетевых клиентов не разблокируются. Ноль означает, что сервер не будет ждать "
 "вообще."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Количество секунд между ПИНГами"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr "Civserver пошлет каждому клиенту запрос ПИНГ через заданное время."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Время обрыва связи с клиентом"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr "Если клиент не ответит на ПИНГ за это время, он будет отключен."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Режим блокировки игры по ходам"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5195,11 +5216,11 @@ msgstr ""
 "Если установлено в 1, следующий ход не наступает пока все игроки не "
 "закончили свой ход, включая отключенных игроков."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Режим ходов фиксированной длины"
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
@@ -5207,11 +5228,11 @@ msgstr ""
 "Если установлено в 1, ход не закончится до истечения времени, даже если все "
 "игроки нажали на \"Конец хода\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Что есть в демографическом отчете"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5252,11 +5273,11 @@ msgstr ""
 "Порядок символов не важен, но различие между большими и маленькими "
 "существенно."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Ходов до автосохранения"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5264,11 +5285,11 @@ msgstr ""
 "Игра будет автоматически сохранена каждые saveturns ходов. Ноль значит "
 "никогда не авто-сохранять."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Уровень компрессии сохранённых игр"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5278,11 +5299,11 @@ msgstr ""
 "Большие числа дают лучшую компрессию, но требуют больше времени. Если "
 "максимум равен нулю, сервер не был скомпилирован, чтобы использовать zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Префикс имён автосохранения"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5290,11 +5311,11 @@ msgstr ""
 "Автоматически сохранённые игры будут иметь имя \"<префикс><год>.sav\". Эта "
 "настройка устанваливает <префикс>."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Записывать ли в журнал статистику игроков"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5308,7 +5329,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Сервер не может читать со стандартного ввода. Игнорируем ввод."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Сервер: неправильный адрес: [%s:%d]."
@@ -5451,90 +5472,90 @@ msgstr "Не удалось сохранить игру как %s"
 msgid "Game saved as %s"
 msgstr "Игра сохранена как %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Игра уже запущена."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%s лишился уровня доступа cmdlevel. С этих пор используйте голосование."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Запуск игры."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "запрошен неизвестный отчёт (тип %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Внимание: отказываем старому клиенту (%s)"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Получен пакет типа %d от мёртвого игрока или наблюдателя"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Выберите непустое имя."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Этот народ уже используется."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr ""
 "Другой игрок, назвавший себя '%s', уже присоединился к игре. Пожалуйста, "
 "выберите другое имя."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Пожалуйста, выберите имя, содержащее только ASCII символы."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "Народ %s недоступен в данном сценарии."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "Народ %s уже используется."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s - %s правитель %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Ждём начала игры: %d из %d игроков готовы начать."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s был добавлен как %s уровень игрока, управляемого компьютером."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Игрок %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s правит народом %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
@@ -5542,16 +5563,16 @@ msgstr ""
 "Эта программа сервера freeciv поддерживает авторизацию пользователей, но "
 "сейчас она не используется."
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Посылаем информацию на метасервер [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Игра закончена..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Принимаются подключения новых клиентов."
 
@@ -5572,7 +5593,7 @@ msgstr "(двусмысленно)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5748,7 +5769,7 @@ msgstr "Игроки не могут быть удалены после запу
 msgid "Removed player %s from the game."
 msgstr "Удален игрок %s из игры."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Имя \"%s\" запрещено по соображениям безопасности."
@@ -5827,202 +5848,202 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr "Невозможно увеличить уровень команд до '%s'; у Вас только '%s'"
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Уровень доступа к командам установлен в '%s' для подключения %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "Невозможно установить уровень команд в '%s' для подключения %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Уровень доступа к командам установлен в '%s' для новых игроков."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "Уровень команд для первого взявшего его игрока: '%s'"
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "Команда 'first' не имеет смысла в командной строке сервера."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Вы сейчас имеете уровень доступа '%s' или выше."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Кто-то уже является организатором игры."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "Подключение %s выбрано в качестве организатора игры."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "Неверный аргумент %d"
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 "Использование: timeoutincrease <ход> <инкремент-хода> <значение> <множитель-"
 "значения>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Динамический тайм-аут установлен в %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Настройка:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Описание:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Состояние: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "изменяемый"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "фиксированный"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Значение:%d, Минимум: 0, По умолчанию: %d, Максимум: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Значение:%d, Минимум: %d, По умолчанию: %d, Максимум: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Значение: \"%s\", По умолчанию: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Объяснения доступны для следующих настроек сервера:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Пока нет объяснения для этого."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Двусмысленное имя настройки."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Оператор Сервера: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Компьютерный игрок '%s' имеет уровень сложности '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s контролируется компьютером."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Уровень компьютерных игроков по умолчанию установлен в '%s'"
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Эта команда работает только в клиенте."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Использование: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Только игроки могут использовать команду уйти."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s в режиме 'ушел от компьютера'."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s вернулся к игре."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Извините, Вы не имеете доступа к просмотру настройки '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Неизвестная настройка '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Все настройки со значениями не по умолчанию"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Все настройки"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Основные настройки"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Ситуационные настройки"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Редкоиспользуемые настройки"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ значит, что Вы можете менять настройку"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= значит, что настройка имеет значение по умолчанию"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s значение (мин,макс)    "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Настройка"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "описание"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -6032,38 +6053,38 @@ msgstr ""
 "Попробуйте 'show changed' для просмотра настроек со значениями не по "
 "умолчанию."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Невозможно сменить команду после начала игры."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Неопределённый аргумент. Используйте: team <игрок> <команда>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 "Нет команды %s. Пожалуйста, выберите правильное название команды или номер."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Невозможно включить варварского игрока в команду."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Игрок %s в команде: %s"
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Неопределённый аргумент. Используйте: vote yes|no [номер]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Наблюдатели не могут голосовать."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -6071,39 +6092,39 @@ msgstr ""
 "Вы можете голосовать только в начавшейся игре. Используйте команду 'first', "
 "чтобы стать организатором игры, если такового ещё нет."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Голосование %d \"%s\": %d за, %d против"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Нет активных голосований."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Неверное последнее голосование."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Значение должно быть целым числом."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Нет такого голосования (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Вы голосовали за \"%s\"."
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Вы голосовали против \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6112,436 +6133,465 @@ msgstr ""
 "<y> | units <x> <y> | unit <идентификатор> | tech <имя игрока> | timing | "
 "info>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Эту команду можно использовать только после начала игры."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "Отладка дипломатии %s выключена"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "Отладка дипломатии %s включена"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "Отладка технологии %s выключена"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "Отладка технологии %s включена"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Значения 2 и 3 должны быть целыми числами."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Неверные координаты карты."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Нет города с такими координатами."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "Отладка %s закончена"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr "Отладка %s %s закончена."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr "Начата отладка %s %s."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Значение 2 должно быть целым числом."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Соединение %d не существует."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Неопределённый аргумент. Используйте: set <настройка> <значение>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Вам не позволено изменять эту настройку."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Эта настройка не может быть изменена после запуска игры."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Значение должно быть целым числом."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr "Параметр %s должен содержать только цифры 0-1."
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Значение вне допустимых пределов (минимум: 0, максимум: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Настройка: %s была установлена в %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr "Параметр %s должен содержать только +- и 0-9."
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Значение вне допустимых пределов (минимум: %d, максимум: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr ""
 "Строка символов слишком длинна. Используйте: set <настройка> <значение>"
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Настройка: %s установлена в \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Извините, вы не можете наблюдать глобально в этой игре."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 "Извините, вы не можете взять управление глобальным наблюдателем. Вместо "
 "этого попробуйте просто наблюдать."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr ""
+"Извините, в этой игре нельзя брать управление игроками, управляемыми людьми."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Извините, в этой игре запрещено наблюдение за варварами."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Извините, в этой игре нельзя брать управление варварами."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Извините, в этой игре запрещено наблюдение за погибшими игроками."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Извините, в этой игре нельзя брать управление погибшими игроками."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 "Извините, в этой игре запрещено наблюдение за игроками, управляемыми "
 "компьютером."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 "Извините, в этой игре нельзя брать управление игроками, управляемыми "
 "компьютером."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 "Извините, в этой игре запрещено наблюдение за игроками, управляемыми людьми."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 "Извините, в этой игре нельзя брать управление игроками, управляемыми людьми."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Извините, в этой игре запрещено наблюдение за игроками."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Извините, в этой игре нельзя брать управление игроками."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 "Извините, в этой игре нельзя брать управление игроками, которые уже "
 "подключены."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Использование: observe [имя-подключения [имя-игрока]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Использование: observe [имя-игрока]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 "%s итак контролирует %s. Если Вы используете команду 'observe', это уберет %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s уже контролирует %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s уже является наблюдателем."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s сейчас наблюдает за %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s сейчас является наблюдателем"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Используйте: take <имя-подключения> <имя-игрока>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Использование: take <имя-игрока>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Используйте: take [имя-подключения] <имя-игрока>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s уже контролирует %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "Нет игрока или подключения с именем %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "отключается от %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s сейчас контролируeт %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Варвары"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "Компьютер"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Человек"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Живой"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Умер"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s не подключен ни к каким игрокам."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Использование: detach <имя-подключения>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Вы не можете отключать других пользователей."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s не подключен ни к каким игрокам."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s отключается от %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s более не является обозревателем."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "отключается от %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Использование: load <имя-игры>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "Невозможно загрузить игру во время работы другой игры."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "Невозможно найти игру или сценарий с именем \"%s\"."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "Невозможно загрузить файл: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Текущий путь для данных: \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Каталог набора правил \"%s\" не найден"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Каталог набора правил уже установлен в \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Каталог набора правил установлен в \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Пока."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Извините, Вы не можете использовать команды сервера."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Внимание: '%s' интерпретировано как '%s', но оно двусмысленно. Попробуйте '%"
 "shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Неизвестная команда. Попробуйте '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Ваше новое голосование отменяет предыдущее голосование."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Новое голосование (номер %d) от %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr "Ваше новое голосование (\"%s\") либо недопустимо, либо не распознано."
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Вы не можете пользоваться этой командой."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(приглашение сервера)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Игра окончена вничью."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Заканчиваем игру. Сервер перезагрузится как только все клиенты отключатся."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Невозможно закончить игру, игра не запущена."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s покинул игру и теперь не сможет выиграть."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Вы не можете сдаться сейчас."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Недостаточно игроков, игра не начнется."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Недостаточно игроков, игра не начнется."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Недостаточно игроков, игра не начнется."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Все игроки готовы; начинаем игру."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr "Невозможно начать игру: ждем пока все клиенты отключатся."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Невозможно начать игру: она уже идет."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Прерываем подключение %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6580,77 +6630,77 @@ msgstr ""
 "  save   -  чтобы сохранить игру\n"
 "  quit   -  чтобы выйти"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Команда:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Краткая справка:"
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Уровень: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Следующие команды сервера доступны:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Аргумент команды help '%s' неоднозначен."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Справка по '%s' не найдена."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Плохой аргумент команды list: '%s'. Попробуйте '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Список игроков:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<нет игроков>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "пользователь %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Умер"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", уровень сложности %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", готов"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", не готов"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
@@ -6658,21 +6708,21 @@ msgstr[0] " %d соединение:"
 msgstr[1] " %d соединения:"
 msgstr[2] " %d соединений:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s из %s (уровень команд %s), размер буфера=%dкб"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (наблюдатель)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Список команд:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
@@ -6680,25 +6730,25 @@ msgstr[0] "%2d : '%s' : %d игрок"
 msgstr[1] "%2d : '%s' : %d игрока"
 msgstr[2] "%2d : '%s' : %d игроков"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 игрок : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Пустая команда: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Список соединений с сервером:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<нет соединений>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Список доступных сценариев:"
 
@@ -6769,17 +6819,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Технологическая цель - %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Вы украли %s у %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%s украли у Вас %s!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%s украли %s у %s."
@@ -7302,20 +7352,20 @@ msgstr "Попытка построить чудо %s провалилась."
 msgid "Your %s has invalid orders."
 msgstr "Ваш %s получил неверный приказ."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Высокий процент земли - это может занять несколько секунд."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Возвращаемся к использованию генератора %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Генератор 3 не создал всех больших островов."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Генератор 3 оставил %li процентов земли неиспользованными."
@@ -7407,16 +7457,17 @@ msgstr "Возможна неверная конфигурация или неп
 msgid "Cannot find audio file %s"
 msgstr "Не могу найти аудио-файл %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX ходов"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d золота за ход"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
@@ -7424,30 +7475,30 @@ msgstr[0] "%3d ход"
 msgstr[1] "%3d хода"
 msgstr[2] "%3d ходов"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "никогда"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/ход"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
@@ -7455,74 +7506,74 @@ msgstr[0] "%s (%d) %d ход"
 msgstr[1] "%s (%d) %d хода"
 msgstr[2] "%s (%d) %d ходов"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Устарело"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Построено"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Великое чудо"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Небольшое чудо"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/ход"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Граждане\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Налоги от торговли\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : Торговые пути с %s\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : Зданий, десятки\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : Бонус от %s (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Потери\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Беспорядки\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Использовано\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : Добавить до\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Всего в остатке"
@@ -7635,8 +7686,8 @@ msgid "Best defending units"
 msgstr "Лучшие защитные соединения"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7808,8 +7859,8 @@ msgstr "Загр"
 msgid "?cma:Governor"
 msgstr "Губернатор"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -8076,19 +8127,19 @@ msgstr ""
 "Автоматически подключаемся к серверу \"%s\", порт %d, как \"%s\", каждые %f "
 "секунд, %d раз"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "новичок"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "лёгкий"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "нормальный"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "тяжёлый"
 
@@ -8096,31 +8147,31 @@ msgstr "тяжёлый"
 msgid "experimental"
 msgstr "экспериментальный"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Запуск сервера..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Невозможно стартовать сервер."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Вы должны запустить сервер вручную. Извините..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Невозможно подключиться к серверу."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Возможно, мы не сможем стартовать отсюда."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "У Вас есть доступ к настройкам сервера (командная строка)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "У Вас нет доступа к настройкам сервера, пробуем закрыть сервер."
 
@@ -8206,27 +8257,27 @@ msgstr "Применяется только для %s.\n"
 msgid "Requires a minimum size of %d.\n"
 msgstr "Необходим минимальный размер %d.\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Позволяет %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Позволяет %s (с %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Реки"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Извините, нет справки для %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8237,7 +8288,7 @@ msgstr ""
 "Эта страница была создана автоматически.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
@@ -8245,59 +8296,59 @@ msgstr ""
 "Требуется: Ничего\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Открытие %s упразднит %s.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 "* Позволяет всем игрокам знающим технологию %s строить соединения %s.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Разрешает %s (с %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Разрешает %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Может быть построено только если в городе есть %s.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Может быть построено только при форме правления %s.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Не может быть построено в городах.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Не может иметь домашнего города.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Потеряв данное соединение Вы проиграете в игре!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Каждый игрок может иметь только одно соединение данного типа.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Необходимо %d жителей для постройки.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
@@ -8305,7 +8356,7 @@ msgstr[0] "* Может перевозить и дозаправлять %d во
 msgstr[1] "* Может перевозить и дозаправлять %d воздушные соединения.\n"
 msgstr[2] "* Может перевозить и дозаправлять %d воздушных соединений.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -8313,7 +8364,7 @@ msgstr[0] "* Может перевозить и дозаправлять %d ра
 msgstr[1] "* Может перевозить и дозаправлять %d ракетные соединения.\n"
 msgstr[2] "* Может перевозить и дозаправлять %d ракетных соединений.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
@@ -8321,7 +8372,7 @@ msgstr[0] "* Может перевозить %d наземное соедине
 msgstr[1] "* Может перевозить %d наземных соединений по воде.\n"
 msgstr[2] "* Может перевозить %d наземных соединений по воде.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8330,127 +8381,127 @@ msgstr ""
 "который является вашей целью, на расстоянии не менее 9 квадратов [по "
 "диагонали считается как 2] от домашнего города вашего соединения).\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Может помогать строить чудеса (добавляет %d единиц производства).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Нельзя распустить.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr "* Может быть распущен в городе с получением 50%% от стоимости.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Может строить новые города.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Может добавить %d жителей к городам, размер которых не более %d.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Может строить дороги и железные дороги.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Может строить шахты.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Может строить орошение.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Может строить ферму.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Может строить ферму (если известно %s).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Может строить ферму (если что-либо из списка известно: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Может строить крепости.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Может строить крепости (если известно %s).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Может строить крепости (если что-либо из списка известно: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Может очищать загрязнения.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Может очищать радиоактивные загрязнения.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Может изменять ландшафт.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Может строить аэродромы.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Может укрепляться, что даёт 50%% защитную премию.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Может грабить и уничтожать инфраструктуру.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* Может выполнять дипломатические функции и обладает специальными шпионскими "
 "способностями.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Может выполнять дипломатические функции.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Никогда не проигрывает в дипломатической борьбе.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Не может быть завербовано.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Может атаковать чужие воздушные соединения.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* Невидим, за исключением случаев, когда рядом с вражеским соединением или "
 "городом.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Может атаковать только войка в океане (нет береговых атак).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
@@ -8458,41 +8509,41 @@ msgstr ""
 "* Может атаковать с морских соединений: против вражеских городов и на земные "
 "квадраты.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr ""
 "* Может быть сброшен на парашюте из дружественного города (Расстояние: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Имеет двойную защиту против 'конных' соединений.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Считается 'конным' против определённых защитников.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Ракетное соединение: используется для атаки.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Атака заканчивает ход этого соединения.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Атака этого соединения вызывает ядерный взрыв!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Получает двойную огневую мощь при атаке городов.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Игнорирует эффект городских стен.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8502,36 +8553,36 @@ msgstr ""
 "наносит повреждения врагу (никогда не убивает), но зато нападающий ничем не "
 "рискует.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Даёт пятикратную защиту против ракет и самолётов.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Игнорирует эффекты рельефа (воспринимает все квадраты как дороги).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Игнорирует зоны контроля.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 "* Не-военное соединение (не может атаковать; нет военного положения).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "* Полевое соединение: одно несчастье, даже если не агрессивен.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Никогда не достигнет статуса ветерана.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Может стать ветераном в процессе обучения или в бою.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8540,12 +8591,12 @@ msgstr ""
 "* Должен закончить ход в городе или рядом с землей, иначе 50%% риск "
 "потеряться в море.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* Открытие технологии %s уменьшает риск до 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s уменьшает риск до 12%%.\n"
@@ -8554,15 +8605,15 @@ msgstr "* %s уменьшает риск до 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " или "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?или:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
@@ -8570,12 +8621,12 @@ msgstr[0] "Соединение должно быть в городе или н
 msgstr[1] "Соединение должно быть в городе или на %s после %d ходов.\n"
 msgstr[2] "Соединение должно быть в городе или на %s после %d ходов.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Если мы начнем %s, нам потребуется %d лампочек."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8584,88 +8635,88 @@ msgstr ""
 "Для того, чтобы достичь технологию %s, нам нужно приобрести еще %d "
 "технологий. Весь проект потребует %d лампочек для завершения."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Вы не можете исследовать эту технологию."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr " Это число может зависеть от того, что изобретут другие игроки.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr "* Первый игрок, открывший %s, получает немедленное открытие.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Уменьшает вероятность утери кораблей в океане до 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Уменьшает вероятность утери кораблей в океане до 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Увеличивает загрязнения, создаваемые населением.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Позволяет соединению %s строить дороги на речных квадратах.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Позволяет соединению %s строить крепости.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Позволяет соединению %s строить аэродромы.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Позволяет соединению %s обновлять дороги до железных дорог.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Позволяет соединению %s обновлять орошения до ферм.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Загрязнение не происходит в этом рельефе."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Вы не можете строить города в этом рельефе."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Берег этого рельефа опасен."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Этот рельеф опасен для передвигающихся соединений."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Наземеные соединения не могут перемещаться по морскому рельефу."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Особенности:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr " Ничего "
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8683,7 +8734,7 @@ msgstr[2] ""
 "* Военные соединения вне города и полевые соединения сделают %d жителей "
 "недовольными.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8693,30 +8744,30 @@ msgstr ""
 "вызвано соединениями.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* Вы платите %d раз по %s за содержание Ваших соединений.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* Вы платите в %d раз больше за содержание Ваших соединений.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* Вы не платите %s за содержание Ваших соединений.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* Вы не платите за содержание Ваших соединений.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
@@ -8724,13 +8775,13 @@ msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 "* Каждый из Ваших городов избежит платы %d золота за содержание соединений.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
@@ -8738,7 +8789,7 @@ msgstr ""
 "d%%.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8748,7 +8799,7 @@ msgstr ""
 "появится, когда у вас будет %d городов.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8757,18 +8808,18 @@ msgstr ""
 "* После первого несчастного жителя в связи с размером цивилизации, на каждые "
 "%d дополнительных городов ещё один житель станет несчастным.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 "Максимальный уровень, который Вы можете установить для науки, золота, "
 "роскоши - %d%%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "Нет ограничений на значения уровня науки/золота/роскоши.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8786,7 +8837,7 @@ msgstr[2] ""
 "* Вы можете ввести военное положение. Каждое военное соединение в городе "
 "сделает %d недовольных жителей нейтральными.\n"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8801,7 +8852,7 @@ msgstr[2] ""
 "военного положения.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8811,15 +8862,15 @@ msgstr ""
 "должны иметь размер как минимум %d, прежде чем они смогут увеличиться данным "
 "способом.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Ваши соединения не могут быть завербованы противником.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Ваши города нельзя подстрекать к мятежу.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8827,15 +8878,15 @@ msgstr ""
 "* Форма правления станет анархией, если в любом городе гражданские "
 "беспорядки продолжаются более 2 ходов.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Имеется сенат, который может воспрепятствовать объявлению войны.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr "* Партизаны появляются, когда города захватываются противником.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
@@ -8843,25 +8894,25 @@ msgstr ""
 "* Здания, которые обычно помогают против несчастности граждан, вместо этого "
 "приносят золото.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* Не надо платить за содержание фанатиков.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* Нет несчастных граждан.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* Соединения %s создаются ветеранами.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Соединения создаются ветеранами.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8871,7 +8922,7 @@ msgstr ""
 "1 единицу, когда не празднуют.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8881,72 +8932,72 @@ msgstr ""
 "когда празднуют.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 "* Каждый рабочий квадрат с как минимум 1 %s даст дополнительно %d этого же.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* Производство %s увеличено на %d%%.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* Производство %s страдает от массовых растрат.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* Производство %s страдает от растрат.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* Производство %s страдает от малого количества растрат.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* Растраты %s быстро растут по мере удаления от столицы.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* Растраты %s растут по мере удаления от столицы.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr "* Растраты %s медленно растут по мере удаления от столицы.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Позволяет Вам строить %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d несчастья"
@@ -9393,16 +9444,16 @@ msgstr "Строка возможностей сервера: %s"
 msgid "Start of turn %d"
 msgstr "Начало хода %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "Компьютерный режим %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "ВКЛ"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "ВЫКЛ"
 
@@ -9433,13 +9484,13 @@ msgstr "?Игрок:Имя"
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Флаг"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9453,7 +9504,7 @@ msgstr "Граница"
 msgid "Score"
 msgstr "Счет"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Команда"
 
@@ -9486,36 +9537,36 @@ msgstr "?Player_dlg:Состояние"
 msgid "Ping"
 msgstr "Пинг"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Вы не можете продать улучшения"
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Продано %d %s за %d золота."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Нельзя продать %s."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Вы не можете распускать соединения."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "Соединение %s не может быть распущено."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Распустить %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Нельзя распустить %s."
@@ -9834,64 +9885,69 @@ msgstr "Золото: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr " Нал: %d Рос: %d Нау: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Двигается: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Двигается: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Нажмите для большей информации)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "Народ %s"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Ход: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Золото: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Ожидаемый доход: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Налоги: Золото:%d%% Роскошь:%d%% Наука:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Изучаем %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Вероятность глобального потепления: %d%% (%+d%%/ход)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Вероятность ядерной зимы: %d%% (%+d%%/ход)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Форма правления: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9900,21 +9956,21 @@ msgstr[1] "%d соединения"
 msgstr[2] "%d соединений"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr "Недоступно"
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Ходов до цели: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Ходов до цели: от %d до %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
@@ -9922,34 +9978,34 @@ msgstr[0] "Выбрано %d соединение"
 msgstr[1] "Выбрано %d соединения"
 msgstr[2] "Выбрано %d соединений"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Нет выбранных соединений."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Другие: %d гражданских; %d военных"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Другие: %d гражданских"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Другие: %d военных"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Нет соединений для модернизации!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Ни одно из этих соединений не может быть модернизировано."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9967,72 +10023,72 @@ msgstr[2] ""
 "Модернизировать %d соединений за %d золота?\n"
 "В казне %d золота."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Показывает прогресс в изучении текущей технологии."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "нет цели исследований"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Показывает прогресс в глобальном потеплении:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Уровень загрязнения:    %3d"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Вероятность катастрофического потепления каждый ход: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Показывает прогресс ядерной зимы:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Уровень радиоактивного загрязнения: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Вероятность катастрофической зимы каждый ход: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Показывает Вашу нынешнюю форму правления:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Население:      %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Поддержка:      %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Энергия:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -10041,96 +10097,96 @@ msgstr[1] "Масса:            %5d тонны"
 msgstr[2] "Масса:            %5d тонн"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Время путешествия: %5.1f лет"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Время путешествия:   Нет данных   "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Вероят. успеха:    %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Год прибытия: %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?timeout:выкл"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?секунды:%02dс"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02dм %02dс"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02dч %02dм"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02dд %02dч"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:переполнение"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d мс"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s из %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Наблюдатель: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Здания: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Нет.  "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Чудеса: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Города: всего %d, на %d больше, чем порог (%d городов)."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10139,7 +10195,7 @@ msgstr[1] "%d нейтральных до штрафа."
 msgstr[2] "%d нейтральных до штрафа."
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10148,16 +10204,16 @@ msgstr[1] "%d дополнительных несчастных граждан."
 msgstr[2] "%d дополнительных несчастных граждан."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Действует военное положение ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "без максимума, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10166,20 +10222,20 @@ msgstr[1] "%d соединения максимум, "
 msgstr[2] "%d соединений максимум, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d на соединение).  "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Военные соединения вне городов могут вызвать недовольство. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Военные соединения не имеют эффекта на счастье."
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Роскошь: %d всего."
@@ -10227,12 +10283,12 @@ msgid ""
 "have a look."
 msgstr "Губернатор запутался, разбираясь с %s. Взгляните сами."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "нет"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "специальный"
 
@@ -10286,11 +10342,13 @@ msgid "Ooops..."
 msgstr "Опаньки..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Это соединение не может быть завербовано!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10307,6 +10365,7 @@ msgstr "Подкупить вражеское соединение"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10347,6 +10406,7 @@ msgstr "Открытия"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "На усмотрение шпиона"
 
@@ -10371,12 +10431,13 @@ msgstr "Здания:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Городское производство"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Вы не можете взбунтовать %s."
@@ -10388,6 +10449,7 @@ msgstr "Не можем взбунтовать город!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10404,6 +10466,7 @@ msgstr "Вызвать революцию!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10413,6 +10476,7 @@ msgstr ""
 "В казне %d золота."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10482,10 +10546,12 @@ msgid "Subvert Enemy Unit"
 msgstr "Переманить вражеское соединение"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr "Дипломат ожидает Ваших указаний"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr "Шпион ожидает Ваших указаний"
 
@@ -10585,7 +10651,7 @@ msgstr "Загрязнение:"
 msgid "_Overview"
 msgstr "_Обзор"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10610,11 +10676,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d ходов"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "Купить (_B)"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr "Производство (_P)"
 
@@ -10733,7 +10799,7 @@ msgstr "Поддерживаемые войска: %d"
 msgid "Present units %d"
 msgstr "Присутствующие соединения: %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Центр (_t)"
 
@@ -10822,31 +10888,31 @@ msgstr "Переименовать город"
 msgid "What should we rename the city to?"
 msgstr "Как переименовать город?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "Изменить (_g)"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Добавить первым (_F)"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Добавить следующим (_N)"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "Добавить последним (_L)"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "Выбрать (_S)"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr "Показать (_D)"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10856,12 +10922,12 @@ msgstr "Показать (_D)"
 msgid "Cities"
 msgstr "Города"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr "Осмотреть (_I)"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10870,85 +10936,90 @@ msgstr "Осмотреть (_I)"
 msgid "Improvements"
 msgstr "Здания"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Чудеса"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Все города"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Нет городов"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Обратить выделение"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Строим соединения"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Строим здания"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Строим чудеса"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Строим соединение"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Строим здание"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Строим чудо"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Приморские города"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Тот же остров"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Поддерживаемые соединения"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Присутствующие соединения"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Улучшения в городе"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Чудеса в городе"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Доступные соединения"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Доступные здания"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Доступные чудеса"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Общая стоимость: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -11014,121 +11085,121 @@ msgstr "Как назвать пре-установку?"
 msgid "Remove this preset?"
 msgstr "Удалить эту установку?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "_Идти к"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr "Осмотреть город (_C)"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Вы сказали, что хотите революцию?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Революция!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Что разрушать"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Выберите, что разрушать:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Соединение"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Название"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Выбор соединений"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "Приготовить всех (_R)"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "Усыпить незанятых (_S)"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
 msgstr "Группы народов (_G):"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Каким народом Вы будете управлять?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Выбрать народ"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
 msgstr "Случайный народ (_R)"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Выберите народ"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "Свойства (_P)"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "Лидер (_L):"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "Женский (_F)"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "Мужской (_M)"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
 msgstr "Стили городов (_S):"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 msgid "_Description"
 msgstr "Описание (_D)"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Вы должны указать свой пол."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Вы должны выбрать стиль Ваших городов."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Вы должны ввести нормальное имя."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Модернизировать соединение!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11389,60 +11460,66 @@ msgstr ""
 msgid "Not _ready"
 msgstr "Не готов (_r)"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "Готов (_R)"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "Начать (_S)"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Управлять этим игроком"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Выбрать народ (_N)"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "Наблюдать (_O)"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr "Не наблюдать (_o)"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<Компьютер>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<Компьютер новичок>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<Компьютер лёгкий>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<Компьютер нормальный>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<Компьютер сложный>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Случайный"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Наблюдатель"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Отсоединён"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Вы действительно хотите выйти?"
 
@@ -12356,216 +12433,216 @@ msgstr "Подключиться к сетевой игре (_o)"
 msgid "Connect to Gaming _Zone"
 msgstr "Подключиться к Gaming Zone (_Z)"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Пароли не совпадают, введите пароль."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Имя сервера"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Порт"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Версия"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Состояние"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Игроки"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Комментарий"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Локальная сеть (_A)"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Интернет Метасервер (_M)"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "Сервер (_H):"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "Порт (_P):"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "Логин (_L):"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "Пароль (_w):"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Повторите Пароль (_i):"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "Подключиться (_o)"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Имя подключения: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Имя игрока: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Хост: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Информация об игроке/подключении"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "Информация о %s"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Изменить готовность игрока"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Выбрать народ"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Наблюдать за этим игроком"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Управлять этим игроком"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Прервать подключение"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "Сменить статус компьютерного управления"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Удалить игрока"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Дать уровень доступа info"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "Дать уровень доступа ctrl"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "Включить в %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr "Число игроков (Включая компьютерных игроков) (_P):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr "Уровень компьютерного противника (AI) (_L):"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "_Правила:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Доп. настройки игры... (_M)"
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 #, fuzzy
 msgid "Record"
 msgstr "Рекорд"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Готов"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Лидер"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Выберите сохранённую игру, которую Вы хотите загрузить"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Выберите игру, которую Вы хотите загрузить (_L):"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "Обзор... (_B)"
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Выберите сценарий"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Выберите сценарий (_S):"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Тип"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Выберите народ, которым Вы будете играть (_n):"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Выберите место для сохранения"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Сохранить игру"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Сохранённые игры (_G):"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Имя файла сохранения (_F):"
 
@@ -12600,7 +12677,7 @@ msgstr "?Здание:Название"
 msgid "Count"
 msgstr "Количество"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12842,28 +12919,28 @@ msgstr "Рабочие списки (_W):"
 msgid "Edit Global _Worklists"
 msgstr "Редактировать глобальные списки работ (_W)"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Ходы"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "Исходные задачи (_T):"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Показать будущие цели (_F)"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Текущий список работ (_W):"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "Добавить глобальные списки работ (_A)"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Изменить производство (_g)"
 
@@ -13156,8 +13233,8 @@ msgid "City shrinks: %d %s"
 msgstr "Город уменьшается: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13260,11 +13337,11 @@ msgstr "Отчёт по гарнизону"
 msgid "Maintenance Report"
 msgstr "Отчёт по поддержке"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "список работ"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -13688,21 +13765,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr "  -t,  --theme THEME\tИспользовать тему THEME\n"
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr "Создаю скриншот fc_%05d.bmp"
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Используется видеовыход: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Инициализация клиента"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Ожидание начала игры"
 
@@ -15007,7 +15084,7 @@ msgstr "Стиль городов:"
 msgid "Unit Selection"
 msgstr "Выбор соединений"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "НИЧЕГО"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 88330e2..f10e74a 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 39607f7..eecd402 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -61,7 +61,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Freeciv 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2008-04-05 00:14+0100\n"
 "Last-Translator: Susanna Björverud <susanna.bjorverud at telia.com>\n"
 "Language-Team: Swedish <freeciv.sv at freelists.org>\n"
@@ -104,22 +104,22 @@ msgstr "välfärd"
 msgid "Science"
 msgstr "forskning"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?byggt:B"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?underverk:u"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?föråldrat:F"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?byggt:B"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?underverk:u"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -539,81 +539,81 @@ msgstr "Anslutnings- och frånkopplingsmeddelanden"
 msgid "AI Debug messages"
 msgstr "Datorstyrningsavlusningsmeddelanden"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "?attitude:Massmordsbenägen"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "?attitude:Aggressiv"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "?attitude:Fientlig"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "?attitude:Ohjälpsam"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "?attitude:Nervös"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "?attitude:Likgiltig"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "?attitude:Vördsam"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "?attitude:Hjälpsam"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "?attitude:Entusiastisk"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "?attitude:Beundrande"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "?attitude:Dyrkande"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "?diplomatic_state:vapenvila"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?diplomatic_state:krig"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:vapenstillestånd"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?diplomatic_state:fred"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?diplomatic_state:förbund"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?diplomatic_state:aldrig mötts"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "?diplomatic_state:lag"
 
@@ -659,14 +659,14 @@ msgstr "%s trupper"
 msgid "Size %d"
 msgstr "Storlek %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "Framtidsteknologi %d"
 
 # DM> Jag tror att detta genus passar bättre
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -678,65 +678,65 @@ msgstr "Framtidsteknologi %d"
 msgid "None"
 msgstr "Inget"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "Framtidsteknologi."
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Okänd)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "väg"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "bevattning"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "järnväg"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "gruva"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "utsläpp"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "hydda"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "fästning"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "flod"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Ã¥kermark"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "flygbas"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "nedfall"
 
@@ -842,11 +842,11 @@ msgstr "kärnvapen"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " och "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?and:, "
 
@@ -1006,81 +1006,81 @@ msgid_plural " (total %d repeats)"
 msgstr[0] " (Sammanlagt %d upprepning.)"
 msgstr[1] " (Sammanlagt %d upprepningar.)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "Tomt argument för \"%s\".\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "Argument saknas för \"%s\".\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d f. Kr."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d e. Kr."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH är satt men tom; använder standardsökvägen i stället."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Kunde inte läsa datakatalogen %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "Datasökvägen kan ställas in med omgivningsvariabeln FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Den nuvarande datasökvägen är \"%s\"."
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Filen \"%s\" krävs ... avbryter!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 "%s: Allvarligt fel: du försöker köra mig som användare med fullständiga "
 "rättigheter!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Använd ett konto med begränsade rättigheter i stället.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "exakt träff"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "enda träff"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "flertydigt"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "tom"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "för lång"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "icketräff"
 
@@ -1109,24 +1109,24 @@ msgstr "%s har börjat bygga %s i %s."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s säljer %s (som ej behövs) för %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 "*%s (datorstyrd)* Datorstyrd spelare i bortaläge kan inte anta ett sådant "
 "avtal"
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (datorstyrd)* Bryt först förbundet med %s, %s"
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (datorstyrd)* Låt oss först upphöra med fientligheter, %s"
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1135,51 +1135,51 @@ msgstr ""
 "*%s (datorstyrd)* Jag vill se att du kan hålla vårt vapenstillestånd först, %"
 "s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 "*%s (datorstyrd)* Jag litar ännu inte på dig såpass att jag vågar ingå ett "
 "förbund med dig, %s"
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (datorstyrd)* Jag känner inte till staden du nämner."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 "*%s (datorstyrd)* Jag är rädd för att det inte är vist att dela anblick med "
 "Er."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (datorstyrd)* Det här är inte ett acceptabelt avtal, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (datorstyrd)* Välkommen i vårt förbund %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (datorstyrd)* Ja, må vi stå enade för evigt, %s"
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (datorstyrd)* Ja, fred i vår tid!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (datorstyrd)* Avgjort. Inga fler fientligheter, %s"
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1188,24 +1188,24 @@ msgstr ""
 "*%s (datorstyrd)* Var hälsad %s! Får vi lov att föreslå ett vapenstillestånd "
 "medan vi lär känna varandra bättre?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (datorstyrd)* Rymden må aldrig bli din."
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "*%s (datorstyrd)* Jag har fått stå ut med dina nycker länge nog! Nu drar vi "
 "ut i krig!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (datorstyrd)* Fred i ... någon annan tid"
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1214,17 +1214,17 @@ msgstr ""
 "*%s (datorstyrd)* Slutligen möts vi! Trodde du verkligen att du skulle komma "
 "undan med dina förbrytelser?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (datorstyrd)* Dina skumraskaffärer har kostat dig detta krig!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (datorstyrd)* Dina fientligheter mot %s var ditt sista mistag!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1239,7 +1239,7 @@ msgstr[1] ""
 "*%s (datorstyrd)* Jag kommer starta krig mot %s om %d omgångar för att sätta "
 "stopp för dennes rymdskepp."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1248,7 +1248,7 @@ msgstr ""
 "*%s (datorstyrd)* Jag ser fram emot din hjälp i detta ärende. Länge leve "
 "vårt storslagna förbund!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1267,7 +1267,7 @@ msgstr[1] ""
 "egen vinnings skull. Jag kommer förklara krig om %d omgångar och förväntar "
 "mig att ni gör detsamma!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1282,7 +1282,7 @@ msgstr[1] ""
 "*%s (datorstyrd)* Jag har för avsikt förklara krig mot %s om %d omgångar för "
 "att plundra dem på deras rikedomar."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1290,7 +1290,7 @@ msgstr ""
 "*%s (datorstyrd)* Önskar du ha del i krigsbytet så varsågod att ta del i "
 "striden också."
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1305,14 +1305,14 @@ msgstr[1] ""
 "*%s (datorstyrd)* Jag har fått nog av %s. Tiden har kommit att slita dem i "
 "stycken. Jag förklarar krig om %d omgångar."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (datorstyrd)* Jag förutsätter att ni, min betrodde bundsförvant, "
 "medverkar i detta krig."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1327,7 +1327,7 @@ msgstr[1] ""
 "*%s (datorstyrd)* Jag har för avsikt att hedra vårt förbund och förklara "
 "krig mot %s om %d omgångar. Håll ut - vi är på väg!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1342,7 +1342,7 @@ msgstr[1] ""
 "*%s (datorstyrd)* Jag har för avsikt att hedra mitt förbund med %s och "
 "förklara krig mot %s om %d omgångar. Vi förutsätter att ni gör detsamma."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1351,7 +1351,7 @@ msgstr ""
 "*%s (datorstyrd)* Ditt försök att erövra utrymme för endast dig själv "
 "avslöjar dina sanna avsikter, så jag har nog av vårt förbund!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1360,7 +1360,7 @@ msgstr ""
 "*%s (datorstyrd)* Ditt försök att ensam härska i yttre rymden är mycket "
 "anstötligt."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1369,14 +1369,14 @@ msgstr ""
 "*%s (datorstyrd)* Såvida du inte avbrytter ditt rymdskeppsbygge måste jag "
 "vidtaga åtgärder!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 "*%s (datorstyrd)* Jag är rädd för att det inte längre är vist att dela "
 "anblick med Er."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1385,7 +1385,7 @@ msgstr ""
 "*%s (datorstyrd)* Var hälsad vår mest pålitliga bundsförvant, vi uppmanar er "
 "att utplåna vår fiende, %s"
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1395,7 +1395,7 @@ msgstr ""
 "förklarat krig mot vår fiende, %s. Varför behöver jag påminna dig om dina "
 "löften?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1406,7 +1406,7 @@ msgstr ""
 "fred med vår dödsfiende, %s! Detta är ej godtagbard, vårt förbund har "
 "upphört."
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1415,12 +1415,12 @@ msgstr ""
 "*%s (datorstyrd)* Var hälsad vän, får jag föreslå att vi ingår ett förbund "
 "med varandra?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr "*%s (datorstyrd)* Var hälsad granne, vad sägs om ett fredsfördrag?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1429,7 +1429,7 @@ msgstr ""
 "*%s (datorstyrd)* All denna blodspillan leder ingen vart. Är det inte dags "
 "att gräva ner stridsyxan?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1439,57 +1439,62 @@ msgstr ""
 "hjälp! Hedra vårt förbund och er hjälpsamhet kommer inte gå förbi obemärkt!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, c-format
 msgid "Auth option \"%s\":"
 msgstr "Rättighetsinställning \"%s\":"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr " saknas från konfigfil (använder standard)"
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr " (standard)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr " (konfig)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr " (inställd)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Rättighetskonfigfilnamn \"%s\" ej tillåtet!"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Kan inte läsa in konfigfilen \"%s\"!"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr "Varning: Gästnamnet '%s' är upptaget. Namnet bytt till '%s'."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Gäster är tyvärr inte välkomna på den här servern."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s avvisades: Gäster ej välkomna."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1498,7 +1503,7 @@ msgstr ""
 "Ett fel inträffade medan användardatabasen lästes in; loggar in som gäst '%"
 "s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1506,39 +1511,39 @@ msgstr ""
 "Ett fel inträffade medan användardatabasen lästes in och gäster är tyvärr "
 "inte välkomna."
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s avvisades: databasfel samt gäster ej tillåtna"
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "Mata in lösenord för %s:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Mata in ett nytt lösenord (och kom ihåg det)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Denna server tillåter tyvärr endast föranmälda användare."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s avvisades: endast föranmälda användare välkomna."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Tyvärr: för många felaktiga försök..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr "%s avvisades: för många felaktiga lösenordsförsök för ny användare."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1546,30 +1551,30 @@ msgstr ""
 "Varning: Ett fel inträffade medan databasen sparades. Fortsätter, men din "
 "statistik kommer inte sparas."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s avvisades: För många felaktiga lösenord."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Ditt lösenord är felaktigt. Försök igen."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Din anslutning tog tyvärr för lång tid..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s avvisades: anslutningen tog för lång tid vändandes på lösenord."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "Ditt lösenord är för kort; kortaste tillåtna längd är %d. Försök igen."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2347,16 +2352,14 @@ msgid "Cast a vote."
 msgstr "Rösta"
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "En spelare med info level access som utför ett kontrollnivåkommando startar "
 "en ny röstning motsvarande detta kommando. Med kommandot /vote följt av \"yes"
@@ -2366,7 +2369,7 @@ msgstr ""
 "omedelbart om åtminstone hälften av spelarna röster emot det. I det fall en "
 "hel omgång passerar godtas förslaget i det fall ingen har röstat emot det."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2374,11 +2377,11 @@ msgstr ""
 "debug [ player <spelare> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<spelare> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Sätt på eller stäng av datorstyrningsavlusning av angivet objekt."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2386,23 +2389,23 @@ msgstr ""
 "Skriv datorstyrningsavlusningsinformation om angiven del och sätt på eller "
 "stäng av fortsatta utskrifter för objektet."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <tillval> <värde>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Ställer in servertillval."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <spelare> [lag]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Ändra, lägg till eller ta bort en spelares lagtillhörighet."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2414,15 +2417,15 @@ msgstr ""
 "som börjar som bundsförvanter med delad anblick och ambassader och kämpar "
 "tillsammans för att nå lagseger med medelvärdet av varandras värdering."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <katalog>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Välj katalog för regler eller modifikation."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2431,15 +2434,15 @@ msgstr ""
 "argument visar den valda regeluppsättningen."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <metarad>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Ställ in upplysningsrad för metaservern."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2452,19 +2455,19 @@ msgstr ""
 "genererade meddelanden om den är inställd."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <metarad>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Sätt patchrad för pmetaservern."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Styr metaserveranslutning."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2477,33 +2480,33 @@ msgstr ""
 "metaservern."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <adress>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Sätt adressen (URL) till metaservern att meddela till."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <spelarnamn>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Växla datorstyrningsstatus för spelare."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [anslutningsnamn] <spelarnamn>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Ta över en spelares plats i spelet."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2518,15 +2521,15 @@ msgstr ""
 "tilldelas denna anslutning."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [anslutningsnamn] [spelarnamn]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Iakttag en spelare eller hela spelet."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2541,15 +2544,15 @@ msgstr ""
 "kopplad till en global iakttagare."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <anslutningsnamn>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "skilj från en spelare."
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2558,21 +2561,21 @@ msgstr ""
 "anslutningar att överge en spelare."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <spelarnamn>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Skapa en datorstyrd spelare med ett givet namn."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr ""
 "Kommandot \"create\" är endast tillgängligt innan spelet har satts i gång."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2580,16 +2583,16 @@ msgstr ""
 "borta\n"
 "borta"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Försätt dig själv i bortaläge. Då styr datorn spelet åt dig."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "Datorn kommer att styra ditt folk med mista möjliga ändringar."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2597,11 +2600,11 @@ msgstr ""
 "novice\n"
 "novice <spelarnamn>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Sätter en eller alla datorstyrda spelare till \"novice\"."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2613,7 +2616,7 @@ msgstr ""
 "kommandot skicklighetsläget för endast den spelaren."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2621,11 +2624,11 @@ msgstr ""
 "easy\n"
 "easy <spelarnamn>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Sätter en eller alla datorstyrda spelare till \"easy\"."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2637,7 +2640,7 @@ msgstr ""
 "skicklighetsläget för endast den spelaren."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2645,11 +2648,11 @@ msgstr ""
 "normal\n"
 "normal <spelarnamn>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Sätter en eller alla datorstyrda spelare till \"normal\"."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2661,7 +2664,7 @@ msgstr ""
 "kommandot skicklighetsläget för endast den spelaren."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2669,11 +2672,11 @@ msgstr ""
 "hard\n"
 "hard <spelarnamn>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Sätter en eller alla datorstyrda spelare till \"hard\"."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2685,7 +2688,7 @@ msgstr ""
 "skicklighetsläget för endast den spelaren."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2693,11 +2696,11 @@ msgstr ""
 "experimental\n"
 "experimental <spelarnamn>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Sätter en eller alla datorstyrda spelare till \"experimental\"."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2710,7 +2713,7 @@ msgstr ""
 "sätter kommandot skicklighetsläget för endast den spelaren."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2724,11 +2727,11 @@ msgstr ""
 "cmdlevel <läge> first\n"
 "cmdlevel <läge> <anslutninsnamn>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Ansök om eller bestäm läge för kontrollnivå."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2767,20 +2770,20 @@ msgstr ""
 "obetrodd person skulle kunna återansluta med samma namn. Lägg märke till att "
 "detta kommando nu tar emot anslutningsnamn, inte spelarnamn."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "Bli spelledare med utökade rättigheter, ifall en sådan saknas."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <omgång> <omgångsökning> <värde> <värdefaktor>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "Se \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2795,24 +2798,24 @@ msgstr ""
 "1."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "endgame"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Avsluta spelet med en gång utan att ge någon segern."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "surrender"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Erkänn sig besegrad."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2821,15 +2824,15 @@ msgstr ""
 "således endast en spelare (eller ett lag) kvar avslutas spelet."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <spelarnamn>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Tag bort spelare fullständigt från spelet."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2838,7 +2841,7 @@ msgstr ""
 "städer och trupper. Använd med försiktighet!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2846,11 +2849,11 @@ msgstr ""
 "save\n"
 "save <filnamn>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Sparar spelet till fil."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2867,7 +2870,7 @@ msgstr ""
 "och använd kommandot \"start\" när alla spelare har återanslutit sig."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2875,11 +2878,11 @@ msgstr ""
 "load\n"
 "load <filnamn>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Läser in spel från fil."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2888,28 +2891,28 @@ msgstr ""
 "servertillval går förlorade eftersom de ersätts med data från filen.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <filnamn>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Utför serverkommandon från fil."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <filnamn>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Skriv nuvarande inställningar som serverkommandon till fil."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "Ändra serverutdata mellan \"RFC-stil\" och vanlig stil."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Returnerar helt enkelt serverns id."
 
@@ -3427,27 +3430,36 @@ msgstr "Vi har orsakat en incident genom att anstifta ett uppror i %s."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s har orsakat en incident genom att anstifta ett uppror i %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr "Marina enheter från starten stöds inte ännu. Ingen fick %s."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Ã…r: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Omgångstidsgränsen har överskridit sitt största värde. Låser den vid sitt "
 "största värde."
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Omgångstidsgränsen är < 0. Låser den vid 0."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Endast GGZ-klienten får anropa civclient i ggz-läga!\n"
 
@@ -3490,25 +3502,25 @@ msgstr "Det finns ingen anslutning med namnet %s."
 msgid "There is no player nor connection by the name %s."
 msgstr "Det finns ingen spelare eller anslutning med namnet %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Global uppvärmning har inträffat!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr "Kuster har översvämmats och stora ytor ängsmark har blivit öken."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Vi har drabbats av atomvinter!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr "Sumpmarker har uttorkats och stora ytor ängsmark har blivit tundra."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3518,7 +3530,7 @@ msgstr ""
 "meddelas.\n"
 "      Arbetare samlas frivilligt och bygger järnvägar genom alla städer."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3528,12 +3540,12 @@ msgstr ""
 "järnväg.\n"
 "      Arbetare samlas frivilligt och bygger järnvägar genom alla städer."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "Vår %s har flyttats på grund av landskapsförändringar."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "Vår %s har upplösts på grund av landskapsförändringar."
@@ -3596,27 +3608,27 @@ msgstr "Revolution: återfaller till anarki."
 msgid "You should choose a new government from the government menu."
 msgstr "Välj ett nytt statsskick från statsskicksmenyn."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Skattesats överskred maximum för %s och justerades."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "Forskningssats överskred maximum för %s och justerades."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "Välfärdssats överskred maximum för %s och justerades."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s ger oss inte längre delad anblick!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3625,7 +3637,7 @@ msgstr ""
 "Senaten tillåter oss inte bryta avtalet med %s. Vi måste antingen upplösa "
 "den eller vänta till tiden är mogen."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
@@ -3633,7 +3645,7 @@ msgstr ""
 "Senaten godkänner din proposition på grund av de ständiga provokationerna "
 "från %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3642,12 +3654,12 @@ msgstr ""
 "Senaten vägrar gå med på att bryta avtalet med %s, men det bör inte vara "
 "svårt för oss att hitta en ny senat."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "Det diplomatiska förhållandet mellan %s och %s är nu %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3655,14 +3667,14 @@ msgid ""
 msgstr ""
 "%s avbröt det diplomatiska samförståndet; %s och %s befinner sig nu i %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 "%s har angripit vår bundsförvant %s! Förbundet drar in även oss i kriget."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3671,26 +3683,26 @@ msgstr ""
 "Vår lagkamrat %s har förklarat krig mot %s. Nu förväntas det av oss att "
 "bryta vårt förbund med %s."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Avlägsnar spelare %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Du har blivit avlägsnad från spelet!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s har blivit avlägsnad från spelet."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "Vi har stött på %s regerade av %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3698,17 +3710,17 @@ msgstr ""
 "%s och %s har mötts och omedelbart startat krig. Vi avbryter förbundet med "
 "båda."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "Kunde inte försätta %s i inbördeskrig - för många spelare"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "Kunde inte försätta %s i inbördeskrig - för många spelare"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3717,12 +3729,12 @@ msgstr ""
 "Vår nation befinner sig i inbördeskrig; %s utropar sig till ledare över "
 "upprorsmakarna."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s svär trohet till %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3962,21 +3974,21 @@ msgstr ":e plats"
 msgid "th"
 msgstr ":e plats"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "Demografisträngen innehåller otillåtna tecken. Försök med \"help demography"
 "\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Demografi"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Demografiredogörelsen är tyvärr ej tillgänglig."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%2$ss %1$s (%3$s)"
@@ -3987,11 +3999,11 @@ msgstr "%2$ss %1$s (%3$s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Kunde inte finna en läsbar regelfil med namnet \"%s.%s\"."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr "Reglerna saknar en barbarnation: åtminstone en behövs!"
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Läser in reglerna"
 
@@ -4005,7 +4017,7 @@ msgstr ""
 "Sparspelet innehåller ofullständig kartdata. Detta kan inträffa med gamla "
 "sparade spel eller tyda på ogiltiga spelfiler. Fortsätt på egen risk."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Sparspelet är för gammalt. Åtminstone version 1.9.0 krävs."
 
@@ -4027,13 +4039,13 @@ msgstr ""
 "s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr "%s har ogiltigt folkslag; byter till %s."
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -4070,7 +4082,7 @@ msgstr "Internt"
 msgid "Networking"
 msgstr "Nätverk"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Alla"
@@ -4091,7 +4103,7 @@ msgstr "Ovanlig"
 msgid "Changed"
 msgstr "Ändrad"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -4099,7 +4111,7 @@ msgstr ""
 "Tillåtna-anslutningar-strängen innehåller otillåtna\n"
 "tecken. Försök med \"help allowconnect\"."
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -4107,7 +4119,7 @@ msgstr ""
 "Strängen över starttrupper innehåller otillåtna\n"
 "bokstäver. Försök med \"help startunits\"."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4116,15 +4128,15 @@ msgstr ""
 "Strängen över starttrupper saknar åtminstone\n"
 "en stadsgrundande trupp. Försök med \"help startunits\"."
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr "Kan inte sätta endyear till tidigare än nuvarande år."
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "Kan inte justera högsta tillåtna antal spelare i GGZ-läge."
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
@@ -4132,11 +4144,16 @@ msgstr ""
 "Antal spelare är högre än efterfrågat värde;\n"
 "Behåller tidigare värde"
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Du har inte tillåtelse att sätta detta tillval."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Kartstorlek (i tusental rutor)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4146,12 +4163,12 @@ msgstr ""
 "  size = 4 är en normal karta på 4,000 rutor (standard)\n"
 "  size = 20 är en gigantisk karta på 20,000 rutor"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Karttopologiindex"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4220,11 +4237,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Metod att generera kartan"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4244,11 +4261,11 @@ msgstr ""
 "startpos värdet noll används detta värde istället. Se inställningen "
 "\"startpos\"."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Medod att bestämma startpositioner"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4268,35 +4285,35 @@ msgstr ""
 "Beakta att antalet kontinenter kommer anpassas till valet av "
 "startpositionsmetod i kombination med antalet spelare."
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "Tillåt öar med storlek 1×1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = inga 1×1-öar; 1 = vanligtvis några 1×1-öar"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Poler är separata kontinenter"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr "0 = poler hänger samman med övriga världsdelar, 1 = avskilda poler"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Hela kartan har samma klimat"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = normal Jord-liknande planet; 1 = helt tempererad planet "
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Planetens medeltemperatur"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4327,11 +4344,11 @@ msgstr ""
 "\n"
 "0 innebär en ytterst kall planet med stor polaris och ingen tropik."
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Procentandel av kartan som består av land"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
@@ -4339,11 +4356,11 @@ msgstr ""
 "Denna inställning bestämmer den ungefärliga procentandelen av kartan som "
 "kommer utgöras av land."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Mängd kullar/berg"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4351,11 +4368,11 @@ msgstr ""
 "Låga värden ger platta kartor, medan högre värden ger brantare kartor med "
 "fler kullar och berg."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Mängd vatten på land"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4363,11 +4380,11 @@ msgstr ""
 "Låga värden innebär gott om torrt ökenliknande land; höga värden ger en "
 "våtare karta med mer sumpmarker, djungler och floder."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Kartfrö"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4377,11 +4394,11 @@ msgstr ""
 "väljs frö baserat på tiden, för att skapa en slumpmässig karta. Denna "
 "inställning är bara av intresse vid felsökning av spelet."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Spelfrö"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4389,11 +4406,11 @@ msgstr ""
 "För noll (standardvärdet) väljs frö baserat på tiden. Denna inställning är "
 "bara av intresse vid felsökning av spelet."
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "Mängd rutor med \"speciella\" tillgångar"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4401,11 +4418,11 @@ msgstr ""
 "Speciella tillgångar förbättrar den grundläggande terrängtyp som de befinner "
 "sig på. Servervariabelns skala är tusendelar."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Mängd hyddor (mindre stambyar)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4413,23 +4430,24 @@ msgstr ""
 "Denna inställning anger det exakta antal hyddor som kommer placeras ut på "
 "kartan. Hyddor är mindre stambyar som kan besökas av trupper."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "Minsta möjliga antal spelare"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Minst så här många spelare (mänskliga eller datorstyrda) måste finnas innan "
 "spelet kan börja."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "Flesta möjliga antal spelare"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4439,11 +4457,11 @@ msgstr ""
 "spelet. Har så här många spelare anslutit innan spelet påbörjas, avvisas "
 "alla ytterligare spelare som försöker ansluta."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Totalt antal spelare (inklusive datorstyrda)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4451,11 +4469,11 @@ msgstr ""
 "Om det finns färre än så här många spelare när spelet börjar skapas "
 "ytterligare datorstyrda spelare för att öka antalet spelare till detta värde."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Lista över spelares starttrupper"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4483,27 +4501,27 @@ msgstr ""
 "    a   = Anfallstrupp (t.ex. Ryttare)\n"
 "    A   = Stark anfallstrupp (t.ex. Katapult)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Område där starttrupper befinner sig"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "Detta är radien inom vilken starttrupperna är utspridda."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Tilldelad mängd guld per spelare"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Varje spelare är tilldelad denna mängd guld vid spelets början."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Antal inledande teknologier per spelare"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4515,11 +4533,11 @@ msgstr ""
 "tech_cost_style i reglerna, kan ett stort värde på techlevel göra framtida "
 "teknologier riktigt kostsamma."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Procentfaktor för teknologikostnad"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4529,11 +4547,11 @@ msgstr ""
 "för teknologier multipliceras med detta procentvärde. Den grundläggande "
 "teknologikostnaden avgörs av reglerna eller andra inställningar."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Procent straffavgift vid byte av teknologi"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4543,11 +4561,11 @@ msgstr ""
 "positivt forskningsvärde förlorar man så här många procent av det. Detta "
 "gäller ej om man just gjort ett framsteg denna omgång."
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Avgift vid anskaffning av teknologi eller guld genom avtal"
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4559,11 +4577,11 @@ msgstr ""
 "forska fram ett nytt framsteg. Forskningsvärdet kan bli negativ efter detta "
 "i fall att kostnaden är nollskild. Gäller även guld."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Straffavgift vid anskaffning av teknologi genom erövring"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4574,11 +4592,11 @@ msgstr ""
 "kostnaden att forska fram ett nytt framsteg. Forskningsvärdet kan bli "
 "negativ efter detta i fall att kostnaden är nollskild."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Straffavgift vid erhållande av gratis teknologi"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4592,11 +4610,11 @@ msgstr ""
 "kostnaden att forska fram ett nytt framsteg. Forskningsvärdet kan bli "
 "negativt efter detta i fall att kostnaden är nollskild."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Mat som krävs för att en stad skall växa"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4606,11 +4624,11 @@ msgstr ""
 "multipliceras med en faktor som bestäms i reglerna och hänger samman med "
 "stadens storlek."
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr "Procent mat som går till spillo när byggnad behövs"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4620,11 +4638,11 @@ msgstr ""
 "(eller ett avloppssystem), förlorar den så här många procent av sitt "
 "matförråd (eller hälften så mycket om den har sädeslager)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Procentfaktor för produktionskostnad"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4632,13 +4650,13 @@ msgstr ""
 "Detta påverkar hur snabbt trupper och byggnader produceras. Grundkostnaden "
 "multipliceras med detta procentvärde."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Minsta stadsstorlek för full handel"
 
 # DM> Ändrade "mutning" till "korruption" här och på flera andra ställen -
 # Onödigt otydlig försvenskning!
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4650,11 +4668,11 @@ msgstr ""
 "och minskar gradvis till 0% (ingen begränsning förutom vanlig korruption) "
 "för städer med storlek=fulltradesize. Se även notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Största storleken för en stad utan handel"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4664,11 +4682,11 @@ msgstr ""
 "Handeln ökar gradvis för städer större än notradesize och mindre än "
 "fulltradesize. Se även fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "Stadsstorlek innan befolkningen blir missnöjd"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4677,11 +4695,11 @@ msgstr ""
 "stad nöjda, och de efterföljande medborgarna är missnöjda. Se även "
 "cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Antal städer för högre missnöje"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4693,11 +4711,11 @@ msgstr ""
 "unhappysize. Detta förutsätter demokrati; för andra statsskick sker detta "
 "redan vid lägre antal städer."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Minsta avståndet mellan städer"
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4709,11 +4727,11 @@ msgstr ""
 "exempel är 3 så måste det vara minst 2 tomma rutor mellan varje stad. Om det "
 "är satt till 0 (standard) så används värdet i reglerna i stället."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Antal omgångar mellan effekt av hänryckning"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4721,11 +4739,11 @@ msgstr ""
 "Sätter antalet omgångar mellan stadstillväxt orsakad av hänryckning. Om satt "
 "till n så växer staden efter att ha firat i n+1 omgång(ar)."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Sannolikhet att erövrad byggnad förstörs"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4733,11 +4751,11 @@ msgstr ""
 "När en spelare erövrar en stad har varje stadsförbättring denna sannolikhet "
 "att bli förstörd."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Sannolikhet att flytta sig till ruta efter angrepp"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4750,11 +4768,11 @@ msgstr ""
 "rutan om de vinner över den sista fiendetruppen där. Värden mellan 0 och 100 "
 "ger varierande sannolikhet att områdets \"besätts\"."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Slå av eller på autoattack"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4762,11 +4780,11 @@ msgstr ""
 "Om påslaget kan trupper med drag kvar vid omgångens slut attackera "
 "fiendetrupper som flyttar till en angränsande ruta."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Minska stads storlek efter lyckat angrepp"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4782,11 +4800,11 @@ msgstr ""
 "  4 = heli\n"
 "  8 = flyg"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Nationsgränsers räckvidd"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4796,11 +4814,11 @@ msgstr ""
 "ägare. Särskilda regler gäller havsrutor samt rutor inom radien av fler än "
 "ett folks stad."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Trupper inom ens gränser orsakar ej missnöje"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
@@ -4808,11 +4826,11 @@ msgstr ""
 "Trupper orsakar inte missnöje när de befinner sig inom våra egna gränser när "
 "detta alternativ är valt."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Förmågan att utöva diplomati med andra spelare"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4826,11 +4844,11 @@ msgstr ""
 "3 = diplomati är endast tillåtet inom lag.\n"
 "4 = diplomati är inte tillåtet för någon."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "Accepterade stadsnamn"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4854,11 +4872,11 @@ msgstr ""
 "3 = En spelare får inte välja ett namn som finns uppräknat i ett annat folks "
 "stadslista."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Barbarfrekvens"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4872,19 +4890,19 @@ msgstr ""
 "3 = hög barbarfrekvens \n"
 "4 = rasande horder, massor av barbarer"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Barbarernas inträdesår"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbarer dyker inte upp före detta år."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Revolutionslängd"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4892,11 +4910,11 @@ msgstr ""
 "Vid byte av statsskick infaller detta antal omgångar anarki. Värdet noll "
 "innebär ett slumpmässigt antal mellan 1-6."
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Aktiverar krigsdimma"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4906,11 +4924,11 @@ msgstr ""
 "ens egna trupper och städer. Man kan inte se nya städer, om städer har växt "
 "eller landskapsförändringar som skett utanför synfältet."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Grundläggande sannolikhet att diplomater och spioner lyckas."
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4919,19 +4937,19 @@ msgstr ""
 "Sannolikheten att en spion återvänder från ett lyckat uppdrag samt den "
 "grundläggande chansen för diplomater och spioner att lyckas med dessa."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Tillåt rymdkapplöpning"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Möjliggör spelare att bygga rymdskepp."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "Minsta antal städer för inbördeskrig"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4941,11 +4959,11 @@ msgstr ""
 "dennes huvudstad faller. Om detta tillval är satt till sitt största värde är "
 "inbördeskrig helt avstängt."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Omgångar innan kontakt tappas"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4955,11 +4973,11 @@ msgstr ""
 "trupper senast möttes, även om de ej har ambassader hos varandra. Sätt detta "
 "till 0 för att förhindra möte utan ambassad."
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Bygg nytt slott om huvudstad förloras"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4971,21 +4989,21 @@ msgstr ""
 "städer man har kvar. Detta är viktigt eftersom du inte behöver kunskap om "
 "relevant teknologi för att få ett nytt palats."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Naturliga stadsnamn"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr "Om detta är valt avgörs stadsnamnen efter det omgivande landskapet."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Spelare som användare tillåts ta"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -5052,11 +5070,11 @@ msgstr ""
 "4 = Styrande anslutning ej tillåten, iakttagare tillåtna;\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Växla datorstyrningsläge för anslutning"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -5064,24 +5082,27 @@ msgstr ""
 "Om detta är satt till 1 stängs datorstyrning av när en spelare ansluter och "
 "sätts på när en spelare kopplar från."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Spelets slutår"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Spelet avgörs detta år."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Högsta möjliga antalet sekunder per omgång"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Om inte alla spelare har tryckt på \"Avsluta omgång\" innan denna tid löpt "
 "ut, avslutas omgången av sig själv. Noll anger att omgångar inte "
@@ -5089,11 +5110,11 @@ msgstr ""
 "självständigt. Använd detta med \"timeoutincrease\" för att ha en "
 "självförändrande tidsgräns."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "Timeout i åtminstone n sekunder efter fienden flyttat"
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
@@ -5101,11 +5122,11 @@ msgstr ""
 "Då en trupp flyttar medan inom synhåll för fiendespelare, sätts den "
 "återstående timeouten till detta värde i de fall det är lägre."
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Simultana spelarfaser."
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
@@ -5113,11 +5134,11 @@ msgstr ""
 "Om aktiverat sker alla spelares drag simultant; om deaktiverat turas spelare "
 "Ã¥t om dragen."
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "Sekunder att låta en klientanslutning blockera ett spel"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -5127,11 +5148,11 @@ msgstr ""
 "stängs den ned. Noll betyder att det inte finns någon tidsgräns (även om "
 "anslutningar ändå stängs ned så småningom)."
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Max antal sekunder för tömning av nätverksbuffer"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -5141,33 +5162,33 @@ msgstr ""
 "att alla klientanslutningars nätverksbuffrar svarar. Noll betyter att "
 "servern inte kommer att vänta alls."
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "Sekunder mellan PING:ar"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr ""
 "civserver kommer att kontakta klienterna med en PING-förfrågning så här ofta."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "Tid för att koppla bort en klient"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Om en klient inte svarar på ett PING inom detta antal sekunder kopplas "
 "klienten bort."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Vänta på alla spelare"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5175,11 +5196,11 @@ msgstr ""
 "Om detta sätts till 1 avslutas aldrig en omgång förrän alla spelare har "
 "gjort sitt drag, inklusive frånkopplade spelare."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Omgångar med fast längd"
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
@@ -5187,11 +5208,11 @@ msgstr ""
 "Om detta är satt till 1 avslutas aldrig en omgång förrän tiden har löpt ut, "
 "oavsett om samtliga spelare har tryckt på \"Avsluta omgång\"."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "Vad som finns i demografiredogörelsen"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5229,11 +5250,11 @@ msgstr ""
 "    b = visa kolumnen \"bästa stat\"\n"
 "Skiftläge har betydelse men inte tecknens ordning."
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Omgångar mellan autospar"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5241,11 +5262,11 @@ msgstr ""
 "Spelet kommer att autosparas varje gång detta antal rundor har passerat. "
 "Noll innebär att spelet aldrig sparas automatiskt."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Packningsgrad för sparade spel"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5255,11 +5276,11 @@ msgstr ""
 "ger bättre packning men tar längre tid. Om det högsta tillåtna värdet är "
 "noll, kompilerades servern inte med zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Prefix vid autospar"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5267,11 +5288,11 @@ msgstr ""
 "Automatiskt sparade spel kommer att få namnet \"<prefix><år>.sav\".Denna "
 "inställning bestämmer prefixet."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Logga spelarstatistik"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5284,7 +5305,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Servern kan inte läsa standardinmatning. Bortser från inmatning."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Server: felaktig adress: [%s:%d]."
@@ -5422,89 +5443,89 @@ msgstr "Misslyckades med att spara spel som %s"
 msgid "Game saved as %s"
 msgstr "Spelet har sparats som \"%s\"."
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Spelet pågår redan."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 "%s förlorade direktkontroll över servern vid spelstarten. Använd röstning fr."
 "o.m. nu."
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Sätter i gång spelet."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "Okänd redogörelse efterfrågades (slag %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Varning: avvisar föråldrad klient %s"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "Fick ett paket av typ %d från en besegrad eller iakttagande spelare"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Var god välj ett ickeblankt namn."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Folkslaget är upptaget."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "En annan spelare har redan namnet '%s'. Försök välja ett annat namn."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Var god välj ett namn bestående av endast ASCII-tecken."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "Folkslaget %s är inte tillgängligt i scenariot"
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "Folkslaget %s är upptaget."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%1$s styr %3$s (%2$s)."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Inväntar alla spelare innan vi sätter igång: %d av %d är redo."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s har lagts till som en datorstyrd spelare med färdighetsnivå %s."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Spelare %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s regerar %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
@@ -5512,16 +5533,16 @@ msgstr ""
 "Detta civserverprogram har stöd för spelarautentisering, men den är f.n. "
 "inte aktiverad."
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Skickar upplysningar till metaservern [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Spelet är slut..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Godtar nu nya klientanslutningar."
 
@@ -5542,7 +5563,7 @@ msgstr "(flertydigt)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5717,7 +5738,7 @@ msgstr "Spelare kan inte borttagas under spelets gång."
 msgid "Removed player %s from the game."
 msgstr "Tog bort spelare %s från spelet."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "Namnet \"%s\" är otillåtet av säkerhetsskäl."
@@ -5794,201 +5815,201 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr "Kan inte höja kontrollnivån till \"%s\"; du själv har endast \"%s\"."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "Kontrollnivån satt till \"%s\" för anslutning %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "Kontrollnivån kunde inte sättas till \"%s\" för anslutning %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "Kontrollnivån satt till \"%s\" för nya spelare."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "Kontrollnivån satt till \"%s\" för den första spelaren som tar det."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "Kommandot 'firstlevel' har ingen verkan från serverns kommandorad."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "Du har redan kontrollnivån \"%s\" eller bättre."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "Någon annan är redan spelledare."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "Anslutningen %s har uttryckt intresse av att bli spelledare."
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "\"%d\" är ett ogiltigt argument."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 "Användning: timeoutincrease <omgång> <omgångsökning> <värde> <värdefaktor>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "Självförändrande omgångstidsgräns satt till %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Tillval:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "ändringsbar"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "fastlåst"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Värde: %d, Minsta möjliga: 0, Standard: %d, Högsta möjliga: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Värde: %d, Minsta möjliga: %d, Standard: %d, Högsta möjliga: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Värde \"%s\", Standard: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "Förklaringar är tillgängliga för följande servertillval:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Ingen förklaring för detta än."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Flertydigt tillval."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Serverhandhavare: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Spelare \"%s\" har nu skicklighet \"%s\"."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s är inte datorstyrd."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Standardskicklighet satt till '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Detta kommando kan endast utföras i klienten."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Användning: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Endast spelare kan använda kommandot away."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s försatte sig i bortaläge."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s återvände till spel."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Du har inte åtkomst att visa tillvalet '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Okänt tillval '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Alla inställningar med ändrade värden"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Samtliga inställningar"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Viktiga inställningar"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Situationsspecifika inställningar"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Ovanliga inställningar"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ betyder att man kan ändra tillvalet"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= betyder att tillvalet har sitt standardvärde"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s värde  (minsta,största)"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Tillval"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "beskrivning"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -5996,37 +6017,37 @@ msgstr ""
 "Försök med 'show situational' eller 'show rare' för fler förslag.\n"
 "Försök med 'show changed' för att visa inställningar med ändrade värden."
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Kan inte ändra lag när spelet har börjat."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Odefinierat argument. Användning: team <spelare> <lag>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr "Laget %s saknas. Försök med annat lagnamn eller -nummer."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Barbarspelare kan ej tillhöra ett lag."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "Spelare %s satt till lag %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Oklart argument. Användning: röst yes|no [röstnummer]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Iakttagare kan ej rösta."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -6034,39 +6055,39 @@ msgstr ""
 "Man kan endast rösta i ett aktivt spel. Använd 'first' för att ta rollen som "
 "spelledare om en sådan saknas."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "Omröstning %d \"%s\": %d för, %d emot"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Ingen omröstning pågår."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "Inte tillåten sista röst."
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Värde måste vara heltal."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Sådan röst saknas (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "Du röstade för \"%s\"."
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "Du röstade emot \"%s\""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6074,425 +6095,452 @@ msgstr ""
 "Odefinierade argument. Användning: debug <diplomacy <spelare> | city <x> <y> "
 "| units <x> <y> | unit <id> | tech <spelare> | timing | info>."
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Detta kommando kan endast användas när spelet pågår."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "%s diplomati ej längre avlusad"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "%s diplomati avlusad"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "%s teknologi ej längre avlusad"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "%s teknologi avlusad"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "Värde 2 & 3 måste vara heltal."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Ogiltiga kartkoordinater."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Ingen stad vid denna koordinat."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s ej längre avlusad"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr "%s %s ej längre avlusad."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr "%s %s avlusad."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Värde 2 måste vara heltal."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "Trupp %d finns ej."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Oklart argument. Användning: set <tillval> <värde>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Du har inte tillåtelse att sätta detta tillval."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Denna inställning kan inte ändras under spelets gång."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Värdet måste vara ett heltal."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr "Parametern %s bör endast innehålla heltalen 0-1"
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Värde utanför spännvidd (minsta: 0, största: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Tillval: %s har satts till %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr "Parametern %s bör endast innehålla +- samt 0-9."
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Värde utanför spännvidd (minsta: %d, största: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Strängvärdet är för långt. Användning: set <tillval> <värde>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Tillval: %s har satts till \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Beklagar, man kan ej iakttaga globalt i detta spel."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr "Beklagar, du kan ej taga global iakttagare. Iakttag denne istället."
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Beklagar, man kan ej taga mänskliga spelare i detta spel."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "Beklagar, man kan ej iakttaga barbarer i detta spel."
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "Beklagar, du kan ej taga barbarer i detta spel."
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "Beklagar, man kan ej iakttaga besegrade spelare i detta spel."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "Beklagar, man kan ej taga besegrade spelare i detta spel."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "Beklagar, man kan ej iakttaga datorstyrda spelare i detta spel."
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "Beklagar, man kan ej taga datorstyrda spelare i detta spel."
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "Beklagar, man kan ej iakttaga mänskliga spelare i detta spel."
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "Beklagar, man kan ej taga mänskliga spelare i detta spel."
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "Beklagar, man kan ej iakttaga i detta spel."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "Beklagar, man kan ej taga spelare i detta spel."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "Beklagar, man kan ej taga spelare som redan är anslutna i detta spel."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Användning: observe [anslutningsnamn [spelarnamn]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Användning: observe [spelarnamn]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s styr redan %s. Användning av \"observe\" skulle taga bort %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s iaktar redan %s"
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s iaktar redan."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s iakttager nu %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s är nu iakttagare"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Användning: take <anslutningsnamn> <spelarnamn>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Användning: take <spelarnamn>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Användning: take [anslutningsnamn] <spelarnamn>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s styr redan %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
 msgstr "Det finns inte någon ledig spelarposition för %s"
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "kopplas bort från %s."
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s styr nu %s (%s, %s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "barbar"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "datorstyrd"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "mänsklig"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "levande"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "död"
 
-#: server/stdinhand.c:3088
-#, c-format
-msgid "%s failed to attach to any player"
+#: server/stdinhand.c:3147
+#, fuzzy, c-format
+msgid "%s failed to attach to any player."
 msgstr "%s misslyckades med att ansluta till någon spelare."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Användning: detach <anslutningsnamn>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Du kan ej koppla bort andra spelare."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s är inte ansluten till någon spelare."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s kopplar bort från %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s är ej längre iakttagare."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "kopplar bort från %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Användning: load <filnamn>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "Kan inte öppna ett spel när ett annat pågår."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "Fann varken sparspel eller scenario med namnet \"%s\"."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "Kunde inte öppna sparfil: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Den nuvarande katalogen för regler är \"%s\"."
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Kunde inte hitta regelkatalogen \"%s\""
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Regelkatalog är redan \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Regelkatalog satt till \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Hejdå."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Du har inte tillåtelse att använda serverkommandon."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr "Varning: '%s' tolkat som '%s', men är flertydigt. Försök med '%shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Okänt kommando. Försök med \"%shelp\"."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Din nya röst nollställde din tidigare röst."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "Ny röst (nr. %d) av %s: %s."
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr "Din nya röst (\"%s\") var ogiltig och antogs ej."
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Du har inte tillåtelse att använda detta kommando."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(serverinmatning)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Spelet slutade oavgjort."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 "Avslutar spelet. Servern kommer att starta om när alla klienter har kopplat "
 "bort sig."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Kan inte avsluta spelet: inget spel pågår."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s har erkänt sig besegrad och kan inte längre vinna."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Du kan ej ge upp nu."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Inte tillräckligt många spelare, spelet kommer inte att sättas i gång."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Inte tillräckligt många spelare, spelet kommer inte att sättas i gång."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Inte tillräckligt många spelare, spelet kommer inte att sättas i gång."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Alla spelare är redo; nu kör vi."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr ""
 "Kan inte sätta i gång spelet: spelet väntar på att alla klienter kopplar "
 "bort sig."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Kan inte sätta i gång spelet: det pågår redan."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Bryter anslutningen till %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6530,123 +6578,123 @@ msgstr ""
 "  save   -  spara nuvarande spel\n"
 "  quit   -  avsluta"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Kommando:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Sammanfattning: "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Läge: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Följande serverkommandon är tillgängliga:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "Hjälpargumentet \"%s\" är flertydigt."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "Ingen träff för hjälpargument \"%s\"."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "Otillåtet argument för list: \"%s\". Försök med \"%shelp list\"."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Lista över spelare:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<inga spelare>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "användare %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", besegrad"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", skicklighetsläge %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", redo"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", ej redo"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d anslutning:"
 msgstr[1] " %d anslutningar:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr " %s från %s (kontrollnivå %s), bufsize=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (iakttagarläge)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Lista över lag:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : '%s' : %d spelare"
 msgstr[1] "%2d : '%s' : %d spelare"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 spelare : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Tomt lag: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Lista över anslutningar till servern:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<inga anslutningar>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Lista över tillgängliga scenarion:"
 
@@ -6716,17 +6764,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Forskningsmålet är %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "Vi stal %s från %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%s stal %s från oss!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%s stal %s från %s."
@@ -7254,20 +7302,20 @@ msgstr "Misslyckades bygga underverk för %s."
 msgid "Your %s has invalid orders."
 msgstr "VÃ¥rt %s har ogiltliga order."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Hög landmassa - detta kan ta några sekunder."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Faller tillbaka på skapare %d."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Skapare 3 satte inte ut alla stora öar."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Skapare 3 lämnade %li landmassa outsatt."
@@ -7359,126 +7407,127 @@ msgstr "Någonting kanske är felinställt eller har felaktiga rättigheter"
 msgid "Cannot find audio file %s"
 msgstr "Kan inte finna ljudfilen %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "XXX/XXX XXX omgångar"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d guld per omgång"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d omgång"
 msgstr[1] "%3d omgångar"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "aldrig"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/omgång"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d omgång"
 msgstr[1] "%s (%d) %d omgångar"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Föråldrat"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Färdigställt"
 
 # DM> Tidigare "Världsunder"
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Underverk"
 
 # DM> "Pytteunder" låter ju tokigt så... =)
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Monument"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/omgång"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Medborgare\n"
 
 # ?
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Beskattad handel\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : Handelsled med %s\n"
 
 # ?
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : Samlar kollekt\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : Bonus från %s (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Spill\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : Uppror\n"
 
 # ?
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Används\n"
 
 # Blir detta rätt?
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : Sammanlagt\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Sammanlagt överskott"
@@ -7594,8 +7643,8 @@ msgid "Best defending units"
 msgstr "Bästa försvarare"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7766,8 +7815,8 @@ msgstr "?pollution [short]:Uts"
 msgid "?cma:Governor"
 msgstr "Förvaltare"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -8032,19 +8081,19 @@ msgstr ""
 "Självständing anslutning till servern \"%s\" vid port %d som \"%s\" var %fte "
 "sekund %d gånger"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "nybörjare"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "lätt"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "svår"
 
@@ -8052,31 +8101,31 @@ msgstr "svår"
 msgid "experimental"
 msgstr "experimentell"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Startar server..."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Kunde ej starta server."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Du får tyvärr försöka starta en själv..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Kunde ej skapa anslutning till server."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Det verkar som vi inte kunde starta den härifrån."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Vi har kontroll över servern (kontrollnivå 'hack')"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "Vi kunde ej taga kontrol över server, försöker döda den."
 
@@ -8162,27 +8211,27 @@ msgid "Requires a minimum size of %d.\n"
 msgstr "Kräver minst storlek %d.\n"
 
 # DM> tidigare "Tillåter" ändrat på flertalet ställen
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "Möjliggör %s."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "Möjliggör %s (med %s)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " floder"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Hjälpavsnitt saknas för %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8193,7 +8242,7 @@ msgstr ""
 "Denna sida har skapats automatiskt.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
@@ -8201,79 +8250,79 @@ msgstr ""
 "Kräver: Ingenting\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* Upptäckten av %s gör %s föråldrad.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* Möjliggör för alla spelare med kunskap om %s att bygga %s-trupper.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* Möjliggör %s (med %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* Möjliggör %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Kan endast byggas om det finns %s i staden.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Kan endast byggas under statsskicket %s.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Kan ej byggas i städer.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Har aldrig hemstad.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Förlust av denna trupp innebär förlust av spelet!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* En spelare kan endast ha en av detta truppslag.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Vid byggandet åtgår %d befolkning.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Kan frakta och tanka %d stridsflygplan.\n"
 msgstr[1] "* Kan frakta och tanka %d stridsflygplan.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Kan frakta och tanka %d missilenhet.\n"
 msgstr[1] "* Kan frakta och tanka %d missiler.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Kan frakta %d marktrupp över vatten.\n"
 msgstr[1] "* Kan frakta %d marktrupper över vatten.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8281,125 +8330,125 @@ msgstr ""
 "* Kan etablera handelsleder (måste resa till målstaden, som måste ligga nio "
 "rutor [i Manhattanavstånd; dvs. inga diagonaler] bort från hemstaden).\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Kan hjälpa till med underverksbyggen (lägger till %d sköldar).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Kan ej upplösas.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr "* Kan upplösas i en stad mot 50%% av dess tillverkningskostnad.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Kan grunda nya städer.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 "* Kan en öka en stads befolkning med %d i det fall staden är av storlek %d "
 "eller mindre.\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Kan bygga vägar och järnvägar.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Kan gräva gruvor.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Kan anlägga bevattning.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Kan anlägga åker\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Kan anlägga åker (om vi forskat fram %s).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Kan anlägga åker (om vi forskat fram någon av: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Kan bygga fästningar.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Kan bygga fästningar (om vi forskat fram %s).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Kan bygga fästningar  (om vi forskat fram någon av: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Kan sanera utsläpp.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Kan sanera radioaktivt nedfall.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Kan omvandla landskapet.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Kan bygga flygbaser.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Kan befästa sig, vilket ger en försvarsbonus på 50%%.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Kan plundra och förstöra infrastruktur.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* Kan utföra diplomathandlingar plus särskilda spionhandlingar.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Kan utföra diplomathandlingar.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Förlorar aldrig en strid mellan diplomater.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Kan inte mutas.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Kan angripa fientligt stridsflyg.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* Är osynlig utom intill fiendetrupper eller fiendestäder.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Kan endast angripa trupper på havsrutor (inga landangrepp).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
@@ -8407,40 +8456,40 @@ msgstr ""
 "* Kan angripa från ombord på marina enheter: mot fientliga städer och "
 "landrutor.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Kan hoppa fallskärm från en vänlig stad (Räckvidd: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* Har dubbelt försvar mot trupper angivna som \"ridande\".\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Räknas som \"ridande\" mot vissa försvarare.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* En missil: förbrukas vid angrepp.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Angrepp avslutar denna trupps omgång.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Om denna trupp anfaller sker en kärnvapenexplosion!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Erhåller dubbel eldkraft vid attack mot städer.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Stadsmurar utgör inget skydd mot denna trupp.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8449,38 +8498,38 @@ msgstr ""
 "* Utför bombardemang (%d per omgång). Dessa attacker har aldrig dödlig "
 "utgång, men skadar försvararen och innebär ingen fara för angriparen.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Har femfaldigt försvar mot missiler och flygplan.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr ""
 "* Landskapet påverkar inte denna trupps rörlighet (behandlar alla rutor som "
 "vägar).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Påverkas ej av kontrollområden.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* Icke-stridande enhet (kan inte anfalla; inget undantagstillstånd).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr ""
 "* En fälttrupp: gör 1 medborgare missnöjd även när truppen är fredlig.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Blir aldrig mer erfaren.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Kan bli mer erfarna genom träning eller strid.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8489,12 +8538,12 @@ msgstr ""
 "* Måste avsluta sin omgång i en stad eller intill land. Löper annars 50%% "
 "risk att gå förlorad till sjöss.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* Upptäckten av %s minskar risken till 25%%.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s minskar risken till 12%%.\n"
@@ -8503,27 +8552,27 @@ msgstr "* %s minskar risken till 12%%.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " eller "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?or:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* Trupp måste vara i en stad, eller på en %s efter %d omgång.\n"
 msgstr[1] "* Trupp måste vara i en stad, eller på en %s efter %d omgångar.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Om vi började med %s nu skulle vi behöva %d enheter forskning."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8532,90 +8581,90 @@ msgstr ""
 "För att nå %s behöver vi %d andra teknologier först. Det hela kommer att "
 "förbruka %d glödlampor."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Vi kan inte forska fram denna teknologi."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr "Detta tal kan ändra sig beroende på vad andra spelare forskar fram.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* Den första spelaren att forska fram %s får ett omedelbart framsteg.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Minskar risken att förlora fartyg på öppna havet till 25%%.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Minskar risken att förlora fartyg på öppna havet till 12%%.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Ökar mängden utsläpp som orsakas av befolkning.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* Möjliggör %s att bygga vägar på flodrutor.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* Möjliggör %s att bygga fästningar.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* Möjliggör %s att bygga flygbaser.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* Möjliggör %s att ersätta vägar med järnvägar.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* Möjliggör %s att ersätta bevattning med åker.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Utsläpp drabbar aldrig denna terräng."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Det går inte att grunda nya städer här."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Denna terrängs kust är riskabel."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Denna terräng är riskabel för trupper."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Marktrupper kan ej färdas över havsrutor."
 
 # ?
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Innehåller:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr " inget "
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8630,7 +8679,7 @@ msgstr[1] ""
 "* Stridande enheter som ej är hemma eller som är i fält orsakar missnöje hos "
 "%d medborgare.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8639,48 +8688,48 @@ msgstr ""
 "* Varje stad slipper %d missnöje som annars skulle orsakas av trupper.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* Du betalar %d ggr vanligt %s-underhåll för dina trupper.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "* Du betalar %d ggr normalt underhåll för dina trupper.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* Du betalar inget %s-underhåll för dina trupper.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* Du betalar inget underhåll för dina trupper.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr "* Varje stad slipper betala %d %s i underhåll för trupper.\n"
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr "* Varje stad slipper betala %d i underhåll för trupper.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "* Risken för inbördeskrig är %d%% om du förlorar din huvudstad.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8690,7 +8739,7 @@ msgstr ""
 "civilisation kommer framträda när man har %d städer.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8699,17 +8748,17 @@ msgstr ""
 "* Efter den att den första missnöjda medborgaren p.g.a. en civilisations "
 "storlek har framträtt, kommer ytterligare en framträda per %d städer.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 "* Den högsta tillåtna forsknings- skatte- eller välfärdssatsen är %d%%.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "* Har obegränsade forsknings/skatte/välfärdssatser.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8724,7 +8773,7 @@ msgstr[1] ""
 "* Du kan införa undantagstillstånd. Varje stridande enhet stationerad i en "
 "stad gör %d medborgare nöjda.\n"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8733,7 +8782,7 @@ msgstr[1] ""
 "* Som flest kan %d trupper i varje stad upprätthålla undantagstillstånd.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8742,15 +8791,15 @@ msgstr ""
 "* Du kan låta dina städer växa genom hänryckning. En stad måste minst vara "
 "av storlek %d innan de kan växa på detta sätt.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Dina trupper kan inte mutas.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Dina städer kan inte försättas i revolt.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8758,39 +8807,39 @@ msgstr ""
 "* Riket störtas i anarki om någon stad befinner sig i uppror mer än två "
 "omgångar på raken.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Har en senat som kan förhindra krigsförklaring.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr "* Gerillasoldater uppenbarar sig när städer erövras av en fiende.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr "* Byggnader som vanligtvis motarbetar missnöje ger istället guld.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* Betalar inget underhåll för fanatiker.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* Saknar missnöjda medborgare.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* Erfarna %s-trupper.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Erfarna trupper.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8800,7 +8849,7 @@ msgstr ""
 "folket inte firar.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8810,72 +8859,72 @@ msgstr ""
 "folket firar.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 "* Varje nyttjad ruta med åtminstone 1 %s ger ytterligare %d av detta.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* Tillverkningen av %s ökas med %d%%.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* Tillverkningen av %s drabbas av omfattande spill.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* Tillverkningen av %s drabbas av visst spill.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* Tillverkningen av %s drabbas av en liten aning spill.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* %s ökar drastiskt vid större avstånd från huvudstaden.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* Spill av %s ökar vid större avstånd från huvudstaden.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr "* Spill av %s ökar något vid större avstånd från huvudstaden.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* Möjliggör byggandet av %s.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d missnöjda"
@@ -9310,16 +9359,16 @@ msgstr "Serverförmåga-sträng: %s"
 msgid "Start of turn %d"
 msgstr "Början av omgång %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "Datorstyrt läge är nu %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "PÃ…"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "AV"
 
@@ -9351,13 +9400,13 @@ msgstr "Namn"
 msgid "Username"
 msgstr "Användarnamn"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Flagga"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9371,7 +9420,7 @@ msgstr "Gräns"
 msgid "Score"
 msgstr "Poäng"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Lag"
 
@@ -9404,36 +9453,36 @@ msgstr "?Player_dlg:Overksam"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Vi kunde ej sälja stadsförbättringar"
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "Sålde %d %s för %d guld."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Inga %s kunde säljas."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Du kan inte upplösa trupper."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s kunde ej upplösas"
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "Upplöste %d %s."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Inga %s kunde upplösas."
@@ -9743,66 +9792,72 @@ msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Skt: %d Väl: %d For: %d"
 
 # Blir detta rätt?
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Flyttar: %s"
+
+# Blir detta rätt?
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Flyttar: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Klicka här för detaljer)"
 
 # DM> Tyckte det ser bättre ut så här
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "Folkmängd: %s"
 
 # DM> Här också..
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Omgång %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Guld: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Nettoinkomst: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Skattesatser: Guld:%d%% Välfärd:%d%% Forskning:%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "Forskar fram %s: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Risk för global uppvärmning: %d%% (%+d%%/omg)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Risk för atomvinter: %d%% (%+d%%/omg)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Statsskick: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9810,55 +9865,55 @@ msgstr[0] "%d trupp"
 msgstr[1] "%d trupper"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr "Otillgänglig"
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Omgångar till målet: %d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Omgångar till målet: %d to %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d trupp markerad"
 msgstr[1] "%d trupper markerade"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Inga trupper valda."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "Övriga: %d civila; %d militära"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "Övriga: %d civila"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "Övriga: %d militära"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Inga trupper att uppgradera!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Inga av dessa trupper kan uppgraderas."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9873,72 +9928,72 @@ msgstr[1] ""
 "Uppgradera %d trupper för %d guld?\n"
 "Skattkammaren innehåller %d guld."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Visar hur långt utforskandet av nuvarande teknologi har kommit."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "inget forskningsmål."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Visar hur långt framskriden den globala uppvärmningen är:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Utsläpp: %d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Risken för katastrofal uppvärmning varje omgång: %d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Visar hur långt framskriden atomvintern är:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Nedfall: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Risken för katastrofal nedkylning varje omgång: %d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Visar vårt nuvarande statsskick:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Folkmängd:       %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Underhåll:         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Energi:          %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9946,97 +10001,97 @@ msgstr[0] "Massa:           %5d ton"
 msgstr[1] "Massa:           %5d ton"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Restid:          %5.1f år"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Restid:             E/A     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Sannolikh.lyck.: %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Ankomstår:       %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "av"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "%02dm %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "%02dtim %02d'"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "%02dd %02dtim"
 
 # DM> FIXME
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "överflöde"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%ss %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Iakttagare: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Byggnader: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Inga. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Underverk: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Städer: Sammanlagt %d varav %d är över tröskeln (%d städer)."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -10044,7 +10099,7 @@ msgstr[0] "%d nöjd innan negativ bonus."
 msgstr[1] "%d nöjda innan negativ bonus."
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -10052,16 +10107,16 @@ msgstr[0] "Ytterligare %d missnöjd medborgare."
 msgstr[1] "Ytterligare %d missnöjda medborgare."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Undantagstillstånd råder ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "inget högsta värde, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -10069,20 +10124,20 @@ msgstr[0] "högst %d trupp"
 msgstr[1] "högst %d trupper"
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d per trupp). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Stridande enheter i fält kan orsaka missnöje. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Stridande enheter påverkar inte belåtenhet."
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Välfärd: %d sammanlagt."
@@ -10132,12 +10187,12 @@ msgstr ""
 "Stadsförvaltaren är osäker på att han skött sitt uppdrag i %s och ber att vi "
 "tar oss en titt."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "ingen"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "valfritt"
 
@@ -10192,11 +10247,13 @@ msgid "Ooops..."
 msgstr "Oj oj..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Denna trupp kan inte mutas!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10213,6 +10270,7 @@ msgstr "Muta fiendetrupp"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10253,6 +10311,7 @@ msgstr "Fr_amsteg:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Låt spionen välja"
 
@@ -10277,12 +10336,13 @@ msgstr "Förbättr_ingar:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Stadens tillverkning"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Vi kan inte anstifta ett uppror i %s."
@@ -10294,6 +10354,7 @@ msgstr "Kan inte anstifta uppror i staden!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10310,6 +10371,7 @@ msgstr "Anstifta ett uppror!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10319,6 +10381,7 @@ msgstr ""
 "Skattkammaren innehåller %d guld."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10388,10 +10451,12 @@ msgid "Subvert Enemy Unit"
 msgstr "Omvänd fiendetrupp"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr "Diplomaten väntar på din order"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr "Spionen väntar på din order"
 
@@ -10493,7 +10558,7 @@ msgstr "Utsläpp:"
 msgid "_Overview"
 msgstr "_Översikt"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10518,11 +10583,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d omgångar"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Köp"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr "T_illverkning"
 
@@ -10642,7 +10707,7 @@ msgstr "Understödda trupper %d"
 msgid "Present units %d"
 msgstr "Närvarande trupper %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "Cen_trera"
 
@@ -10731,31 +10796,31 @@ msgstr "Byt namn på staden"
 msgid "What should we rename the city to?"
 msgstr "Vad ska vi kalla staden?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_Ändra"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Lägg till _först"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "Lägg till som _nästa"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "_Lägg till sist"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Välj"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr "Vi_sa"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10765,12 +10830,12 @@ msgstr "Vi_sa"
 msgid "Cities"
 msgstr "Städer"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr "_Inspektera"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10779,85 +10844,90 @@ msgstr "_Inspektera"
 msgid "Improvements"
 msgstr "Förbättringar"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Underverk"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Alla städer"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Inga städer"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Invertera val"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Bygger trupper"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "Bygger stadsförbättringar"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Bygger underverk"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Bygger trupp"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "Bygger stadsförbättring"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Bygger underverk"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Kuststäder"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Samma ö"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Understödda trupper"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Närvarande trupper"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Förbättringar i stad"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Underverk i stad"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Tillgängliga trupper"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Tillgängliga stadsförbättringar"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Tillgängliga underverk"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Sammanlagd kostnad: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10923,121 +10993,121 @@ msgstr "Vad ska vi kalla det förvalda värdet?"
 msgid "Remove this preset?"
 msgstr "Tag bort detta förvalda värde?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "_GÃ¥ till plats"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr "Inspektera _stad"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Vill du göra revolution?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Revolution!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "Plundra vad?"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Välj något att plundra:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Trupp"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Namn"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Välj trupp"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "Aktive_ra alla"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "_Sätt overksamma i vakttjänst"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
 msgstr "_Grupper:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Vilket folk ska du styra?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Välj folkslag"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
 msgstr "Sl_umpvalt folkslag"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Välj ett folkslag"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "Egenska_per"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "_Ledare:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Kvinna"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Man"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
 msgstr "_Stadstyper:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 msgid "_Description"
 msgstr "_Beskrivning"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Du måste välja ditt kön."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Du måste välja en stadstyp."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Du måste skriva ett tillåtet namn."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Uppgradera trupp!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11295,60 +11365,66 @@ msgstr ""
 msgid "Not _ready"
 msgstr "Inte _redo"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Redo"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_Sätt igång"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Ta spelaren"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Välj ditt _folk"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "_Iakttag"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr "_Iakttag ej"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<Datorstyrd>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<nybörjar-dator>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<lätt dator>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<normal dator>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<svår dator>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Slumpvald"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Iakttagare"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Frånkopplad"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Vill du verkligen avsluta?"
 
@@ -12261,215 +12337,215 @@ msgstr "Delta i _nätverksspel"
 msgid "Connect to Gaming _Zone"
 msgstr "Delta i nätverksspel (Gaming _Zone)"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Lösenorden är olika, ange lösenord."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Servernamn"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Version"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Status"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Spelare"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Anmärkning"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "Lokalt _nätverk"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Internet _metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Port:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_Logga in som:"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "L_ösenord:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "_Bekräfta lösenord:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "An_slut hit"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Anslutningsnamn: %s."
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Spelarnamn: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Värd: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Spelar/anslutn. info"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s info"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Växla redoläge för spelare"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Välj folkslag"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Iakttag spelareen"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Ta spelaren"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Bryt anslutningen"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "Slå av/på datorstyrning"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Avlägsna spelaren"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Ge info access"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "Ge ctrl access"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "Gör till medlem i %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr "A_ntal spelare (inklusive datorstyrda):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr "Datorspe_larens färdighetsnivå"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
 msgstr "_Regler:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "_Fler spelinställningar..."
 
 # ? FIXME
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Rekord"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Grad"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Redo"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "ledare"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Välj sparat spel att läsa in"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Välj sparat spel att _läsa in:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Bläddra..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Öppna scenario"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Öppna _scenario:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Typ"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Välj ett _folkslag att spela:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Välj plats att spara till"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Spara spel"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Sparade spel:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "Filnamn:"
 
@@ -12504,7 +12580,7 @@ msgstr "?Building:Namn"
 msgid "Count"
 msgstr "Antal"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12750,28 +12826,28 @@ msgstr "Ar_betslistor:"
 msgid "Edit Global _Worklists"
 msgstr "Lägg till övergripande _arbetslistor"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Omgångar"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "Tillg_ängliga val:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Visa även _framtida val"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Arbets_lista:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "Lägg till övergripande _arbetslista"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Ändra tillverknin_g"
 
@@ -13064,8 +13140,8 @@ msgid "City shrinks: %d %s"
 msgstr "Staden krymper: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13167,11 +13243,11 @@ msgstr "Garnison"
 msgid "Maintenance Report"
 msgstr "Underhåll"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "arbetslista"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -13594,21 +13670,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr "  -t,  --theme TEMA\tAnvänd gränssnittstemat TEMA\n"
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr "Tar skärmdump fc_%05d.bmp"
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Använder grafikläge: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "Startar klienten"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Väntar på att spelet ska börja"
 
@@ -14922,7 +14998,7 @@ msgstr "Stadstyper:"
 msgid "Unit Selection"
 msgstr "Truppval"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "INGEN"
 
diff --git a/po/tr.gmo b/po/tr.gmo
index 9d82635..9d932d5 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index b42860c..89cdace 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\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"
@@ -53,22 +53,22 @@ msgstr "Lüks"
 msgid "Science"
 msgstr "Bilim"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "Y"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "h"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "G"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "Y"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "h"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -487,81 +487,81 @@ msgstr "Bağlantı kurma/kesme mesajları"
 msgid "AI Debug messages"
 msgstr "YZ Hata ayıklama mesajları"
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "Soykırım peşinde"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "Savaşçıl"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "Düşmancıl"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "Söz Dinlemiyor"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "Huzursuz"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "Tarafsız"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "Saygılı"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "Yardımsever"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "Hevesli"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "Hayran"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "Tapıyor"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "Mütareke"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "SavaÅŸ"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "Süreli Ateşkes"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "Barış"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "Ä°ttifak"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "Tanışmadık"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "Takım"
 
@@ -607,13 +607,13 @@ msgstr "%s birim"
 msgid "Size %d"
 msgstr "Boyut %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "GeleceÄŸin Teknolojisi %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -625,65 +625,65 @@ msgstr "GeleceÄŸin Teknolojisi %d"
 msgid "None"
 msgstr "Yok"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "GeleceÄŸin Teknolojisi"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(Bilinmeyen)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "Yol"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Sulama"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Ray"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "Mayın"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "Kirlilik"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "Kulübe"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "Kale"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "Nehir"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Tarla"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "Hava üssü"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "Radyoaktif Serpinti"
 
@@ -790,11 +790,11 @@ msgstr "Atom bombası"
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " ve "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr ", "
 
@@ -952,79 +952,79 @@ msgid " (total %d repeat)"
 msgid_plural " (total %d repeats)"
 msgstr[0] " (toplam %d defa)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "\"%s\" için boş değişken.\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "\"%s\" için eksik değişken.\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "MÖ %d"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "MS %d"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH atanmış ama boş; bunun yerine öntanımlı yol kullanılacak."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "Veri dizini okunamadı %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "Veri yolu FREECIV_PATH ortam deÄŸiÅŸkeniyle belirlenebilir."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "Geçerli veri yolu: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "\"%s\" dosyası gerekli ... durduruluyor!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s: Büyük Hata: beni root olarak çalıştırma!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "Normal bir kullanıcı olarak çalıştır.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "tam isabet"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "sadece isabet"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "iki anlamlı"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "boÅŸ"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "fazla uzun"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "birbirini tutmayan"
 
@@ -1053,22 +1053,22 @@ msgstr "%s %s yapımına %s şehrinde başladılar."
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s %s yapısını (gereksiz olduğundan) satıyorlar (fiyat %d)."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (AI)* Uzakta modundayken YZ bu tür bir antlaşma imzalayamaz."
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (YZ)* Önce %s ile yaptığın ittifakı boz, %s."
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (YZ)* Önce ateşkes yapalım, %s."
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1076,47 +1076,47 @@ msgid ""
 msgstr ""
 "*%s (YZ)* Öncelikle yaptığımız ateşkesi biraz uzunca tutacağını umuyorum, %s."
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (AI)* İttifak konusunda henüz sana yeterince güvenmiyorum, %s."
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (YZ)* Bahsettiğin şehri hiç görmedim."
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "*%s (YZ)* Üzgünüm, seninle görüş sahamızı paylaşmak güvenli değil."
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (YZ)* Bu anlaÅŸma bize uymaz, %s!"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* İttifakımıza hoş geldin %s!"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (YK)* Evet, sonsuza kadar birlik olalım, %s."
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (YZ)* Yurtta barış, cihanda barış!"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (YZ)* Anlaştık. Savaşa son, %s."
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1125,23 +1125,23 @@ msgstr ""
 "*%s (YZ)* Merhaba %s! Birbirimizi daha iyi tanıyabilmek için bir ateşkes "
 "yapabilir miyiz?"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (YZ)* Uzayı sana kaptırmayacağız. "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 "*%s (YZ)* Bu küstahça soytarılığa daha fazla dayanamam! Sana savaş açıyorum!"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (YZ)* Başka zaman barışalım."
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1150,17 +1150,17 @@ msgstr ""
 "*%s (AI)* Sonunda senin hakkından geldim! Bu kadar sinirimi bozduktan sonra "
 "benden kaçabileceğini mi sandın?"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (AI)* Gizli düşmanlığın sana savaş getirdi!"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)* %s üzerine saldırmak senin son hatandı!"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1172,14 +1172,14 @@ msgstr[0] ""
 "*%s (AI)* Uzay gemisini durdurmak için %s üzerine %d sıra sonra tüm "
 "gücümüzle saldıracağız."
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr "*%s (AI)* Bu konuda yardımını bekliyoruz. Yaşasın ittifakımız!"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1193,7 +1193,7 @@ msgstr[0] ""
 "*%s (AI)* %s kendi menfaatleri için bizimle olan antlaşmasını bozdu. %d sıra "
 "sonra onlara saldıracağız ve senden de müttefikin olarak destek bekliyoruz!"
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1205,13 +1205,13 @@ msgstr[0] ""
 "*%s (AI)* %s bu aralar çok zengin, onlara saldırıp yağmalayacağız. %d sıra "
 "sonra savaş açıyoruz."
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr "*%s (AI)* Ganimetten pay istiyorsan bizim gibi yap ve saldır!"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1223,13 +1223,13 @@ msgstr[0] ""
 "*%s (AI)* %s artık canımıza tak etti. Hadi bu zavallıları parçalayalım. %d "
 "sıra sonra savaşa başlayacağız."
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 "*%s (AI)* Müttefikin olarak bu savaşta desteğini esirgemeyeceğini umuyoruz."
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1241,7 +1241,7 @@ msgstr[0] ""
 "*%s (AI)* Müttefikin olduğumuz için %s artık bizim de düşmanımızdır. %d sıra "
 "sonra onlara savaş açacağız.  Bekle, geliyoruz!"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1253,7 +1253,7 @@ msgstr[0] ""
 "*%s (AI)* %s ile ittifakımız nedeniyle %s artık bizim düşmanımız. %d sıra "
 "sonra onlara savaş açıyoruz.  Senden de benzer davranışlar bekliyoruz."
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1262,14 +1262,14 @@ msgstr ""
 "*%s (AI)* Uzayı yalnız başına ele geçirme planların bize gerçek amacının ne "
 "olduğunu gösterdi. Artık müttefikin değiliz!"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr "*%s (AI)* Uzayı bencilce ele geçirme denemelerin bizi kızdırıyor."
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1277,13 +1277,13 @@ msgid ""
 msgstr ""
 "*%s (AI)* Uzay gemisi yapmayı bırakmazsan biz sana ne yapacağımızı biliriz!"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 "*%s (YZ)* Üzgünüm, seninle görüş sahasını paylaşmak artık güvenli değil."
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1292,7 +1292,7 @@ msgstr ""
 "*%s (AI)* Merhaba en güvendiğimiz müttefikimiz. Sizi düşmanımız olan %s ile "
 "savaÅŸmaya davet ediyoruz."
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1301,7 +1301,7 @@ msgstr ""
 "*%s (YZ)* Merhaba müttefikimiz, hâlâ düşmanımız %s ile savaşa başlamadın. "
 "Tuttuğun sözü hatırlatmama neden gerek var?"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1311,19 +1311,19 @@ msgstr ""
 "*%s (AI)* Demek %s ile savaşa girmeyip ittifakımızı hiçe sayıyorsun! Bu "
 "yaptığın kabul edilemez, artık seninle müttefik değiliz!"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr "*%s (YZ)* Merhaba dostum, bizim ittifaka katılmak ister misin?"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr "*%s (YZ)* Merhaba komşu, biraz daha barışık ilişkiler kuralım mı?"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1332,7 +1332,7 @@ msgstr ""
 "*%s (AI)* Bu kan davasından bıktık artık. Bir süreliğine ateşkes yapmak "
 "istiyoruz, ne dersin?"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1342,58 +1342,63 @@ msgstr ""
 "birlikteliğimizi onurlandıracaksın ve seni asla unutmayacağız!"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, c-format
 msgid "Auth option \"%s\":"
 msgstr "Doğrulama ayarı \"%s\":"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr " ayar dosyasında yok (öntanımlı değer kullanılıyor)"
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr " (öntanımlı)"
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr " (ayar)"
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 msgid " (set)"
 msgstr " (ayarla)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "Kimlik ayarı için dosya adı \"%s\" olamaz!"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "Kimlik ayarı dosyası \"%s\" açılamadı!"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 "Uyarı: '%s' adını başkası kullanıyor, isminiz '%s' olarak değiştirildi."
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "Üzgünüm, bu sunucuya misafir olarak girilmez."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s reddedildi: Misafir kabul edilmiyor."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
@@ -1402,7 +1407,7 @@ msgstr ""
 "Kullanıcı veritabanı okunurken bir hata oluştu. Misafir olarak giriliyor: '%"
 "s'."
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
@@ -1410,39 +1415,39 @@ msgstr ""
 "Üzgünüm, kullanıcı veritabanı okunurken bir hata oluştu ve misafir girişlere "
 "izin verilmiyor."
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr "%s reddedildi: Veritabanı hatası ve misafirlere izin verilmiyor."
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "%s için parolayı girin:"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "Yeni bir parola girin (ve unutmayın)."
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "Üzgünüm, bu sunucuya sade önceden kayıt yaptıranlar girebilir."
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "%s reddedildi: Sadece önceden kayıt yaptıranlar izinli."
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "Üzgünüm, çok fazla hatalı deneme..."
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr "%s reddedildi: Yeni bir kullanıcı için çok fazla yanlış parola."
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
@@ -1450,31 +1455,31 @@ msgstr ""
 "Uyarı: Veritabanına kaydederken bir hata oluştu. Devam ediliyor fakat "
 "istatistikler kaydedilmeyecek."
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s reddedildi: Çok fazla hatalı parola denemesi."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "Parola yanlış, bir daha deneyin."
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr "Üzgünüm, bağlantınız zaman aşımına uğradı..."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr "%s reddedildi: Parola beklerken bağlantı zaman aşımına uğradı."
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 "Parolanız çok kısa. En az %d harf ve/veya rakam içermeli. Tekrar deneyin."
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2260,16 +2265,14 @@ msgid "Cast a vote."
 msgstr "Oy ver."
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "Bir oyuncu, bilgi seviyesinde giriş yayınlama, bir denetleme seviyesi "
 "komutunu bir yeni oy ile başlatır. /vote komutunu \"yes\" veya \"no\" takip "
@@ -2280,7 +2283,7 @@ msgstr ""
 "azı karşı oy kullandıysa geçersiz oy kabul edilir. Eğer bir tam sıra "
 "geçilirse, ve hiç kimse karşı oy kullanmamış ise oyunuz geçerli olabilir."
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2288,11 +2291,11 @@ msgstr ""
 "debug [ player <oyuncu> | city <x> <y> | units <x> <y> | unit <tanım no> | "
 "tech <oyuncu> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "Verilen kişi için YZ hata ayıklamasını açıp kapar."
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
@@ -2300,23 +2303,23 @@ msgstr ""
 "Verilen kişi ile ilgili YZ hata bilgisini yazdır ve bu durumla ilgili devam "
 "eden hata ayıklama çıktılarını aç veya kapat."
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <ayar-adı> <değer>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "Sunucu tercihini ayarla."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <oyuncu> [takım]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "Oyuncunun takım bilgisini değiştirir."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2329,15 +2332,15 @@ msgstr ""
 "elçilikler verilmiş, aynı zamanda takımın kazanması için birlikte savaşılan "
 "ekiptir."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <dizin>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Yeni bir kural seti dizini veya mod paketi seç."
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2346,15 +2349,15 @@ msgstr ""
 "hiçbir parametre olmadan verirseniz o an kullanılan kural setini gösterir."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <özet-satırı>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "Metasunucu bilgi satırını ayarla."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2368,19 +2371,19 @@ msgstr ""
 "yerine kullanılmaktadır. (mümkünse)"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <özet-satırı>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "Metasunucu yama satırını ayarla."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "Metasunucu bağlantısını yönet."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2393,33 +2396,33 @@ msgstr ""
 "belirtir."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <adres>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "Meta sunucu için (URL) adres ayarla (raporlamak için)"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <oyuncu-adı>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Oyuncunun YZ durumunu deÄŸiÅŸtir."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [bağlantı-adı] <oyuncu-adı>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "Oyundaki bir oyuncunun yerlerini kontrol altına al."
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2434,15 +2437,15 @@ msgstr ""
 "oluşturulmuş ve bağlantı yapmış demektir."
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "observe [bağlantı-adı] [oyuncu-adı]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "Bir oyuncuyu veya bütün oyunu gözlemle."
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2457,15 +2460,15 @@ msgstr ""
 "küresel gözlemciye (global observer) aktarılır."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <bağlantı-adı>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "bir oyuncuyla olan bağlantıyı kopar"
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2474,20 +2477,20 @@ msgstr ""
 "ayrılmasını sağlar."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <oyuncu-adı>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "Verilen isimde bir YZ oyuncusu oluÅŸturur."
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "'create' komutu sadece oyun başlamadan önce geçerlidir."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2495,16 +2498,16 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "Uzakta moduna geçer. YZ sizin yerinize bakacaktır."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "YZ ulusunuzu yönetecektir fakat asgari düzeyde değişiklik yapacaktır."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2512,11 +2515,11 @@ msgstr ""
 "novice\n"
 "novice <oyuncu-adı>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "Bir ya da birden fazla YZ oyuncusunu 'acemi' seviyesine ayarla."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2527,7 +2530,7 @@ msgstr ""
 "ayarlar."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2535,11 +2538,11 @@ msgstr ""
 "easy\n"
 "easy <oyuncu-adı>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "Bir ya da tüm YZ oyuncularını 'kolay' seviyesine ayarla."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2550,7 +2553,7 @@ msgstr ""
 "ayarlar."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2558,11 +2561,11 @@ msgstr ""
 "normal\n"
 "normal <oyuncu-adı>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "Bir ya da tüm YZ oyuncularını 'normal' seviyesine ayarla."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2573,7 +2576,7 @@ msgstr ""
 "ayarlar."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2581,11 +2584,11 @@ msgstr ""
 "hard\n"
 "hard <oyuncu-adı>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "Bir ya da tüm YZ oyuncularını 'zor' seviyesine ayarla."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2596,7 +2599,7 @@ msgstr ""
 "ayarlar."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2604,11 +2607,11 @@ msgstr ""
 "experimental\n"
 "experimental <oyuncu-adı>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "Bir ya da tüm YZ oyuncularını 'tecrübeli' seviyesine ayarla."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2621,7 +2624,7 @@ msgstr ""
 "sunucular için etkisi yoktur."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2635,11 +2638,11 @@ msgstr ""
 "cmdlevel <level> first\n"
 "cmdlevel <level> <bağlantı-adı>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "Sorgu veya ayar komut giriÅŸ seviyesi giriÅŸi."
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2679,20 +2682,20 @@ msgstr ""
 "güvenilir olmayan kişiler aynı adla bağlanabilirler. Bu komutun bağlantı "
 "adlarını aldığını, oyuncu adlarını almadığını not edin."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "Hiç kimse yoksa, artırılmış yetkilerle oyun kurucusu olun."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <sıra> <sıra-artışı> <değer> <değer-çarpanı>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "bkz. \"help timeoutincrease\"."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2703,24 +2706,24 @@ msgstr ""
 "kullanın. Öntanımlı değerleri şöyledir: 0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr "oyunu bitir"
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Oyunu berabere olarak bitir."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr "teslim olan"
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "Yenilgiyi kabul ederek bitir."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2729,15 +2732,15 @@ msgstr ""
 "teslim olursa bu durumda oyun biter."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <oyuncu-adı>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "Oyuncuyu tamamen sil."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2746,7 +2749,7 @@ msgstr ""
 "haritadan silinir.  Dikkatli kullanın!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2754,11 +2757,11 @@ msgstr ""
 "save\n"
 "save <dosya-adı>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "Oyunu dosyaya kaydet."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2775,7 +2778,7 @@ msgstr ""
 "ve bir kez tekrar bağlandığında 'start' komutunu kullanın. "
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2783,11 +2786,11 @@ msgstr ""
 "load\n"
 "load <dosya-adı>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "Oyunu dosyadan yükle."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2796,28 +2799,28 @@ msgstr ""
 "setleri ve sunucu ayarları kayıtlı oyundan tekrar yüklenecektir.\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <dosya-adı>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "Dosyadan sunucu komutlarını çalıştır."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <dosya-adı>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "Şimdiki ayarları sunucu komutları olarak dosyaya yaz."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "'RFC-style' ve normal biçim arasında sunucu çıktılarını değiştir."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "Sunucunun tanım numarasını verir."
 
@@ -3330,27 +3333,36 @@ msgstr "%s şehrinde ayaklanma başlatırken bir skandala sebep oldunuz."
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s, %s şehrinde ayaklanma başlatırken bir skandala sebep oldular."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 "Denizde gidebilen başlangıç birimleri henüz desteklenmiyor. Kimse %s alamaz."
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Yıl: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr ""
 "Sıra zaman aşımı azami değerini aşmış durumda, azami değere getiriliyor"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "Sıra zaman aşımı sıfırdan düşük, sıfır yapılıyor."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr "Sadece GGZ istemcisi civistemcisini ggz modda çağırmak zorundadır!\n"
 
@@ -3393,25 +3405,25 @@ msgstr "%s isimli bir bağlantı yok."
 msgid "There is no player nor connection by the name %s."
 msgstr "%s adında bir oyuncu veya bağlantı yok"
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "Küresel Isınma başladı!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr "Kıyılara sel bastı ve ovalar çöl oldu."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "Nükleer Kış başladı!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr "Yaş araziler kurudu ve otlaklar tundraya dönüştü."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3420,7 +3432,7 @@ msgstr ""
 "Demiryolunun keÅŸfi ile milyonlara bir umut doÄŸdu.\n"
 "       İşçiler kısa bir zaman içinde bütün şehirleri raylarla donattı."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3429,12 +3441,12 @@ msgstr ""
 "İnsanlarınız en sonunda demiryolunu keşfedebildiğiniz için sevindiler.\n"
 "       İşçiler kısa bir zaman içinde bütün şehirleri raylarla donattı."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "%s, bulunduğu arazinin türü değiştiği için taşındı."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "%s, bulunduğu arazinin türü değiştiği için terhis edildi."
@@ -3493,27 +3505,27 @@ msgstr "Devrim: anarşiye dönüyor."
 msgid "You should choose a new government from the government menu."
 msgstr "Hükümet menüsünden bir yönetim biçimi seçmelisiniz."
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "%s için azami vergi oranı aşıldı, düşürülüyor."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "%s için azami bilim oranı aşıldı, düşürülüyor."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "%s için azami lüks oranı aşıldı, düşürülüyor."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s artık seninle görüş sahasını paylaşmıyor!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
@@ -3522,13 +3534,13 @@ msgstr ""
 "Senato %s ile olan antlaşmayı bozmanızı onaylamadı.  Senatoyu dağıtabilir "
 "veya daha zamanlı hareket edebilirsiniz."
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "%s bizi sürekli tahrik ettiği için senato bu isteğinizi kabul etti."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
@@ -3537,19 +3549,19 @@ msgstr ""
 "Senato %s ile olan antlaşmayı bozmanızı onaylamadı. Yeni bir senato bulmanız "
 "kolay oldu."
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "%s ile %s arasındaki diplomatik ilişki artık %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr " %s antlaşmayı bozdu! %s ve %s arasındaki diplomatik durum artık %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
@@ -3557,7 +3569,7 @@ msgstr ""
 "%s, müttefikinizin %s birimine saldırdı! Saldıran tarafla olan ittifakınız "
 "iptal edildi."
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
@@ -3566,26 +3578,26 @@ msgstr ""
 "Takım arkadaşınız olan %s, %s tarafına savaş açtı. %s ile olan ittifakınız "
 "bozuldu."
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "Oyuncu %s siliniyor."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "Oyundan silindiniz!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s oyundan silindi."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "%s ile karşılaştınız, önderlerinin adı %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3593,17 +3605,17 @@ msgstr ""
 "%s ve %s karşılaştıkları anda savaşa başladılar. İkisiyle olan ittifakınız "
 "bozuldu."
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "%s iç savaş yaşayamıyor - çok fazla oyuncu var"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "%s iç savaş yaşayamıyor - çok fazla oyuncu var"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3612,12 +3624,12 @@ msgstr ""
 "Ulusunuzda bir iç savaş yaşandı, %s şehri bölünen tarafın başkenti ilan "
 "edildi."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s, %s ile müttefik oldu."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3850,21 +3862,21 @@ msgstr "."
 msgid "th"
 msgstr "."
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "İstatistik dizgesi geçersiz karakterler içeriyor. \"help demography\" "
 "komutunu deneyin."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "Ä°statistikler:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "Üzgünüm, istatistik çıkaramıyoruz."
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%s yönetimindeki %s (%s)"
@@ -3875,11 +3887,11 @@ msgstr "%s yönetimindeki %s (%s)"
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "Okunabilir bir \"%s.%s\" kural seti dosyası bulunamadı."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr "Kural setlerinde barbar kavimleri yok, en azından bir tane gerekli!"
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "Kural seti yükleniyor"
 
@@ -3894,7 +3906,7 @@ msgstr ""
 "oyunlar, veya geçersiz kayıt edilmiş oyun sebebiyle olabilir.  Riski göze "
 "alma sorumluluÄŸu size aittir."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Kayıtlı oyun çok eski, en azından 1.9.0 sürümü gerekiyor."
 
@@ -3916,13 +3928,13 @@ msgstr ""
 "desteklenmemektedir. '%s' kullanılmaktadır."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr "%s geçersiz bir millete sahip; %s olarak değiştiriliyor."
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3959,7 +3971,7 @@ msgstr "GeliÅŸmiÅŸ"
 msgid "Networking"
 msgstr "AÄŸ"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "Hepsi"
@@ -3980,7 +3992,7 @@ msgstr "Nadiren"
 msgid "Changed"
 msgstr "DeÄŸiÅŸtirildi"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -3988,7 +4000,7 @@ msgstr ""
 "İzin verilen dizge geçersiz karakterler içermektedir. \n"
 " \"help allowtake\" deneyin"
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -3996,7 +4008,7 @@ msgstr ""
 "BaÅŸlayan birimlerin dizgeleri \n"
 "geçersiz karakterler içermektedir. \"help startunits\" deneyin"
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -4006,15 +4018,15 @@ msgstr ""
 "en az bir şehir kurucu içermemektedir.\n"
 "\"help startunits\" deneyin"
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr "Bitiş yılı başlama yılından erken olamaz."
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "GGZ modda en fazla oyuncu seçeneğini değiştiremezsiniz"
 
-#: server/settings.c:180
+#: server/settings.c:165
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
@@ -4022,11 +4034,16 @@ msgstr ""
 "Oyuncu sayısı istenen değerden fazla;\n"
 "Eski değer kullanılıyor."
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "Bu ayarı değiştirmenize izin verilmiyor."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "Harita Boyutu (bin kare cinsinden)"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -4036,12 +4053,12 @@ msgstr ""
 "  boyut = 4 4.000 kareden oluÅŸan normal bir harita olur\n"
 "  boyut = 20 20.000 kareden oluÅŸan kocaman bir harita olur"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "Harita topolojisi"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4109,11 +4126,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "Harita yapımında kullanılacak yöntem"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4133,11 +4150,11 @@ msgstr ""
 "ayarının öntanımlı değeri kullanılırsa oluşturucuya göre bir startpos ayarı "
 "ayarlanacaktır.  Arıca bkz. \"startpos\" ayarı."
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Başlangıç noktalarını seçme yöntemi"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4159,36 +4176,36 @@ msgstr ""
 "Not: Oluşturucular, oyuncu sayısı ve başlama yeri seçimine göre uygun sayıda "
 "kıta yapmaya çalışırlar"
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "1x1 adaların varlığı"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = 1x1 ada olmasın; 1 = biraz 1x1 ada olsun"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Kutuplar ayrı kıtalarda"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr ""
 "0 = kıtalar kutuplara yapışık olabilir; 1 = kutuplar büyük oranda ayrık olur"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "Haritanın tamamı ılıman"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = normal Dünya gibi gezegen; 1 = tamamı ılıman gezegen "
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "Gezegenin ortalama ısısı"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4217,11 +4234,11 @@ msgstr ""
 "\n"
 "0 verilirse büyük kutupları olan çok soğuk bir gezegen olur."
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "Karaların denizlere oranı"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
@@ -4229,11 +4246,11 @@ msgstr ""
 "Bu ayar haritanın yaklaşık olarak yüzde kaçının karalarla kaplı olacağını "
 "belirler."
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "Tepe ve dağların miktarı"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
@@ -4241,11 +4258,11 @@ msgstr ""
 "Küçük değerler engebesiz haritalar yaparken büyük değerler dağlarla ve "
 "tepelerle kaplı bir gezegen yapacaktır."
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "Karadaki su miktarı"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4253,11 +4270,11 @@ msgstr ""
 "Küçük değerler bolca çöl benzeri araziler oluştururken; yüksek değerler "
 "bataklık, sık orman, nehir gibi araziler oluşturur."
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Harita yapımında kullanılan rastgele tohum"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4267,11 +4284,11 @@ msgstr ""
 "zamanına göre rastgele bir sayı oluşturulacaktır. Bu, genelde "
 "geliştiricilerin hata ayıklarken kullandığı bir ayardır."
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "Oyunun rastgele sayısı"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
@@ -4279,11 +4296,11 @@ msgstr ""
 "Sıfır için (öntanımlı olan) zaman temel alınarak bir kaynak seçilecektir. Bu "
 "ayarlar sadece oyun hatalarını düzeltmede kullanılır"
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "\"Özel\" kaynaklı kare miktarı"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
@@ -4291,11 +4308,11 @@ msgstr ""
 "Özel kaynaklar bulunduklar temel arazi özelliklerini arttırırlar. Sunucu "
 "değişebilir ölçeği biner basamaklıdır."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "Kulübe sayısı (ufak yerel köyler)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4303,23 +4320,24 @@ msgstr ""
 "Bu ayarlar, tüm haritadaki kulübelerin tam sayısını verir. Kulübeler "
 "birimler tarafından incelenebilen küçük köylerdir."
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "En az oyuncu sayısı"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "Oyun başlamadan önce asgari sayıda oyuncu (bağlı insan veya YZ oyuncuları) "
 "olmalıdır. "
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "En fazla oyuncu sayısı"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4329,11 +4347,11 @@ msgstr ""
 "oyuncu oyundan önce toplanırsa, sonradan bağlanmaya çalışanlar "
 "alınmayacaktır."
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "Toplam oyuncu sayısı (YZ oyuncular dahil)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
@@ -4341,12 +4359,12 @@ msgstr ""
 "Eğer pozitif değer ayarlanırsa, o miktarı koruyacak şekilde YZ oyuncuları "
 "kendiliğinden oluşturulur veya kaldırılır ."
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Başlangıçtaki birim listesi"
 
 # 		: server/settings.c:447
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4374,27 +4392,27 @@ msgstr ""
 "     a     =Hızlı saldırı birimi (ör.,Atlı)\n"
 "     A     =Kuvvetli saldırı birimi (ör., Mancınık)\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "Başlangıçtaki birimlerin yerleştirileceği alan"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "Bu, başlangıç birimlerinin dağıldığı yarıçaptır"
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "Başlangıçta oyunculara verilen altın miktarı"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "Bu miktarda altın, her bir oyuncuya oyun başlangıcında verilmektedir."
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "Başlangıçta oyunculara verilen teknoloji sayısı"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4406,11 +4424,11 @@ msgstr ""
 "tech_cost_style (teknolojimasrafbiçimi) değerine bağlı olarak, teknoloji "
 "seviyesinin büyüklüğü gelecek teknolojileri aşırı pahalı yapabilir."
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "Teknoloji masrafı çarpanının yüzdesi"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4420,11 +4438,11 @@ msgstr ""
 "teknoloji bedelleri bu miktar ile çarpılır (yüzde olarak). Temel teknoloji "
 "bedelleri kural setleri veya diğer oyun ayarları ile belirlenir."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "Teknoloji değişiminde ceza yüzdesi"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4434,11 +4452,11 @@ msgstr ""
 "puanların varsa, bunları yüzde olarak kaybedersin.  Bu yeni sırada henüz "
 "geliştirdiğin teknoloji için geçerli değildir."
 
-#: server/settings.c:510
+#: server/settings.c:501
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "Antlaşmadan alınan teknoloji ve altına ceza"
 
-#: server/settings.c:511
+#: server/settings.c:502
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4450,11 +4468,11 @@ msgstr ""
 "bu değer sıfır değilse, eksi araştırma puanı ile sonuçlanabilir. Aynı "
 "zamanda diplomatik antlaşmalarda altın alışverişine uygulanır."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "Fetihten gelen teknolojiye ceza"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4464,11 +4482,11 @@ msgstr ""
 "masrafına eşit miktarda yüzde olarak araştırma puanınızdan düşme olur. Eğer "
 "bu değer sıfır değilse, negatif araştırma puanı ile sonlanabilir. "
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "Ãœcretsiz teknoloji alana ceza"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4482,11 +4500,11 @@ msgstr ""
 "düşme olur. Eğer bu değer sıfır değilse, negatif araştırma puanı ile "
 "sonlanabilir. "
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "Şehrin büyümesi için gerekli gıda"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4495,11 +4513,11 @@ msgstr ""
 "Bu, şehrin büyümesi için temel alınan yiyecek miktarıdır. Bu değer, kural "
 "setlerinden gelen faktörle çarpılır ve şehrin büyüklüğüne göre değişir."
 
-#: server/settings.c:553
+#: server/settings.c:544
 msgid "Percentage food lost when building needed"
 msgstr "Yapı lazımken kaybedilen gıda yüzdesi"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4509,11 +4527,11 @@ msgstr ""
 "büyüyemiyorsa (veya Lağım Sistemi), yiyeceklerini belirtilen yüzde ile "
 "kaybeder ( Tahıl ambarı varsa o miktarın yarısı kadar)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Üretim fiyatları çarpanı yüzdesi"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
@@ -4521,11 +4539,11 @@ msgstr ""
 "Bu, birimlerin ve binaların ne kadar hızlı büyüyebileceğini etkiler. Temel "
 "fiyatlar bu değer ile çarpılır (yüzde olarak)."
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "Tam ticaret alabilecek en düşük şehir boyutu"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4537,11 +4555,11 @@ msgstr ""
 "fulltradesize deÄŸerine doÄŸru derece derece azalarak %0 (normal bozulma "
 "haricinde ceza yok) olur. Ayrıca bakınız: notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "Ticaret alamayacak en büyük şehir boyutu"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4551,11 +4569,11 @@ msgstr ""
 "notradesize değerinden büyük ve fulltradesize değerinden küçük şehirlerde "
 "derece derece artar. Ayrıca bakınız: fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "İnsanların mutsuz olmaya başlayacağı şehir boyutu"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4563,11 +4581,11 @@ msgstr ""
 "Diğer ayarlamalardan önce, şehirdeki ilk mutsuzlukseviyesi vatandaşları "
 "memnun, sıradakiler mutsuzdur. Şehirfaktörüne bakın."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "Mutsuzluğu arttıracak şehir sayısıkile"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4579,11 +4597,11 @@ msgstr ""
 "mutsuzlukseviyesine bakınız. Bu bir Demokrasiyi varsaymaktadır; diğer "
 "yönetim biçimlerinde şehir sayısı daha da azalır."
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "Şehirler arası en düşük mesafe"
 
-#: server/settings.c:619
+#: server/settings.c:610
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
 "this distance. For example, when this value is 3, there have to be at least "
@@ -4595,11 +4613,11 @@ msgstr ""
 "her yönde en az 2 boş arazi olmalıdır. Eğer 0 ayarlanırsa (öntanımlı), kural "
 "seti değeri kullanılacaktır."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "Kendinden geçme etkisi için sıra sayısı"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
@@ -4607,11 +4625,11 @@ msgstr ""
 "Şehrin kendinden geçerek büyüme etkisi için sıra sayısını ayarlar. Eğer n a "
 "ayarlanırsa, kutlamalar n+1 sıra geçtikten sonra şehir büyüyecektir."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "Fetih sırasında yapıların yıkılması şansı"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
@@ -4619,11 +4637,11 @@ msgstr ""
 "Bir oyuncu bir şehri fethettiğinde, her bir şehir ilerlemesi bu yüzde değeri "
 "kadar yıkılma ihtimaline sahiptir."
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "Saldırıdan sonra yenilen tarafa ilerleme şansı"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4637,11 +4655,11 @@ msgstr ""
 "ile 100 arasında olursa, bu yüzde biçiminde bölgeyi ele geçirme \"occupying"
 "\" ihtimali olarak kullanılır."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "Sunucu taraflı otomatik saldırıyı aç/kapa"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
@@ -4649,11 +4667,11 @@ msgstr ""
 "Eğer on olarak ayarlanırsa, sola hareket alan birimler bitişiğine gelen "
 "düşmana kendiliğinden saldırıyı düşünecek."
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "Saldırıdan sonra şehir nüfusunu azalt"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4669,11 +4687,11 @@ msgstr ""
 "  3 = helikopter\n"
 "  4 = hava"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "Ulusal sınır yarıçapı"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4684,22 +4702,22 @@ msgstr ""
 "birden fazla ulus şehrinin mesafesi içine giren yer yapıları için özel "
 "kurallar geçerli olur."
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "Sınır içindeki birimler mutsuzluk yaratmaz"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
 "Eğer bu ayarlıysa, birimler kendi sınırları içerisinde mutsuzluğa yol açmaz."
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "Diğer oyuncularla diplomasi yapılabilir"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4713,11 +4731,11 @@ msgstr ""
 "3 = diploması takımlar için engellenmiştir\n"
 "4 = diplomasi herkese engellenmiÅŸtir."
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "İzin verilen şehir adları"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4743,11 +4761,11 @@ msgstr ""
 "3 = Ayar 2 gibi, ancak bir oyuncu başka bir ulusun öntanımlı şehir ismini, "
 "kendisi için de öntanımlı değilse değiştiremez."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Barbarların ortaya çıkma sıklığı"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4761,19 +4779,19 @@ msgstr ""
 "3 = Barbarların sık sık ayaklanması \n"
 "4 = Aşırı büyük barbar topluluğu ve yaygarası"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Barbarların başlama yılı"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Barbar bu yıldan önce ortaya çıkmazlar"
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "Devrim için gerekli sıra miktarı"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4781,11 +4799,11 @@ msgstr ""
 "Rejimi değiştirdiğinizde, bir kaç sıra sürecek olan anarşi dönemi yaşanır. "
 "Bu değeri 0'a ayarlamak 1-6 arasında rastgele uzunluğu verir. "
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "Savaşın gölgesi aktif"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4795,11 +4813,11 @@ msgstr ""
 "görüş alanındaki arazileri görebilirsiniz. Bunun dışında kalan bölgelerdeki "
 "yeni kurulan şehirleri ve arazi değişikliklerini görmeyeceksiniz."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Diplomat ve casusların en düşük başarı yüzdesi"
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
@@ -4808,19 +4826,19 @@ msgstr ""
 "Casusun bir görevden başarılı dönme şansı ve diplomatlar ile casusların "
 "görevde başarılı olma şansının tabanı."
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "Uzay yarışı izinli"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Eğer bu seçenek 1 olarak seçilirse, oyuncular uzay gemileri yapabilir."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "İç savaş için en düşük şehir sayısı"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4829,11 +4847,11 @@ msgstr ""
 "Bir oyuncunun en az bu sayıda şehri varsa ve başkenti ele geçirilirse iç "
 "savaş yaşanır. Bu ayar en yüksek değere getirilirse iç savaş asla yaşanmaz."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Oyuncu ile etkileşimin kaybolacağı sıra sayısı"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4843,11 +4861,11 @@ msgstr ""
 "elçilikleri olmasa bile diplomatik görüşme yapabilirler. Sıfır olarak "
 "ayarlanırsa elçilik olmadan diplomatik görüşme yapılamaz."
 
-#: server/settings.c:810
+#: server/settings.c:801
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "Başkent fethedildiğinde sarayı yeniden yap"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4855,21 +4873,21 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "Doğal şehir adları kullanılsın"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr "Etkinse, öntanımlı şehir adları etraftaki araziye göre belirlenir."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Kullanıcıların alabileceği oyuncu sayısı"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4903,11 +4921,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "Bağlantı durumuna göre YZ devreye girsin/devreden çıksın"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -4915,95 +4933,97 @@ msgstr ""
 "Eğer bu 1 seçilirse, YZ oyuncu bağlanınca devreden çıkar, ayrılınca devreye "
 "girer."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "Oyunun bitiş yılı"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "Oyun belirtilen senenin sonunda biter."
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "Bir sırada harcanacak en fazla süre"
 
-#: server/settings.c:885
+#: server/settings.c:876
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "Düşman hareket edince en az n saniye zaman aşımı"
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Eş zamanlı sıra"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr ""
 "İstemcinin ağ bağlantısını engellemesine izin vermek için geçecek saniye"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
 "connections will be automatically disconnected eventually)."
 msgstr ""
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "Ağ tamponlarının boşalması için azami saniye"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
 "not wait at all."
 msgstr ""
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "PINGler arasındaki bekleme"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr ""
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "İstemciyi oyundan atma süresi"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr ""
 "Eğer bir istemci PING'e cevap vermiyorsa, bu durumda istemci bağlantısı "
 "kopmuÅŸtur."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "Sırayı bitirmeyen oyun modu"
 
-#: server/settings.c:948
+#: server/settings.c:941
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
 "finished their turn, including disconnected players."
@@ -5011,11 +5031,11 @@ msgstr ""
 "Eğer bu değer 1 ayarlanmışsa, bağlantıyı koparmış oyuncular dahil sıralarını "
 "geçirmeden oyun ilerlemez."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "Sabit uzunlukta sıralı oyun modu"
 
-#: server/settings.c:956
+#: server/settings.c:949
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
 "expired, even after all players have clicked on \"Turn Done\"."
@@ -5023,11 +5043,11 @@ msgstr ""
 "Eğer bu değer 1'se, tüm oyuncular \"Sırayı Geçir\" tuşuna bassa bile sıra "
 "zaman dolana kadar ilerlemez."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "İstatistiklerde görünecek bilgiler"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -5049,11 +5069,11 @@ msgid ""
 "The order of characters is not significant, but their capitalization is."
 msgstr ""
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "Oto-kayıt için sıra sayısı"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
@@ -5061,11 +5081,11 @@ msgstr ""
 "Oyun bu sayı değerindeki her periyotta kendiliğinden kayıt edilecektir. "
 "Sıfır asla kendiliğinden kaydetme demektir."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "Kayıtlı oyunu sıkıştırma seviyesi"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -5076,11 +5096,11 @@ msgstr ""
 "zamanı uzatır. Eğer en yüksek sıfır ise, bu sunucu zlib kullanacak şekilde "
 "derlenmemiÅŸtir."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "Oto-kayıt isim öneki"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
@@ -5088,11 +5108,11 @@ msgstr ""
 "Kendiliğinden kaydolan oyunların adları \"<önek><yıl>.sav\" şeklinde olur. "
 "Bu ayar <önek> kısmı içindir."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "Oyuncu istatistiklerini kaydet"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -5106,7 +5126,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "Sunucu standart girdileri okuyamaz. Girdileri deÄŸerlendirmiyor."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "Sunucu: geçersiz adres: [%s:%d]."
@@ -5241,102 +5261,102 @@ msgstr "Oyun %s olarak kaydedilemedi"
 msgid "Game saved as %s"
 msgstr "Oyun %s olarak kaydedildi"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "Oyun zaten başladı."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "Oyun başlıyor."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr ""
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "Uyarı: eski istemci %s reddedildi"
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr ""
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "Lütfen boş olmayan bir isim seçin."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "Bu ulusu başkası almış."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "Başka bir oyuncu '%s' adını kullanıyor.  Lütfen başka bir ad seçin."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "Lütfen sadece İngiliz alfabesindeki harfleri içeren bir isim seçin."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "Bu senaryoda %s ulusu yok."
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "%s ulusunu başkası almış."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s, %s ulusunun önderi %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "Oyunu başlatmayı bekliyor: %d/%d oyuncu başlamaya hazır."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s, %s seviyesinde YZ kontrolündeki oyuncu olarak eklendi."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Oyuncu %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%2$s tarafına %1$s hükmediyor."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "Bilgiler metasunucuya gönderiliyor [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "Oyun bitti..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "Yeni istemcilerin bağlantıları kabul ediliyor."
 
@@ -5357,7 +5377,7 @@ msgstr "(ikianlamlı)"
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5531,7 +5551,7 @@ msgstr "Oyun başladıktan sonra oyuncuları çıkartamazsınız."
 msgid "Removed player %s from the game."
 msgstr "Oyuncu %s oyundan çıkartıldı."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "\"%s\" ismi güvenlik nedeniyle yasaklanmıştır."
@@ -5603,237 +5623,237 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr ""
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr ""
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr ""
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr ""
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr ""
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr ""
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr ""
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Seçenek:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "Tanım:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "Durum: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "deÄŸiÅŸken"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "sabit"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "DeÄŸer: %d, Asgari: 0, Standart: %d, Azami: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "DeÄŸer: %d, Asgari: %d, Standart: %d, Azami: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "DeÄŸer: \"%s\", Standart: \"%s\""
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr ""
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "Henüz bunun bir açıklaması yok."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "Birden fazla olabilecek ayar adı."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "Sunucu Yöneticisi: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Oyuncu '%s' YZ derecesi artık '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s YZ tarafından kontrol edilmiyor."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "Öntanımlı YZ derecesi '%s' olarak ayarlandı."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "Bu komut sadece istemci tarafında verilebilir."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Kullanımı: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Sadece oyuncular away komutunu kullanabilir."
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s uzakta moduna geçti."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s oyuna geri döndü."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "Üzgünüm, '%s' ayarına bakmaya yetkiniz yok."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "Bilinmeyen ayar '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "Bütün seçenekler öntanımlı olmayan değerlerde"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "Bütün seçenekler"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "Hayati seçenekler"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Durumuna göre seçenekler"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "Nadiren kullanacak seçenekler"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ ayarı değiştirmişsiniz demektir"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= ayar öntanımlı değerinde demektir"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s deÄŸer   (asg,aza)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Seçenek"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "tanım"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "Oyun başladıktan sonra takımlar değiştirilemez."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "Tanımlanmamış argüman. Kullanım: team <oyuncu> <takım>."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 "%s diye bir takım yok.  Lütfen geçerli bir takım adı veya numarası girin."
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "Bir barbarla takım olunamaz."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "%s, %s ile takım oldu."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "Tanımlanmamış argümanlar. Kullanım: vote yes|no [oylama numarası]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "Seyirciler oy veremez."
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -5841,461 +5861,487 @@ msgstr ""
 "Sadece çalışan bir oyunda oy kullanabilirsiniz. Eğer yönetici yoksa 'first' "
 "komutunu kullanarak yönetici olabilirsiniz."
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr ""
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "Şu an oylama yapılmıyor."
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr ""
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Değer bir tamsayı olmalı"
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "Böyle bir oy yok (%d)."
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "\"%s\" lehinde oy kullandınız"
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "\"%s\" aleyhinde oy kullandınız"
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Bu komut oyun başladıktan sonra kullanılabilir."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "%s diplomasisinde hata ayıklanmıyor"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "%s diplomasisinde hata ayıklanıyor"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "%s teknolojisinde hata ayıklanmıyor"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "%s teknolojisinde hata ayıklanıyor"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "2. ve 3. değerler tamsayı olmalıdır."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "Yanlış koordinat."
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "Bu koordinatlarda ÅŸehir yok."
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "%s hata ayıklamada kullanılmıyor"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, c-format
 msgid "%s %s no longer debugged."
 msgstr "%s %s hata ayıklamada kullanılmıyor."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, c-format
 msgid "%s %s debugged."
 msgstr "%s %s hata ayıklamada kullanılıyor."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "Değer 2 bir tamsayı olmalıdır."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "%d birimi yok."
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "Tanımlanmamış argüman. Kullanım: set <seçenek> <değer>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "Bu ayarı değiştirmenize izin verilmiyor."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "Bu ayar oyun başladıktan sonra değiştirilemez."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Değer bir tamsayı olmalı."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr "%s parametresi sadece 0 ve 1 rakamlarından oluşmalıdır."
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Değer sınırların dışında (asgari: 0, azami: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Ayar: %s, %d olarak ayarlandı."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr "%s parametresi sadece +- karakterlerinden ve rakamlardan oluşmalıdır."
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Değer sınırların dışında (asgari: %d, azami: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "Dizi değeri çok uzun. Kullanım: set <seçenek> <değer>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Ayar: %s ayarı \"%s\" olarak değiştirildi."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "Üzgünüm, bu oyunu tamamen gözlemleyemezsiniz."
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "Bu sunucuda elle oyun kaydedemezsiniz."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr ""
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr ""
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Kullanım: observe [bağlantı-adı [oyuncu-adı]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Kullanım: observe [oyuncu-adı]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr ""
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr ""
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr ""
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr ""
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr ""
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Kullanım: take <bağlantı-adı> <oyuncu-adı>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Kullanım: take <oyuncu-adı>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr ";Kullanım: take [bağlantı-adı] <oyuncu-adı>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s zaten %s tarafını kontrol ediyor"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "%s adında bir oyuncu veya bağlantı yok"
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr ""
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%2$s, %1$s tarafından kontrol ediliyor (%3$s, %4$s)"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Barbar"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "YZ"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "Ä°nsan"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "Canlı"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "Ölü"
 
-#: server/stdinhand.c:3088
-#, c-format
-msgid "%s failed to attach to any player"
+#: server/stdinhand.c:3147
+#, fuzzy, c-format
+msgid "%s failed to attach to any player."
 msgstr "%s herhangi bir oyuncuya bağlanamadı."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Kullanım: detach <bağlantı-adı>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr ""
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr ""
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr ""
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr ""
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr ""
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Kullanım: load <oyun-adı>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "Başka bir oyun çalışırken oyun yüklenemez."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "\"%s\" adlı bir senaryo veya kayıtlı oyun bulunamadı."
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "Kayıt dosyası yüklenemedi: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "Geçerli kural seti dizini: \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "Kural seti dizini \"%s\" bulunmadı."
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "Kural seti dizini zaten \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "Kural seti dizini \"%s\" olarak ayarlandı"
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "Hoşçakal."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "Üzgünüm, sunucu komutları kullanma izniniz yok."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "Uyarı: '%s' komutu '%s' olarak çalıştırıldı, komutlar hakkında yardım almak "
 "için '%shelp' yazın."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "Bilinmeyen komut.  '%shelp' yazmayı deneyin."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "Yeni oyunuz önceki oyunuzu iptal etti."
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "Bu komutu kullanma izniniz yok."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(sunucu istemi)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "Oyun berabere bitti."
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr "Oyun bitiriliyor. Bütün istemciler çıkınca sunucu baştan başlatılacak."
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "Oyun bitirilemez: çalışan bir oyun yok."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s teslim olduğu için artık kazanamaz."
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "Şu anda teslim olamazsın."
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Yeterli oyuncu sayısı olmadan oyun başlamayacak."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Yeterli oyuncu sayısı olmadan oyun başlamayacak."
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Yeterli oyuncu sayısı olmadan oyun başlamayacak."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "Bütün oyuncular hazır; oyunu başlatılıyor."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr "Oyun başlatılamıyor: bütün istemcilerin çıkması bekleniyor."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "Oyun başlatılamıyor: zaten başlatılmış"
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "Bağlantı kesiliyor %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6334,121 +6380,121 @@ msgstr ""
 "  save   -  o anki oyunu kaydeder\n"
 "  quit   -  çıkar"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "Komut:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "Özet:"
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "Seviye: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "Şu sunucu komutları kullanılabilir durumdadır:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr ""
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr ""
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr ""
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Oyuncu listesi:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<oyuncu yok>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "kullanıcı %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", Ölü"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", zorluluk derecesi %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr ", hazır"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ", hazır değil"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d bağlantı:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s, %s adresinden (komut eriÅŸim seviyesi %s), tampon=%dkb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (izleyici modu)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "Takım listesi:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d : '%s' : %d oyuncu"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d : '%s' : 1 oyuncu : %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "Boş takım: %s"
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "Sunucuya olan bağlantıların listesi:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<hiç bağlantı yok>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "Mümkün olan senaryolar:"
 
@@ -6523,17 +6569,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "Teknoloji hedefimiz %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "%s teknolojisini %s tarafından çaldınız."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%s sizden %s teknolojisini çaldı!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%s, %s teknolojisini %s tarafından çaldı."
@@ -7053,20 +7099,20 @@ msgstr "%s şehrinde harika yapımı başarısız oldu."
 msgid "Your %s has invalid orders."
 msgstr "%s biriminiz geçersiz emirler almış."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "Yüksek kara parçası - bu birkaç saniye alabilir."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "Üretici %d kullanılıyor."
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Üretici 3 bütün büyük adaları yerleştirmedi."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Üretici 3 %li kara parçasını yapamadı."
@@ -7152,118 +7198,119 @@ msgstr "Yanlış yapılandırmadan veya izin sorunlarından kaynaklanıyor olabi
 msgid "Cannot find audio file %s"
 msgstr "Ses dosyası %s bulunanadı"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "XXX/XXX XXX sıra"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d altın / sıra"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d sıra"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "asla"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/sıra"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d sıra"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "Artık Kullanılmaz"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "Yapıldı"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "Büyük Harika"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "Küçük Harika"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/sıra"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : Nüfus\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Ticaretten gelen vergiler\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "%+4d : %s ile ticaret yolu\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "%+4d : İnşaat öşrü\n"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr "%+4d : %s'den gelen Bonus (%+d%%)\n"
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr "%+4d : Atık\n"
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr "%+4d : KargaÅŸa\n"
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr "%+4d : Kullanımda\n"
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr "==== : Toplam\n"
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr "%4d : Bakiye"
@@ -7375,8 +7422,8 @@ msgid "Best defending units"
 msgstr "En Ä°yi Savunabilen Birimler"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7546,8 +7593,8 @@ msgstr "?pollution [short]:Kırl."
 msgid "?cma:Governor"
 msgstr "?cma:Vali"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7801,19 +7848,19 @@ msgid ""
 "%d times"
 msgstr ""
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "acemi"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "kolay"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "normal"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "zor"
 
@@ -7821,31 +7868,31 @@ msgstr "zor"
 msgid "experimental"
 msgstr "deneysel"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "Sunucuya bağlanıyor... "
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "Sunucu başlatılamadı."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Elle bir tane açmanız gerekecek. Üzgünüm..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "Sunucuya bağlanılamadı."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "Galiba buradan başlatamadık."
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "Sunucu bizim kontrolümüzde (komut erişim seviyesi)"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "Sunucunun kontrolünü ele geçiremedik, öldürmeye çalışıyor."
 
@@ -7930,27 +7977,27 @@ msgstr "Sadece %s etkilenir.\n"
 msgid "Requires a minimum size of %d.\n"
 msgstr "En az %d boyutunda olmayı gerektirir.\n"
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "%s yapma imkanı sağlar."
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "%s yapma imkanı sağlar (%s ile)."
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " Nehir"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "Üzgünüm, %s için yardım yok.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -7961,7 +8008,7 @@ msgstr ""
 "Bu sayfa otomatik üretildi.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
@@ -7969,78 +8016,78 @@ msgstr ""
 "Hiçbirşey gerektirmez\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* %s teknolojisi %s yapısını geçersiz kılar.\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr ""
 "* %s teknolojisisi bilen bütün oyuncuların %s birimleri yapabilmesini "
 "saÄŸlar.\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* %s saÄŸlar (%s ile).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* %s saÄŸlar.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Sadece %s olan şehirlerde yapılabilir.\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Sadece yönetim biçimi %s iken yapılabilir.\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* Şehirlerde yapılamaz.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* Memleketi yoktur.\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* Bunu kaybederseniz oyunu da kaybedersiniz!\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* Bütün oyuncularda bu birimden sadece bir tane olabilir.\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* Yapılması için %d nüfus gerekir.\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* %d hava birimini taşıyıp yakıt verebilir.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* %d füzeyi taşıyıp yakıt verebilir.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* %d kara birimini denizde taşıyabilir.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
@@ -8048,164 +8095,164 @@ msgstr ""
 "* Ticaret yolları yapabilir (memleketinden asgari 9 kare [manhattan "
 "ölçeğiyle] uzaktaki bir şehre gitmelidir).\n"
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Harika yapımına yardım edebilir (%d üretim ekler).\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* Terhis edilemez.\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 "* Bir şehirde terhis edilerek üretiminin %%50'sini geri kazandırabilir.\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Yeni ÅŸehir kurabilir.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr "* Şehre %d nüfus ekleyebilir (%d büyüklüğünden az yerlerde).\n"
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Yol ve ray yapabilir.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Maden yapabilir.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Sulama yapabilir.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Tarla yapabilir.\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Tarla yapabilir (%s biliniyorsa).\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Tarla yapabilir (ÅŸunlardan biri biliniyorsa: %s).\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Kale yapabilir.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Kale yapabilir (%s biliniyorsa).\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Kale yapabilir (ÅŸunlardan biri biliniyorsa: %s).\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* KirliliÄŸi temizleyebilir.\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Nükleer serpintiyi temizleyebilir.\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Araziyi dönüştürebilir.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Hava üsleri yapabilir.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* Kendini güçlendirip savunma puanını, %%50 arttırabilir.\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* Araziyi yağmalayıp geliştirmeleri yok edebilir.\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* Diplomatik iÅŸleri ve casus iÅŸlerini yapabilir.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Diplomatik iÅŸler yapabilir.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* Diplomatla yapılan bir savaşı asla kaybetmez.\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* Rüşvet kabul etmez.\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Düşman hava birimlerine saldırabilir.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* Düşman şehri veya birimi yanında olmadıkça görülemez.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Sadece denizdeki birimlere saldırabilir (kara saldırısı yok).\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr ""
 "* Denizdeki birimlerden düşman şehirlerine veya topraklarına saldırabilir.\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Dost şehirlerden paraşütle atlatılabilir (Menzil: %d).\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* 'atlı' sınıfındaki birimlere karşı savunmasını ikiye katlar.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* Bazı savunuculara karşı 'atlı' olarak sayılır.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* Füze birimi: saldırdıktan sonra kaybolur.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* Saldırı yapınca sırası geçer.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* Bu birimin saldırısı nükleer patlamaya yol açar!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* Şehirlere saldırırken gücü ikiye katlanır.\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* Surlardan etkilenmez.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
@@ -8214,35 +8261,35 @@ msgstr ""
 "* Bombalama saldırısı yapar (her sıra %d tane).  Bu saldırılar sadece "
 "savunan tarafı etkiler ve asla öldürmez.\n"
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* Füze ve uçaklara karşı savunmayı beş kat arttırır.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* Arazi etkilerinden muaftır (bütün karelere yol gibi davranır).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* Kontrol bölgeleri kuralına uymaz.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* Sivil bir birimdir (saldırı yapamaz; sıkıyönetimi etkilemez).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "* Alan birimi: saldırgan değilken bile bir mutsuzluk oluşturur.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* Kıdemli olamaz.\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* Eğitimle veya savaşla kıdemli olabilir.\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8251,12 +8298,12 @@ msgstr ""
 "* Sıranın sonunda bir şehirde veya kıyıda olmalıdır, yoksa %%50 ihtimalle "
 "kaybolur.\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "* %s keşfi riski %%25 azaltır.\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s riski %%12'ye düşürür.\n"
@@ -8265,27 +8312,27 @@ msgstr "* %s riski %%12'ye düşürür.\n"
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " veya "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr ", "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] ""
 "* Birim %2$d sıra sonunda bir şehir veya %1$s karesinde olmalıdır.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Şimdi %s ile başlarsak %d ampül gerekecek."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8294,90 +8341,90 @@ msgstr ""
 "%s teknolojisine ulaşmak için önce %d tane teknoloji öğrenmeliyiz. Tüm "
 "projenin bitmesi için %d ampül gerekecek."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Bu teknolojiyi araştıramazsınız."
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr ""
 " Bu sayı, diğer oyuncuların neyi araştıracağına bağlı olarak değişebilir.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr ""
 "* %s teknolojisini bulan ilk oyuncu başka bir teknolojiyi hemen öğrenir.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* Açık denizde gemilerin kaybolma riskini %%25 azaltır.\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* Açık denizde gemilerin kaybolma riskini %%12'ye düşürür.\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Nüfustan doğan kirliliği arttırır.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* %s biriminin ırmak üzerinde yol yapabilmesine imkân sağlar.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* %s biriminin kale yapmasına imkân sağlar.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* %s biriminin hava üssü yapmasına imkân sağlar.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* %s biriminin yolları raya çevirmesine izin verir.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* %s biriminin sulamayı tarla olarak değiştirmesine izin verir.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* Bu arazide kirlilik oluÅŸturulamaz."
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Bu arazide şehir yapılamaz."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* Bu arazinin sahili güvenli değildir."
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* Bu arazi birimlerin dolaşması için güvenli değildir."
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* Kara birimleri denizde gidemezler."
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr "Özellik:\n"
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr " Hiç "
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8388,7 +8435,7 @@ msgid_plural ""
 msgstr[0] ""
 "* Sınır dışında bulunan veya savaşan her birim %d vatandaşı mutsuz eder.\n"
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8397,49 +8444,49 @@ msgstr ""
 "* Bütün şehirleriniz birimlerin yol açtığı %d mutsuzluktan etkilenmezler.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr "* %d kat daha fazla %s bakımı ödersiniz.\n"
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr "%d kat daha fazla birim bakımı ücreti ödersiniz.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr "* Birimleriniz için hiç %s bakımı ödemezsiniz.\n"
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr "* Birimleriniz için hiç bakım ücreti ödemezsiniz.\n"
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr "* Bütün şehirleriniz birim bakımları için %d %s harcamazlar.\n"
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr "* Bütün şehirlerinizin birim bakımı harcamaları %d azalır.\n"
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 "* Başkentinizi kaybederseniz sivil savaşın çıkma olasılığı %%%d olur.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8449,7 +8496,7 @@ msgstr ""
 "çıkmaya başlayacaktır.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
@@ -8458,17 +8505,17 @@ msgstr ""
 "* Åžehir boyutundan kaynaklanan ilk mutsuz vatandaÅŸtan sonra, her %d fazladan "
 "şehir için bir tane daha mutsuz vatandaş ortaya çıkar.\n"
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 "Bilim, altın ve lüks için ayarlayabileceğiniz en fazla oran %%%d olur.\n"
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr "bilim/vergi/lüks oranlarında sınır yoktur.\n"
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8480,14 +8527,14 @@ msgstr[0] ""
 "* Birimleriniz sıkıyönetim yapabilir. Bir şehirdeki her askeri birim %d "
 "mutsuz vatandaşı memnun edecektir.\n"
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
 msgstr[0] "* Bir şehirde en fazla %d birim sıkıyönetim yapabilir.\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
@@ -8496,15 +8543,15 @@ msgstr ""
 "* Şehirlerinizi kutlamalarla büyütebilirsiniz.  Şehriniz bu şekilde "
 "büyüyebilmek için en az %d boyutunda olmalıdır.\n"
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* Birimleriniz rüşvet kabul etmezler.\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* Şehirlerinizde ayaklanma çıkartılamaz.\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
@@ -8512,39 +8559,39 @@ msgstr ""
 "* İki sıra üst üste herhangi bir şehrinizde ayaklanma olursa hükümet çöker "
 "ve anarşi yönetimine geçilir.\n"
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* Senato, savaş kararını veto edebilir.\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr "* Şehri düşmanlar alınca partizan oluşturur.\n"
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr "* Mutsuzluğu engelleyen binalar altın verir.\n"
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr "* Müfritler için bakım ücreti ödenmez.\n"
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* Hiç mutsuz vatandaşı yok.\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* Kıdemli %s birimleri.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* Kıdemli birimler.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8554,7 +8601,7 @@ msgstr ""
 "her arazinin geliri 1 azalır.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8564,7 +8611,7 @@ msgstr ""
 "yapıldığı zaman  %d daha fazla gelir sağlar.\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
@@ -8572,65 +8619,65 @@ msgstr ""
 "gelir saÄŸlar.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* %s üretimi %%%d oranında artar.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* %s üretiminin büyük bir kısmı yolsuzluğa gider.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* %s üretiminin bir kısmı yolsuzluğa gider.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* %s üretiminin küçük bir kısmı yolsuzluğa gider.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* %s yolsuzluğu başkentten uzaklaştıkça hızlanarak artar.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* %s yolsuzluğu başkentten uzaklaştıkça artar.\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr "* %s yolsuzluğu başkentten uzaklaştıkça yavaşlayarak artar.\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* %s inÅŸa etmeye imkan saÄŸlar.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d mutsuz"
@@ -9021,16 +9068,16 @@ msgstr ""
 msgid "Start of turn %d"
 msgstr "%d. sıranın başlangıcı"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "YZ Modu ÅŸimdi %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "AÇIK"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "KAPALI"
 
@@ -9061,13 +9108,13 @@ msgstr "Ä°sim"
 msgid "Username"
 msgstr "Kullanıcı adı"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "Bayrak"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9081,7 +9128,7 @@ msgstr "Sınır"
 msgid "Score"
 msgstr "Puan"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "Takım"
 
@@ -9114,36 +9161,36 @@ msgstr "BoÅŸta"
 msgid "Ping"
 msgstr "Ping"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Yapıları satamazsınız."
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "%d tane %s, %d altına satıldı."
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "Hiçbir %s satılamadı."
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Birimleri terhis edemezsiniz."
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s terhis edilemedi."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "%d %s terhis edildi."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "Hiçbir %s terhis edilemedi."
@@ -9440,118 +9487,123 @@ msgstr "Altın: %d (%+d)"
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Vergi: %d Lüks: %d Bilim: %d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Hareket ediyor: %s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Hareket ediyor: %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "(Ayrıntılı bilgi için tıklayın)"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s Ä°nsan"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "Sıra: %d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "Altın: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "Net Gelir: %d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Vergi oranları: Altın:%%%d Lüks:%%%d Bilim:%%%d"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "%s araştırılıyor: %s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "Küresel ısınma olasılığı: %%%d (%%%+d/sıra)"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "Nükleer kış olasılığı: %%%d (%%%+d/sıra)"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Yönetim biçimi: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
 msgstr[0] "%d birim"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr "Gidilemez"
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "Hedefe %d sıra kaldı"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "Hedefe %d - %d sıra kaldı"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "%d birim seçildi"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "Seçilmiş birim yok."
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "DiÄŸer: %d sivil; %d askeri"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "DiÄŸer: %d sivil"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr "DiÄŸer: %d askeri"
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "Yükseltilecek birim yok!"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "Bu birimlerin hiçbiri yükseltilemez."
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9563,211 +9615,211 @@ msgstr[0] ""
 "%d birim, %d altın karşılığında yükseltilsin mi?\n"
 "Hazinede %d altın var."
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "Sıradaki teknolojinin araştırma durumunu gösterir."
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "teknoloji hedefi yok."
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr "%s: %d/%d."
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "Küresel ısınmanın durumunu gösterir:"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "Kirlilik oranı: %%%d"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "Her tur için küresel ısınma olasılığı: %%%d"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "Nükleer kışın durumunu gösterir:"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "Serpinti oranı: %%%d"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "Her tur için nükleer kış olasılığı: %%%d"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "Şu anki yönetim biçiminizi gösterir:"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "Nüfüs:           %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Destek:         %% %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "Enerji:          %% %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
 msgstr[0] "Yük:             %5d ton"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "Seyahat süresi:    %5.1f yıl"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "Seyahat süresi:     YOK     "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "Başarı olasılığı: %% %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "Varış yılı:      %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "sınırsız süre"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "%02ds"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "%02dd %02ds"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "%02ds %02dd"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "%02dg %02ds"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "zaman aşımı"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%s yönetimindeki %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "Seyirci: %s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "Yapılar: "
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "Hiç. "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "."
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Harikalar: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "Şehir sayısı: toplam %d, eşiği geçen: %d, eşik: %d şehir."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
 msgstr[0] "cezaya %d memnun vatandaş kaldı."
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
 msgstr[0] "%d fazladan mutsuz vatandaÅŸ."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "Sıkıyönetim var ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "azami yok, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
 msgstr[0] "azami %d birim, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "birim başına %d). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "Arazideki askeri birimler mutsuzluÄŸa neden olabilir. "
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "Askeri birimlerin mutsuzluÄŸa etkisi yok. "
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "Lüks: toplam %d."
@@ -9814,12 +9866,12 @@ msgid ""
 "have a look."
 msgstr "%s valisi işini yapamıyor.  Bir bakın isterseniz."
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "hiç"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "özel"
 
@@ -9873,11 +9925,13 @@ msgid "Ooops..."
 msgstr "Hayda..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "Bu birim rüşvet kabul etmez!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -9894,6 +9948,7 @@ msgstr "Düşman Birimine Rüşvet Ver"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -9934,6 +9989,7 @@ msgstr "_Ä°lerlemeler:"
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Kararı Casus Versin"
 
@@ -9958,12 +10014,13 @@ msgstr "_Yapılar:"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "Åžehir Ãœretimi"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "%s şehirde bir isyan başlatamazsın."
@@ -9975,6 +10032,7 @@ msgstr "Bu şehirde isyan başlatılmaz!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -9991,6 +10049,7 @@ msgstr "İsyanı Başlat!"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10000,6 +10059,7 @@ msgstr ""
 "Hazinede %d altın var."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10069,10 +10129,12 @@ msgid "Subvert Enemy Unit"
 msgstr "Düşmen Birimini Devir"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 msgid "The diplomat is waiting for your command"
 msgstr "Diplomat komutunuzu bekliyor"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 msgid "The spy is waiting for your command"
 msgstr "Casus komutunuzu bekliyor"
 
@@ -10172,7 +10234,7 @@ msgstr "Kirlilik:"
 msgid "_Overview"
 msgstr "Ö_zet"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10197,11 +10259,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d sıra"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "_Satın Al"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 msgid "_Production"
 msgstr "Ãœreti_m"
 
@@ -10320,7 +10382,7 @@ msgstr "Desteklenen birimler: %d"
 msgid "Present units %d"
 msgstr "Mevcut birimler: %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "_Ortala"
 
@@ -10409,31 +10471,31 @@ msgstr "Şehri Yeniden Adlandır"
 msgid "What should we rename the city to?"
 msgstr "Şehrin yeni adı ne olsun?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "_DeÄŸiÅŸtir"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "Ö_ncellikle ekle"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "_Sonrakine ekle"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "_En sona ekle"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "_Seç"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 msgid "_Display"
 msgstr "Gös_ter"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10443,12 +10505,12 @@ msgstr "Gös_ter"
 msgid "Cities"
 msgstr "Åžehirler"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 msgid "_Inspect"
 msgstr "_Odaklan"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10457,85 +10519,90 @@ msgstr "_Odaklan"
 msgid "Improvements"
 msgstr "Yapılar"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Harikalar"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "Bütün Şehirler"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Hiçbir Şehir"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "Seçimi Tersine Çevir"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "Ãœretilen Birimler"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "İnşa Halindeki Yapılar"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "Ä°nÅŸa Halindeki Harikalar"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "Ãœretilen Birim"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "İnşa Edilen Yapı"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "Ä°nÅŸa Edilen Harika"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Sahil Åžehirleri"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "Aynı Adadakiler"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Desteklenen Birimler"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "Mevcut Birimler"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "Şehirdeki Yapılar"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "Åžehirdeki Harikalar"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "Mümkün Olan Birimler"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "Mümkün Olan Yapılar"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "Mümkün Olan Harikalar"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "Toplam Gider: "
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 msgid ""
 "For information on\n"
@@ -10601,121 +10668,121 @@ msgstr "Hedef şablonunun adı ne olsun?"
 msgid "Remove this preset?"
 msgstr "Hedef ÅŸablonu silinsin?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 msgid "Goto _Location"
 msgstr "_Oraya git"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 msgid "Inspect _City"
 msgstr "_Åžehre Odaklan"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "Devrim istediÄŸinizden emin misiniz?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "Devrim!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "YaÄŸmalanacak Olan"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "Neyin yağmalanacağını seçin:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "Birim"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Ad"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "Birim seçimi"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "_Herkes Hazır Olsun"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "_Boştakiler nöbet tutsun"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 msgid "Nation _Groups:"
 msgstr "Ulus _Grupları:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "Hangi Ulusu Yöneteceksiniz?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 msgid "Pick Nation"
 msgstr "Ulus Seçimi"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 msgid "_Random Nation"
 msgstr "_Rastgele Ulus"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "Ulus seç"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "Ö_zellikler"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "Ö_nder:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "_Kadın"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "_Erkek"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 msgid "City _Styles:"
 msgstr "Şehir _Tarzları:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 msgid "_Description"
 msgstr "_Tanıtım"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Cinsiyetinizi seçmelisiniz."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Şehir tarzınızı seçmelisiniz."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Lütfen geçerli bir adı yaz."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Birimi Yükselt!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -10964,60 +11031,66 @@ msgstr ""
 msgid "Not _ready"
 msgstr "Hazır _Değil"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "_Hazır"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "_BaÅŸlat"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "Bu oyuncu al"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Ulus _Seç"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "Ä°_zle"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 msgid "Do not _observe"
 msgstr "Ä°_zleme"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<YZ>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<Acemi YZ>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<Kolay YZ>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<Normal YZ>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<Zor YZ>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Rastgele"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "Gözleyici"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Detached"
 msgstr "Serbest"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "Çıkmak istediğinizden emin misiniz?"
 
@@ -11928,214 +12001,214 @@ msgstr "Ağ Oyununa Katıl"
 msgid "Connect to Gaming _Zone"
 msgstr "Bir Oyun Sitesine Katıl"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "Parolalar uyuşmuyor, parolanızı girin."
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "Sunucu Adı"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "Port"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "Sürüm"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "Durum"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Oyuncular"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "Yorum"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "_Yerel AÄŸ (LAN)"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "Internet _Metaserver"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "_Host:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "_Port:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "_GiriÅŸ"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "_Parola:"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "Parolayı _Doğrula:"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "_BaÄŸlan"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, c-format
 msgid "Connection name: %s"
 msgstr "Bağlantı Adı: %s"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Oyuncu Adı: %s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Host: %s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Ounucu/baÄŸ. info"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s info"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Oyuncu hazır/hayır değil değiştirir"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Ulus seçimi"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "Bu oyuncu izle"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "Bu oyuncu al"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "Bağlantıyı kes"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "Oyuncuyu YZ yap/yapma"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "Oyuncuyu sil"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "Bilgi eriÅŸimi ver"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "Kontrol eriÅŸimi ver"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, c-format
 msgid "Put on %s"
 msgstr "%s takımına ekle"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 msgid "Number of _Players (including AI):"
 msgstr "_Oyuncu Sayısı (YZ dahil):"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr "YZ Beceri _Derecesi:"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 msgid "Ruleset _Version:"
 msgstr "_Kural Seti Sürümü:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "Diğ_er Oyun Ayarları..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 msgid "Record"
 msgstr "Rekor"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 msgid "Rating"
 msgstr "Sıralama"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "Hazır"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Önder"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "Kayıtlı Oyunu Seç"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "Kayıtlı Oyunu _Seç:"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "_Gözat..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "Senaryo Seç"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "Senaryo _Seç:"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "Tür"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "Bir _ulus seç:"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Kaydedilecek Yeri Seç"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "Oyunu Kaydet"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "Kayıtlı _Oyunları:"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "_Dosya Adı:"
 
@@ -12170,7 +12243,7 @@ msgstr "?Yapı:Adı"
 msgid "Count"
 msgstr "Tane"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12415,28 +12488,28 @@ msgstr "Ä°ÅŸ _Listeleri:"
 msgid "Edit Global _Worklists"
 msgstr "Küresel İş Listelerini _Düzenle"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "Sıra"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "Kaynak _Görevler:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "Gelecek _Hedefleri Göster"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "H_edeflenen Ä°ÅŸ Listesi:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "Küresel İş Listesi _Ekle"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "Ãœretimi DeÄŸiÅŸ_tir"
 
@@ -12729,8 +12802,8 @@ msgid "City shrinks: %d %s"
 msgstr "Şehir küçülmesi: %d %s"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12831,11 +12904,11 @@ msgstr "Garnizon Raporu"
 msgid "Maintenance Report"
 msgstr "Bakım Raporu"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 msgid "worklist"
 msgstr "iÅŸ listesi"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 msgid ""
 "\n"
 "finished"
@@ -13256,21 +13329,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr "  -t,  --theme TEMA\tTEMA arayüz temasını kullan\n"
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr "Ekran görüntüsü alınıyor: fc_%05d.bmp"
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr "Kullanılan Video Çıktısı: %s"
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr "İstemci hazırlanıyor"
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr "Oyunun başlaması bekleniyor"
 
@@ -14561,7 +14634,7 @@ msgstr "Şehir Tarzı:"
 msgid "Unit Selection"
 msgstr "Birim Seçimi"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "HİÇ"
 
diff --git a/po/uk.gmo b/po/uk.gmo
index bc3f62b..074a8c0 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index fab179e..e6bde3e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv 1.14.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2007-09-05 04:24+0300\n"
 "Last-Translator: Roman Festchook <roma at polesye.net>\n"
 "Language-Team: Ukrainian <uk at li.org>\n"
@@ -47,22 +47,22 @@ msgstr "
 msgid "Science"
 msgstr "îÁÕËÁ"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "?ÚÂÕÄÏ×ÁÎÅ:â"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "?ÄÉ×Ï:Ä"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "?ÚÁÓÔÁÒ¦ÌÅ:ó"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "?ÚÁÊ×Å:*"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "?ÚÂÕÄÏ×ÁÎÅ:â"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "?ÄÉ×Ï:Ä"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -492,83 +492,83 @@ msgstr "
 msgid "AI Debug messages"
 msgstr ""
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr ""
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr ""
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr ""
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr ""
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr ""
 
-#: common/player.c:737
+#: common/player.c:742
 #, fuzzy
 msgid "?attitude:Neutral"
 msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:îÅÊÔÒÁÌØÎÉÊ"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr ""
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr ""
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr ""
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr ""
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr ""
 
-#: common/player.c:759
+#: common/player.c:764
 #, fuzzy
 msgid "?diplomatic_state:Armistice"
 msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:áÌØÑÎÓ"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:÷¦ÊÎÁ"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "?diplomatic_state:úÁÍÉÒÅÎÎÑ"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:íÉÒ"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:áÌØÑÎÓ"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:îÅ ÚÕÓÔÒ¦ÞÁÌÉÓÑ"
 
-#: common/player.c:765
+#: common/player.c:770
 #, fuzzy
 msgid "?diplomatic_state:Team"
 msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:íÉÒ"
@@ -615,13 +615,13 @@ msgstr " 
 msgid "Size %d"
 msgstr "òÏÚͦÒ"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "ôÅÈÎÏÌÏÇ¦Ñ ÍÁÊÂÕÔÎØÏÇÏ %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -633,66 +633,66 @@ msgstr "
 msgid "None"
 msgstr "îÅÍÁ¤"
 
-#: common/tech.c:790
+#: common/tech.c:798
 #, fuzzy
 msgid "Future Tech."
 msgstr "ôÅÈÎÏÌÏÇ¦Ñ ÍÁÊÂÕÔÎØÏÇÏ %d"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "(îÅצÄÏÍÏ)"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "ûÌÑÈ"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "úÒÏÛÅÎÎÑ"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "úÁ̦ÚÎÉÃÑ"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "ûÁÈÔÁ"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "úÁÂÒÕÄÎÅÎÎÑ"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "èÕÔ¦Ò"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "õËÒ¦ÐÌÅÎÎÑ"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "ò¦ËÁ"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "æÅÒÍÁ"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "áצÁÂÁÚÁ"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "òÁĦÁæÑ"
 
@@ -802,11 +802,11 @@ msgstr "
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr " ÔÁ "
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "?ÔÁ:, "
 
@@ -962,82 +962,82 @@ msgstr[0] " (
 msgstr[1] " (ÚÁÇÁÌÏÍ %d ÐÏ×ÔÏÒÅÎÎÑ)"
 msgstr[2] " (ÚÁÇÁÌÏÍ %d ÐÏ×ÔÏÒÅÎØ)"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "ðÕÓÔÉÊ ÁÒÇÕÍÅÎÔ ÄÌÑ '%s'.\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "÷¦ÄÓÕÔÎ¦Ê ÁÒÇÕÍÅÎÔ ÄÌÑ '%s'.\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "%d ÄÏ Î.Å."
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "%d Î.Å."
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr ""
 "úͦÎÎÕ FREECIV_PATH ×ÓÔÁÎÏ×ÌÅÎÎÏ, ÁÌÅ ×ÏÎÁ ÐÕÓÔÁ; ×ÉËÏÒÉÓÔÏ×Õ¤ÍÏ ÛÌÑÈ ÐÏ "
 "ÚÁÍÏÞÕ×ÁÎÎÀ."
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "îÅ ÍÏÖÕ ÐÒÏÞÉÔÁÔÉ ËÁÔÁÌÏÇ ÄÁÎÎÉÈ %s: %s."
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "ûÌÑÈ ÄÁÎÎÉÈ ÍÏÖÅ ÂÕÔÉ ×ÓÔÁÎÏ×ÌÅÎÎÏ ÚͦÎÎÏÀ FREECIV_PATH."
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "ðÏÔÏÞÎÉÊ ÛÌÑÈ ÄÁÎÎÉÈ: \"%s\""
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "æÁÊÌ \"%s\" ¤ ÎÅÏÂȦÄÎÉÍ... ÐÅÒÅÒÉ×ÁÀÓØ!"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr ""
 "%s: ëÒÉÔÉÞÎÁ ÐÏÍÉÌËÁ: ÷É ÎÁÍÁÇÁ¤ÔÅÓØ ÚÁÐÕÓÔÉÔÉ ÍÅÎÅ ÑË ÁÄͦΦÓÔÒÁÔÏÒ!\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ Ú×ÉÞÁÊÎÏÇÏ ËÏÒÉÓÔÕ×ÁÞÁ.\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "ÔÏÞÎÅ ÓЦ×ÐÁĦÎÎÑ"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "¤ÄÉÎÅ ÓЦ×ÐÁĦÎÎÑ"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "Ä×ÏÚÎÁÞÎÏ"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "ÐÕÓÔÏ"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "ÚÁÎÁÄÔÏ ÄÏ×ÇÅ"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "ÎÅ ÓЦ×ÐÁÄÁ¤"
 
@@ -1066,108 +1066,108 @@ msgstr "%s 
 msgid "%s is selling %s (not needed) for %d."
 msgstr "%s ÐÒÏÄÁ× %s (ÎÅ ÐÏÔÒ¦ÂÎÏ) ÄÌÑ %d."
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr ""
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr ""
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr ""
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr ""
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr ""
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr ""
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
 "away with your crimes?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1179,14 +1179,14 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1200,7 +1200,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1212,13 +1212,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1230,12 +1230,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr ""
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1247,7 +1247,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1259,47 +1259,47 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
 "intentions, and I will have no more of our alliance!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr ""
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr ""
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
 "our enemy, %s."
 msgstr ""
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
 "s. Why do I need to remind you of your promises?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1307,26 +1307,26 @@ msgid ""
 "more!"
 msgstr ""
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
 "cessation of hostilities?"
 msgstr ""
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1334,134 +1334,139 @@ msgid ""
 msgstr ""
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÌÏËÁÌØΦ ÏÐæ§"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (×ÅÔÅÒÁÎ)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "ñ˦ Ú'¤ÄÎÁÎÎÑ ÄÏÚ×ÏÌÅΦ."
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "îÅ ÚÎÁÊÄÅÎÏ ÁÕÄ¦Ï ÆÁÊÌ %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr ""
 
-#: server/auth.c:384
+#: server/auth.c:404
 #, fuzzy
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "÷ÉÂÁÞÔÅ ÁÌÅ ÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ËÏÍÁÎÄÉ ÓÅÒ×ÅÒÁ."
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, fuzzy, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "÷¦ÄËÉÎÕÔÏ %s: ÎÅÓЦ×ÐÁÄÁÀÔØ ÍÏÖÌÉ×ÏÓÔ¦."
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr ""
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr ""
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr ""
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr ""
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr ""
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr ""
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr ""
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
 msgstr ""
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, fuzzy, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "÷¦ÄËÉÎÕÔÏ %s: ÎÅÓЦ×ÐÁÄÁÀÔØ ÍÏÖÌÉ×ÏÓÔ¦."
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr ""
 
-#: server/auth.c:549
+#: server/auth.c:569
 #, fuzzy
 msgid "Sorry, your connection timed out..."
 msgstr "÷ÉÂÁÞÔÅ, ÐÁÔÒÕÌÕ×ÁÎÎÑ ÐÏצÔÒÑÎÉÍÉ Ð¦ÄÒÏÚĦÌÁÍÉ ÝÅ ÎÅ ÒÅÁ̦ÚÏ×ÁÎÅ."
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr ""
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2254,44 +2259,42 @@ msgid ""
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
 msgstr ""
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr ""
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr ""
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <ÏÐæÑ> <ÚÎÁÞÅÎÎÑ>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÏÐæ§ ÓÅÒ×ÅÒÁ."
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team <¦Í'Ñ-ÇÒÁ×ÃÑ> [¦Í'Ñ ËÏÍÁÎÄÉ]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "úͦÎÉÔÉ, ÄÏÄÁÔÉ ÞÉ ×ÉÄÁÌÉÔÉ ÇÒÁ×ÃÑ Ú ËÏÍÁÎÄÉ."
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2304,16 +2307,16 @@ msgstr ""
 "ÁÍÂÁÓÁÄÁÍÉ, ÔÁ ÇÒÁÀÔØ ÒÁÚÏÍ ÁÂÉ ÏÔÒÉÍÁÔÉ ÐÅÒÅÍÏÇÕ ËÏÍÁÎÄÉ Ú ¦ÎĦצÄÕÁÌØÎÉÍÉ "
 "ÒÁÈÕÎËÁÍÉ."
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <ÔÅËÁ>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 #, fuzzy
 msgid "Choose new ruleset directory or modpack."
 msgstr "ðÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ ÐÒÁ×ÉÌ \"%s\""
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2322,15 +2325,15 @@ msgstr ""
 "ÐÒÁ×ÉÌ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <¦ÎÆÏ>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ¦ÎÆÏ ÓÔÒ¦ÞËÕ ÍÅÔÁÓÅÒ×ÅÒÁ."
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2339,21 +2342,21 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 #, fuzzy
 msgid "metapatch <meta-line>"
 msgstr "metainfo <¦ÎÆÏ>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 #, fuzzy
 msgid "Set metaserver patches line."
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ¦ÎÆÏ ÓÔÒ¦ÞËÕ ÍÅÔÁÓÅÒ×ÅÒÁ."
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "õÐÒÁ×̦ÎÎÑ Ú'¤ÄÎÁÎÎÑÍÉ ÍÅÔÁÓÅÒ×ÅÒÁ."
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2364,34 +2367,34 @@ msgstr ""
 "'metaconnection up' ÁÂÏ 'metac u' ЦĦÊÍÁ¤ Ú'¤ÄÎÁÎÎÑ Ú ÍÅÔÁÓÅÒ×ÅÒÏÍ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <ÁÄÒÅÓÁ>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 #, fuzzy
 msgid "Set address (URL) for metaserver to report to."
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÁÄÒÅÓÕ ÍÅÔÁÓÅÒ×ÅÒÁ ÄÌÑ ¦ÎÆÏÒÍÁæ§."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <ÇÒÁ×ÅÃØ>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÓÔÁÔÕÓ ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÄÌÑ ÇÒÁ×ÃÑ."
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [Ú'¤ÄÎÁÎÎÑ] <ÇÒÁ×ÅÃØ>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "ðÅÒÅÈÏÐÌÅÎÏ Í¦ÓÃÅ ÇÒÁ×ÃÑ %s Õ ÇÒ¦."
 
-#: server/commands.c:185
+#: server/commands.c:184
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2405,17 +2408,17 @@ msgstr ""
 "<ÇÒÁ×ÅÃØ> ÄÏÚ×ÏÌÅÎÉÊ"
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 #, fuzzy
 msgid "observe [connection-name] [player-name]"
 msgstr "take [Ú'¤ÄÎÁÎÎÑ] <ÇÒÁ×ÅÃØ>"
 
-#: server/commands.c:194
+#: server/commands.c:193
 #, fuzzy
 msgid "Observe a player or the whole game."
 msgstr "÷ÉÄÁÌÅÎÏ ÇÒÁ×ÃÑ player %s Ú ÇÒÉ."
 
-#: server/commands.c:195
+#: server/commands.c:194
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2429,16 +2432,16 @@ msgstr ""
 "<ÇÒÁ×ÅÃØ> ÄÏÚ×ÏÌÅÎÉÊ"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 #, fuzzy
 msgid "detach <connection-name>"
 msgstr "cut <¦Í'Ñ-Ú'¤ÄÎÁÎÎÑ>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr ""
 
-#: server/commands.c:205
+#: server/commands.c:204
 #, fuzzy
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
@@ -2449,20 +2452,20 @@ msgstr ""
 "<ÇÒÁ×ÅÃØ> ÄÏÚ×ÏÌÅÎÉÊ"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <ÇÒÁ×ÅÃØ>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "óÔ×ÏÒÉÔÉ ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ Ú ÔÁËÉÍ ¦Í'ÑÍ"
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "ëÏÍÁÎÄÁ 'create' ÄÏÓÔÕÐÎÁ ÌÉÛÅ ÄÏ ÓÔÁÒÔÕ ÇÒÉ."
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2470,20 +2473,20 @@ msgstr ""
 "away\n"
 "away"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr ""
 "÷ÓÔÁÎÏ×ÉÔÉ ÓϦ ÒÅÖÉÍ ×¦ÄÓÕÔÎÏÓÔ¦. ëÏÍÐ'ÀÔÅÒÎÉÊ ÇÒÁ×ÅÃØ ÂÕÄÅ ÏÞÉËÕ×ÁÔÉ ÎÁ "
 "÷ÁÛÅ ÐÏ×ÅÒÎÅÎÎÑ."
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr ""
 "ëÏÍÐ'ÀÔÅÒÎÉÊ ÇÒÁ×ÅÃØ ÂÕÄÅ ÇÏÌÏ×Õ×ÁÔÉ ÷ÁÛÏÀ ÎÁæ¤À ÁÌÅ ÒÏÂÉÔÉ Í¦Î¦ÍÁÌØΦ "
 "ÚͦÎÉ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2491,11 +2494,11 @@ msgstr ""
 "novice\n"
 "novice <ÇÒÁ×ÅÃØ>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ÏÄÎÏÇÏ ÁÂÏ ÕÓ¦È ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× Õ ÐÏÞÁÔËÏ×ÉÊ."
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2506,7 +2509,7 @@ msgstr ""
 "ÇÒÁ×æ×. úÁ ÎÁÑ×ÎÏÓÔ¦ ÁÇÒÕÍÅÎÔÁ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÌÉÛÅ ÃØÏÇÏ ÇÒÁ×ÃÑ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2514,11 +2517,11 @@ msgstr ""
 "easy\n"
 "easy <¦Í'Ñ ÇÒÁ×ÃÑ>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ÏÄÎÏÇÏ ÁÂÏ ÕÓ¦È ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× Õ ÌÅÇËÉÊ."
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2529,7 +2532,7 @@ msgstr ""
 "ÎÁÑ×ÎÏÓÔ¦ ÁÇÒÕÍÅÎÔÁ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÌÉÛÅ ÃØÏÇÏ ÇÒÁ×ÃÑ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2537,11 +2540,11 @@ msgstr ""
 "normal\n"
 "normal <¦Í'Ñ ÇÒÁ×ÃÑ>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ÏÄÎÏÇÏ ÁÂÏ ÕÓ¦È ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× Õ ÎÏÒÍÁÌØÎÉÊ."
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2552,7 +2555,7 @@ msgstr ""
 "ÇÒÁ×æ×. úÁ ÎÁÑ×ÎÏÓÔ¦ ÁÇÒÕÍÅÎÔÁ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÌÉÛÅ ÃØÏÇÏ ÇÒÁ×ÃÑ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2560,11 +2563,11 @@ msgstr ""
 "hard\n"
 "hard <¦Í'Ñ ÇÒÁ×ÃÑ>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ÏÄÎÏÇÏ ÁÂÏ ÕÓ¦È ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× Õ ×ÁÖËÉÊ."
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2575,7 +2578,7 @@ msgstr ""
 "ÎÁÑ×ÎÏÓÔ¦ ÁÇÒÕÍÅÎÔÁ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÌÉÛÅ ÃØÏÇÏ ÇÒÁ×ÃÑ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2583,12 +2586,12 @@ msgstr ""
 "experimental\n"
 "experimental <ÇÒÁ×ÅÃØ>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr ""
 "÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ÏÄÎÏÇÏ ÁÂÏ ÕÓ¦È ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× Õ ÅËÓÐÅÒÅÍÅÎÔÁÌØÎÉÊ."
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2602,7 +2605,7 @@ msgstr ""
 "ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×æ×! äÌÑ ÎÏÒÍÁÌØÎÉÈ ÓÅÒ×ÅÒ¦× ÃÑ ÏÐÃ¦Ñ ÎÅ ÄÁ¤ ΦÑËÏÇÏ ÅÆÅËÔÕ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2616,11 +2619,11 @@ msgstr ""
 "cmdlevel <Ò¦×ÅÎØ> first\n"
 "cmdlevel <Ò¦×ÅÎØ> <¦Í'Ñ>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "÷É×ÏÄÉÔØ ÁÂÏ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ."
 
-#: server/commands.c:276
+#: server/commands.c:275
 #, fuzzy
 msgid ""
 "The command access level controls which server commands are available\n"
@@ -2662,20 +2665,20 @@ msgstr ""
 "ÈÔÏÓØ ¦ÎÛ¦Ê ÍÏÖÅ ÐÅÒÅÚ'¤ÄÎÁÔÉÓÑ Ú ÃÉÍ ÓÁÍÉÍ ¦Í'ÑÍ. ðÒÉͦÔËÁ: ÃÑ ËÏÍÁÎÄÁ "
 "ÔÅÐÅÒ ÂÅÒÅ ¦Í'Ñ Ú'¤ÄÎÁÎÎÑ, Á ÎÅ ÇÒÁ×ÃÑ, ÑË ÁÒÇÕÍÅÎÔ."
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <ÈÏÄÉ> <ȦÄ_ÐÒÉÒ¦ÓÔ> <ÚÎÁÞÅÎÎÑ> <ÚÎÁÞÅÎÎÑ_ÒÁÚÉ>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "äÉ×ÉÓØ 'help timeoutincrease'."
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2686,42 +2689,42 @@ msgstr ""
 "÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ ÃÀ ËÏÍÁÎÄÕ ÒÁÚÏÍ Ú ÏÐæ¤À 'timeout'. ðÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ 0 0 0 1"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 #, fuzzy
 msgid "endgame"
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ"
 
-#: server/commands.c:311
+#: server/commands.c:310
 #, fuzzy
 msgid "End the game immediately in a draw."
 msgstr "ãÑ ËÏÍÁÎÄÁ ÎÅÇÁÊÎÏ ÐÒÉÐÉÎѤ ÇÒÕ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr ""
 
-#: server/commands.c:316
+#: server/commands.c:315
 #, fuzzy
 msgid "Concede the game."
 msgstr "úÁ×ÅÒÛÉÔÉ ÇÒÕ."
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <¦Í'Ñ-ÇÒÁ×ÃÑ>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "ðÏ×ΦÓÔÀ ×ÉÄÁÌѤ ÇÒÁ×ÃÑ Ú ÇÒÉ."
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
@@ -2730,7 +2733,7 @@ msgstr ""
 "ЦÄÒÏÚĦÌÉ. úÁÓÔÏÓÏ×ÕÊÔÅ ÏÂÅÒÅÖÎÏ!"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2738,11 +2741,11 @@ msgstr ""
 "save\n"
 "save <ÆÁÊÌ>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "úÂÅÒÅÇÔÉ ÇÒÕ Õ ÆÁÊÌ."
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2759,7 +2762,7 @@ msgstr ""
 "ÐÏÔ¦Í ×ÉËÏÎÁÊÔÅ ËÏÍÁÎÄÕ 'start' ÑË Ô¦ÌØ˦ ÕÓ¦ ÇÒÁ×æ ЦÄ'¤ÄÎÁÀÔØÓÑ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2767,11 +2770,11 @@ msgstr ""
 "load\n"
 "load <ÆÁÊÌ>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "úÁ×ÁÎÔÁÖÕ¤ ÇÒÕ Ú ÆÁÊÌÕ."
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2780,28 +2783,28 @@ msgstr ""
 "ÐÒÁ×ÉÌ ÔÁ ÏÐæ§ ÓÅÒ×ÅÒÁ ×ÔÒÁÞÁÀÔØÓÑ..\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <ÆÁÊÌ>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "úÁ×ÁÎÔÁÖÉÔÉ ËÏÍÁÎÄÉ ÓÅÒ×ÅÒÁ Ú ÆÁÊÌÕ."
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <ÆÁÊÌ>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "úÁÐÉÓÁÔÉ ÐÏÔÏÞΦ ÕÓÔÁÎÏ×ËÉ ÑË ËÏÍÁÎÄÉ ÓÅÒ×ÅÒÁ Õ ÆÁÊÌ."
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "ðÅÒÅÍÉËÁ¤ ×É×¦Ä ÓÅÒ×ÅÒÁ Í¦Ö 'RFC-ÓÔÉÌÅÍ' ÔÁ ÎÏÒÍÁÌØÎÉÍ ÓÔÉÌÅÍ."
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr ""
 
@@ -3317,25 +3320,34 @@ msgstr "
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s ÐÒÉÚ×¦× ÄÏ ¦ÎÃÉÄÅÎÔÕ ÐÒÉ ×ÌÁÛÔÕ×ÁÎΦ ÚÁËÏÌÏÔÕ Õ %s."
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr ""
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "ò¦Ë: %s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr "ôÁÊÍÁÕÔ ÈÏÄÕ ÐÅÒÅ×ÉÝÕ¤ ÍÁËÓÉÍÕÍ, ×ÉÐÒÁ×ÌÑÀ ÎÁ ÍÁËÓÉÍÕÍ."
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "ôÁÊÍÁÕÔ ÈÏÄÕ ÍÅÎÛÅ ÎÕÌÑ, ×ÉÐÒÁ×ÌÑÀ ÎÁ ÎÕÌØ."
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3379,28 +3391,28 @@ msgstr "
 msgid "There is no player nor connection by the name %s."
 msgstr "îÅÍÁ¤ Ú`¤ÄÎÁÎÎÑ ÁÂÏ ÇÒÁ×ÃÑ Ú ¦Í`ÑÍ %s."
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "óÔÁÌÏÓÑ ÇÌÏÂÁÌØÎÅ ÐÏÔÅÐ̦ÎÎÑ!"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr ""
 "õÚÂÅÒÅÖÖÑ ÂÕÌÏ ÚÁÔÏÐÌÅÎÏ ÔÁ ×ÅÌÉËÁ ˦ÌØ˦ÓÔØ ÓÔÅÐÕ ÐÅÒÅÔ×ÏÒÉÌÁÓÑ ÎÁ ÐÕÓÔÅÌÀ."
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "óÔÁÌÁÓÑ ÒÁĦÁæÊÎÁ ÚÉÍÁ!"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr ""
 "÷ÏÌÏÇÁ ͦÓÃÅצÓÔØ ÐÅÒÅÓÏÈÌÁ ÔÁ ×ÅÌÉËÁ ˦ÌØ˦ÓÔØ ÓÔÅÐÕ ÐÅÒÅÔ×ÏÒÉÌÁÓÑ ÎÁ "
 "ÔÕÎÄÒÕ."
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3410,7 +3422,7 @@ msgstr ""
 "ÔÁ צÄËÒÉÌÉ ÂÕĦ×ÎÉÃÔ×Ï ÚÁ̦ÚÎÉÃØ.\n"
 "      ðÒÁæ×ÎÉËÉ Ú¦ÂÒÁÌÉÓÑ ÔÁ ÐÏÂÕÄÕ×ÁÌÉ × ÕÓ¦È Í¦ÓÔÁÈ ÚÁ̦ÚÎÉÃÀ."
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3420,12 +3432,12 @@ msgstr ""
 "ÂÕĦ×ÎÉÃÔ×Ï ÚÁ̦ÚÎÉÃØ.\n"
 "      ðÒÁæ×ÎÉËÉ Ú¦ÂÒÁÌÉÓÑ ÔÁ ÐÏÂÕÄÕ×ÁÌÉ × ÕÓ¦È Í¦ÓÔÁÈ ÚÁ̦ÚÎÉÃÀ."
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, fuzzy, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "ðÅÒÅͦÝÅÎÏ ÷ÁÛ %s Ú ÐÒÉÞÉÎÉ ÚͦÎÉ ÍÏÒÑ ÎÁ ÓÕÛÕ Õ (%d, %d)."
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, fuzzy, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "òÏÚÐÕÝÅÎÏ ÷ÁÛ %s Ú ÐÒÉÞÉÎÉ ÚͦÎÉ ÓÕÛ¦ ÎÁ ÍÏÒÅ Õ (%d, %d)."
@@ -3485,52 +3497,52 @@ msgstr ""
 msgid "You should choose a new government from the government menu."
 msgstr ""
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "óÔÁ×ËÁ ÐÏÄÁÔËÕ ÐÅÒŦÌØÛÕ¤ ÍÁËÓÉÍÁÌØÎÕ ÓÔÁ×ËÕ ÄÌÑ %s; ÓËÏÒÉÇÏ×ÁÎÏ."
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "óÔÁ×ËÁ ÎÁÕËÉ ÐÅÒŦÌØÛÕ¤ ÍÁËÓÉÍÁÌØÎÕ ÓÔÁ×ËÕ ÄÌÑ %s; ÓËÏÒÉÇÏ×ÁÎÏ."
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "óÔÁ×ËÁ ÒÏÚËÏÛ¦ ÐÅÒŦÌØÛÕ¤ ÍÁËÓÉÍÁÌØÎÕ ÓÔÁ×ËÕ ÄÌÑ %s; ÓËÏÒÉÇÏ×ÁÎÏ."
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s ÐÒÉÐÉÎѤ ÂÒÁÔÉ ÕÞÁÓÔØ Õ ÓЦÌØÎÏÍÕ ÂÁÞÅÎΦ!"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr ""
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "óÅÎÁÔ ÐÒÏÐÕÓËÁ¤ ÷ÁÛ ÚÁËÏÎ Ú ÐÒÉÞÉÎÉ ÐÏÓÔ¦ÊÎÉÈ ÐÒÏ×ÏËÁÃ¦Ê Ú ÂÏËÕ %s."
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr ""
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "äÉÐÌÏÍÁÔÉÞÎÉÊ ÓÔÁÎ Í¦Ö %s ÔÁ %s צÄÔÅÐÅÒ %s."
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
@@ -3538,55 +3550,55 @@ msgid ""
 msgstr ""
 " %s ÐÅÒÅÒ×Á× Ä¦ÐÌÏÍÁÔÉÞΦ ÕÇÏÄÉ! äÉÐÌÏÍÁÔÉÞÎÉÊ ÓÔÁÎ Í¦Ö %s ÔÁ %s צÄÔÅÐÅÒ %s."
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr ""
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr ""
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "÷ÉÄÁÌÑÀ ÇÒÁ×ÃÑ %s."
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "÷ÁÓ ×ÉÄÁÌÅÎÏ Ú ÇÒÉ!"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s ×ÉÄÁÌÅÎÏ Ú ÇÒÉ."
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "÷É ÚÕÓÔÒ¦ÌÉÓÑ Ú ÎÁæ¤À %s ÑËÏÀ ËÅÒÕ¤ %s."
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr ""
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr ""
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr ""
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
@@ -3595,12 +3607,12 @@ msgstr ""
 "÷ÁÛÁ ÎÁÃ¦Ñ ×ÐÁÌÁ Õ ÇÒÏÍÁÄÑÎÓØËÕ ×¦ÊÎÕ, %s ÚÁÑ×É×, ÝÏ ×¦Î ¤ ̦ÄÅÒÏÍ ÂÕÎÔ¦×ÎÉÈ "
 "ÏÂÌÁÓÔÅÊ."
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s ÐÒÏÇÏÌÏÓÉ× ×¦ÄĦΦÓÔØ %s."
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3839,20 +3851,20 @@ msgstr "
 msgid "th"
 msgstr "Ê"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr ""
 "äÅÍÏÇÒÁƦÞÎÁ ÓÔÒÏËÁ ͦÓÔÉÔØ ÎÅצÒΦ ÓÉÍ×ÏÌÉ. óÐÒÏÂÕÊÔÅ \"help demography\"."
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "äÅÍÏÇÒÁƦÞÎÉÊ ÚצÔ:"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "÷ÉÂÁÞÔÅ, ÁÌÅ ÄÅÍÏÇÒÁƦÞÎÉÊ Ú×¦Ô ÎÅÄÏÓÔÕÐÎÉÊ."
 
-#: server/report.c:746
+#: server/report.c:748
 #, fuzzy, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%s Ú %s"
@@ -3863,11 +3875,11 @@ msgstr "%s 
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÄÏÓÔÕÐÎÉÊ ÆÁÊÌ \"%s\" Ú ÐÒÁ×ÉÌÁÍÉ."
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "úÁ×ÁÎÔÁÖÕÀ ÐÒÁ×ÉÌÁ"
 
@@ -3882,7 +3894,7 @@ msgstr ""
 "úÂÅÒÅÖÅÎÁ ÇÒÁ ͦÓÔÉÔØ ÎÅÐÏ×Φ ÄÁΦ ÍÁÐÉ. ãÅ ÍÏÖÅ ×ËÁÚÕ×ÁÔÉ ÎÁ ÇÒÕ ÓÔÁÒϧ "
 "×ÅÒÓ¦§ ÁÂÏ ÐÏÇÁÎÏ ÚÂÅÒÅÖÅÎÕ ÇÒÕ. ðÒÏÄÏ×ÖÕ¤ÍÏ ÎÁ ÷ÁÛ ÓÔÒÁÈ ÔÁ ÒÉÚÉË."
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "úÂÅÒÅÖÅÎÁ ÇÒÁ ÓÔÁÒÁ, ͦΦÍÁÌØÎÏ ÐÏÔÒ¦ÂÎÁ ×ÅÒÓ¦Ñ 1.9.0."
@@ -3906,13 +3918,13 @@ msgstr ""
 "÷ÉËÏÒÉÓÔÏ×ÕÀ '%s'."
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3951,7 +3963,7 @@ msgstr "
 msgid "Networking"
 msgstr ""
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "÷Ó¦"
@@ -3976,7 +3988,7 @@ msgstr "
 msgid "Changed"
 msgstr "úͦÎÉÔÉ"
 
-#: server/settings.c:102
+#: server/settings.c:83
 #, fuzzy
 msgid ""
 "Allowed take string contains invalid\n"
@@ -3985,7 +3997,7 @@ msgstr ""
 "óÔÒÏËÁ ÄÏÚ×ÏÌÅÎÉÈ Ú'¤ÄÎÁÎØ Í¦ÓÔÉÔØ ÎÅצÒΦ ÓÉÍ×ÏÌÉ.  óÐÒÏÂÕÊÔÅ 'help "
 "allowconnect'."
 
-#: server/settings.c:136
+#: server/settings.c:119
 #, fuzzy
 msgid ""
 "Starting units string contains invalid\n"
@@ -3994,22 +4006,22 @@ msgstr ""
 "óÔÒÏËÁ ÄÏÚ×ÏÌÅÎÉÈ Ú'¤ÄÎÁÎØ Í¦ÓÔÉÔØ ÎÅצÒΦ ÓÉÍ×ÏÌÉ.  óÐÒÏÂÕÊÔÅ 'help "
 "allowconnect'."
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
 "\"help startunits\"."
 msgstr ""
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr ""
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
@@ -4018,23 +4030,28 @@ msgstr ""
 "ë¦ÌØ˦ÓÔØ ÇÒÁ×Ã¦× Â¦ÌØÛÁ Î¦Ö ÚÁÍÏ×ÌÅÎÅ ÚÎÁÞÅÎÎÑ, ËÏÒÉÓÔÕ¤ÍÏÓÑ ÓÔÁÒÉÍ "
 "ÚÎÁÞÅÎÎÑÍ. "
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÃÀ ÏÐæÀ."
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr ""
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
 "  size = 20 is a huge map of 20,000 tiles"
 msgstr ""
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr ""
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -4070,11 +4087,11 @@ msgid ""
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 msgstr ""
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "íÅÔÏÄ ÝÏ ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÄÌÑ ÓÔ×ÏÒÅÎÎÑ ÍÁÐÉ"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4086,12 +4103,12 @@ msgid ""
 "chosen based on the generator.  See the \"startpos\" setting."
 msgstr ""
 
-#: server/settings.c:301
+#: server/settings.c:292
 #, fuzzy
 msgid "Method used to choose start positions"
 msgstr "íÅÔÏÄ ÝÏ ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÄÌÑ ÓÔ×ÏÒÅÎÎÑ ÍÁÐÉ"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4104,37 +4121,37 @@ msgid ""
 "of start pos and to the number of players"
 msgstr ""
 
-#: server/settings.c:315
+#: server/settings.c:306
 #, fuzzy
 msgid "Presence of 1x1 islands"
 msgstr "ðÒÉÓÕÔΦÓÔØ ÁÂÏ ×¦ÄÓÕÔΦÓÔØ ÏÓÔÒÏ×¦× 1È1"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = ÎÅÍÁ¤ ÏÓÔÒÏ×¦× 1x1; 1 = ¤ ÏÓÔÒÏ×É 1x1"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "þÉ ¤ ÎÁ ÐÏÌÀÓÁÈ ÏËÒÅͦ ËÏÎÔÉÎÅÎÔÉ"
 
-#: server/settings.c:322
+#: server/settings.c:313
 #, fuzzy
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr "0 = ËÏÎÔÉÎÅÎÔÉ ÍÏÖÕÔØ ÂÕÔÉ Ú'¤ÄÎÁΦ Ú ÐÏÌÀÓÏÍ; 1 = ÐÏÌÀÓÁ ÏËÒÅÍÏ"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr ""
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr ""
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr ""
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4152,21 +4169,21 @@ msgid ""
 "0 means a very cold planet with large polar zones and no tropics"
 msgstr ""
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr ""
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr ""
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "ë¦ÌØ˦ÓÔØ ÐÁÇÏÒ¦×/ǦÒ"
 
-#: server/settings.c:360
+#: server/settings.c:351
 #, fuzzy
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
@@ -4175,22 +4192,22 @@ msgstr ""
 "íÁ̦ ÚÎÁÞÅÎÎÑ ÄÁÀÔØ ÐÌÏÓËÉÊ ÌÁÎÛÁÆÔ, ¦ÌØÛ¦ ÚÎÁÞÅÎÎÑ ÇÅÎÅÒÕÀÔØ Â¦ÌØÛÅ "
 "ÐÁÇÏÒÂ¦× ÔÁ ǦÒ."
 
-#: server/settings.c:366
+#: server/settings.c:357
 #, fuzzy
 msgid "Amount of water on lands"
 msgstr "ë¦ÌØ˦ÓÔØ ÓÕÛ¦ Õ ÐÏÒ¦×ÎÑÎΦ Ú ÏËÅÁÎÏÍ"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
 msgstr ""
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "ðÏÞÁÔËÏ×Å ÚÎÁÞÅÎÎÑ ÇÅÎÅÒÁÔÏÒÁ ÍÁÐ"
 
-#: server/settings.c:375
+#: server/settings.c:366
 #, fuzzy
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
@@ -4200,23 +4217,23 @@ msgstr ""
 "ôÅÖ ÓÁÍÅ ÚÎÁÞÅÎÎÑ ÚÁ×ÖÄÉ ÇÅÎÅÒÕ¤ ÏÄÎÁËÏ×Õ ÍÁÐÕ; ÑËÝÏ ÎÕÌØ (ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ) "
 "ÚÎÁÞÅÎÎÑ ÂÕÄÅ ÏÂÒÁÎÏ ÚÐÉÒÁÀÞÉÓØ ÎÁ ÞÁÓ ÁÂÉ ÚÇÅÎÅÒÕ×ÁÔÉ ×ÉÐÁÄËÏ×Õ ÍÁÐÕ."
 
-#: server/settings.c:388
+#: server/settings.c:379
 #, fuzzy
 msgid "Game random seed"
 msgstr "úÁÇÁÌØÎÅ ÐÏÞÁÔËÏ×Å ÚÎÁÞÅÎÎÑ"
 
-#: server/settings.c:389
+#: server/settings.c:380
 #, fuzzy
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr "ÑËÝÏ ÎÕÌØ (ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ) ÚÎÁÞÅÎÎÑ ÂÕÄÅ ÏÂÒÁÎÏ ÚÐÉÒÁÀÞÉÓØ ÎÁ ÞÁÓ"
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "ë¦ÌØ˦ÓÔØ Ë̦ÔÉÎ Ú¦ ÓÐÅæÁÌØÎÉÍÉ ÒÅÓÕÒÓÁÍÉ"
 
-#: server/settings.c:397
+#: server/settings.c:388
 #, fuzzy
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
@@ -4225,34 +4242,34 @@ msgstr ""
 "óÐÅæÁÌØΦ ÒÅÓÕÒÓÉ ÐÏËÒÁÝÕÀÔØ ÂÁÚÏצ ÔÉÐÉ ÔÅÒÉÔÏÒ¦Ê ÎÁ ÑËÉÈ ×ÏÎÉ ÒÏÚÔÁÛÏ×ÁΦ."
 "çÒÁÔËÁ ÓÅÒ×ÅÒÁ Õ ÔÉÓÑÞÎÉÈ."
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "ë¦ÌØ˦ÓÔØ ÈÁÔÉÎÏË (ÍÁÌÅÎØËÉÈ ÈÕÔÏÒ¦×)"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
 msgstr ""
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "í¦Î¦ÍÁÌØÎÁ ˦ÌØ˦ÓÔØ ÇÒÁ×æ×"
 
-#: server/settings.c:419
+#: server/settings.c:410
 #, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr ""
 "çÒÁ×Ã¦× (ЦÄ'¤ÄÎÁÎÉÈ ÁÂÏ ËÏÍÐ'ÀÔÅÒÎÉÈ) ÍÁ¤ ÂÕÔÉ ÎÅ ÍÅÎÛÅ Î¦Ö ×ÓÔÁÎÏ×ÌÅÎÏ "
 "ÐÅÒÅÄ ÓÔÁÒÔÏÍ ÇÒÉ."
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "íÁËÓÉÍÁÌØÎÁ ˦ÌØ˦ÓÔØ ÇÒÁ×æ×."
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4262,12 +4279,12 @@ msgstr ""
 "ÕÞÁÓÔØ Õ ÇÒ¦. ñËÝÏ ÃØÏÇÏ ÞÉÓÌÁ ÄÏÓÑÇÎÕÔÏ Ð¦Ä'¤ÄÎÁÎÉÍÉ ÇÒÁ×ÃÑÍÉ ÐÅÒÅÄ ÇÒÏÀ, "
 "ÂÕÄØ Ñ˦ ÎÏצ Ú'¤ÄÎÁÎÎÑ ×¦ÄÈÉÌÑÀÔØÓÑ."
 
-#: server/settings.c:435
+#: server/settings.c:426
 #, fuzzy
 msgid "Total number of players (including AI players)"
 msgstr "úÁÇÁÌÏÍ ÇÒÁ×Ã¦× (ÚÁÐÏ×ÎÅÎÎÑ ËÏÍÐ'ÀÔÅÒÎÉÍÉ)"
 
-#: server/settings.c:436
+#: server/settings.c:427
 #, fuzzy
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
@@ -4276,12 +4293,12 @@ msgstr ""
 "ñËÝÏ ÇÒÁ×Ã¦× ÐÒÉ ÓÔÁÒÔ¦ ÇÒÉ ÍÅÎÛÅ, ÄÏÄÁÔËÏצ ËÏÍÐ'ÀÔÅÒΦ ÇÒÁ×æ ÂÕÄÕÔØ "
 "ÓÔ×ÏÒÅΦ ÁÂÉ Ú¦ÌØÛÉÔÉ Ë¦ÌØ˦ÓÔØ ÇÒÁ×Ã¦× ÄÏ ÚÎÁÞÅÎÎÑ Ã¦¤§ ÏÐæ§."
 
-#: server/settings.c:448
+#: server/settings.c:439
 #, fuzzy
 msgid "List of players' initial units"
 msgstr "ðÅÒÅÌ¦Ë ÐÒÉÓÕÔÎ¦È Ð¦ÄÒÏÚĦ̦×"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4297,30 +4314,30 @@ msgid ""
 "    A   = Strong attack unit (eg., Catapult)\n"
 msgstr ""
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "í¦ÓÃÅÒÏÚÔÁÛÕ×ÁÎÎÑ Ð¦ÄÒÏÚÄ¦Ì¦× ÎÁ ÐÏÞÁÔËÕ ÇÒÉ."
 
-#: server/settings.c:467
+#: server/settings.c:458
 #, fuzzy
 msgid "This is the radius within which the initial units are dispersed."
 msgstr ""
 "ðÏÌÏ×ÉÎÁ ÄÏ×ÖÉÎÉ Ë×ÁÄÒÁÔÕ Õ ÑËÏÍÕ ÂÕÄÅ ÒÏÚËÉÄÁÎÏ Ð¦ÄÒÏÚĦÌÉ ÎÁ ÐÏÞÁÔËÕ ÇÒÉ."
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "ðÏÞÁÔËÏ×Á ˦ÌØ˦ÓÔØ ÇÒÉ×ÅÎØ ÎÁ ÇÒÁ×ÃÑ"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr ""
 
-#: server/settings.c:480
+#: server/settings.c:471
 #, fuzzy
 msgid "Number of initial techs per player"
 msgstr "ðÏÞÁÔËÏ×Á ˦ÌØ˦ÓÔØ ËÏÌÏΦÓÔ¦× ÎÁ ÇÒÁ×ÃÑ"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4328,11 +4345,11 @@ msgid ""
 "next techs really expensive."
 msgstr ""
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr ""
 
-#: server/settings.c:491
+#: server/settings.c:482
 #, fuzzy
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
@@ -4340,11 +4357,11 @@ msgid ""
 "determined by the ruleset or other game settings."
 msgstr "÷ÐÌÉ×Á¤ ÎÁ Û×ÉÄ˦ÓÔØ ×¦ÄËÒÉÔÔÑ ÇÒÁ×ÃÑÍÉ ÎÏ×ÉÈ ÔÅÈÎÏÌÏǦÊ."
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "÷ÔÒÁÔÁ ÂÁÌ¦× ÐÒÉ ÚͦΦ ÄÏÓ̦ÄÖÕ×ÁÎϧ ÔÅÈÎÏÌÏǦ§"
 
-#: server/settings.c:501
+#: server/settings.c:492
 #, fuzzy
 msgid ""
 "If you change your current research technology, and you have positive "
@@ -4355,12 +4372,12 @@ msgstr ""
 "×ÔÒÁÔÉÔÅ ÓÁÍÅ ÔÁËÕ Ë¦ÌØ˦ÓÔØ ÂÁ̦×. ãÅ ÎÅ ÒÏÚÐÏ×ÓÀÄÖÕ¤ÔØÓÑ ÎÁ ×ÉÐÁÄËÉ "
 "ÏÔÒÉÍÁÎÎÑ ÔÅÈÎÏÌÏǦ§ ÃØÏÇÏ ÈÏÄÕ ÔÁ ×ÉÂÏÒÕ ÎÏ×ϧ."
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "÷ÔÒÁÔÁ ÂÁÌ¦× ÐÒÉ ÏÔÒÉÍÁÎΦ ÔÅÈÎÏÌÏǦ§ ÚÁ ÕÇÏÄÏÀ"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4372,11 +4389,11 @@ msgstr ""
 "ÂÁÌ¦× ÂÕÄÅ ÚÐÉÓÁÎÁ Ú ÷ÁÓ. ÷É ÍÏÖÅÔÅ ÏÐÉÎÉÔÉÓÑ ÎÁצÔØ Ú ÎÅÇÁÔÉ×ÎÉÍ ÂÁÌÁÎÓÏÍ, "
 "ÑËÝÏ ÚÎÁÞÅÎÎÑ ÎÅ 0."
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "÷ÔÒÁÔÁ ÂÁÌ¦× ÐÒÉ ÏÔÒÉÍÁÎΦ ÔÅÈÎÏÌÏǦ§ ÐÒÉ ÚÁÈÏÐÌÅÎΦ"
 
-#: server/settings.c:522
+#: server/settings.c:513
 #, fuzzy
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
@@ -4387,11 +4404,11 @@ msgstr ""
 "˦ÌØ˦ÓÔØ ÂÁÌ¦× ÂÕÄÅ ÚÐÉÓÁÎÁ Ú ÷ÁÓ. ÷É ÍÏÖÅÔÅ ÏÐÉÎÉÔÉÓÑ ÎÁצÔØ Ú ÎÅÇÁÔÉ×ÎÉÍ "
 "ÂÁÌÁÎÓÏÍ, ÑËÝÏ ÚÎÁÞÅÎÎÑ ÎÅ 0."
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "÷ÔÒÁÔÁ ÂÁÌ¦× ÐÒÉ ×¦ÌØÎÏÍÕ ÏÔÒÉÍÁÎΦ ÔÅÈÎÏÌÏǦ§"
 
-#: server/settings.c:533
+#: server/settings.c:524
 #, fuzzy
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
@@ -4404,23 +4421,23 @@ msgstr ""
 "÷ÅÌÉËÁ â¦Â̦ÏÔÅËÁ) ÓÁÍÅ ÔÁËÁ ˦ÌØ˦ÓÔØ ÂÁÌ¦× ÂÕÄÅ ÚÐÉÓÁÎÁ Ú ÷ÁÓ. ÷É ÍÏÖÅÔÅ "
 "ÏÐÉÎÉÔÉÓÑ ÎÁצÔØ Ú ÎÅÇÁÔÉ×ÎÉÍ ÂÁÌÁÎÓÏÍ, ÑËÝÏ ÚÎÁÞÅÎÎÑ ÎÅ 0."
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "·ÖÁ ÝÏ ÎÅÏÂȦÄÎÁ ͦÓÔÕ ÄÌÑ ÒÏÓÔÕ."
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
 "the size of the city."
 msgstr ""
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "÷¦ÄÓÏÔÏË ×ÔÒÁÔ §Ö¦ ËÏÌÉ Í¦ÓÔÏ ÐÏÔÒÅÂÕ¤ ×ÏÄÏǦÎ."
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4430,21 +4447,21 @@ msgstr ""
 "ëÁÎÁ̦ÚÁæ§), ×ÏÎÏ ×ÔÒÁÞÁ¤ צÄÓÏÔÏË ×¦Ä Ó×Ï§È ÚÁÐÁÓ¦× ÐÒÏÄÕËÔ¦× (ÁÂÏ ÊÏÇÏ "
 "ÐÏÌÏ×ÉÎÕ ÚÁ ÎÁÑ×ÎÏÓÔ¦ áÍÂÁÒÕ)."
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr ""
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "í¦Î¦ÍÁÌØÎÉÊ ÒÏÚÍ¦Ò Í¦ÓÔÁ ÁÂÉ ÚÁÊÍÁÔÉÓÑ ÔÏÒǦ×ÌÅÀ."
 
-#: server/settings.c:579
+#: server/settings.c:570
 #, fuzzy
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
@@ -4457,11 +4474,11 @@ msgstr ""
 "notradesize, ÔÁ ÚÍÅÎÛÕ¤ÔØÓÑ ×¦ÄÐÏצÄÎÏ ÄÏ ÒÏÓÔÕ Í¦ÓÔÁ ÄÏ 0% (ÎÅÍÁ¤ ÓÔÑÇÎÅÎØ "
 "ÏËÒ¦Í ËÏÒÕÐæ§) ÄÌÑ ÒÏÚͦÒÕ=fulltradesize. ôÁËÏÖ ÄÉ×ÉÓØ notradesize."
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "íÁËÓÉÍÁÌØÎÉÊ ÒÏÚÍ¦Ò Í¦ÓÔÁ ÂÅÚ ÔÏÒǦ×̦."
 
-#: server/settings.c:590
+#: server/settings.c:581
 #, fuzzy
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
@@ -4472,11 +4489,11 @@ msgstr ""
 "ôÏÒǦ×ÌÑ ÚÒÏÓÔÁ¤ Ú ÒÏÓÔÏÍ Í¦ÓÔÁ ËÏÌÉ ×ÏÎÏ Â¦ÌØÛÅ Î¦Ö notradesize ÔÁ ÍÅÎÛÅ "
 "Î¦Ö fulltradesize. ôÁËÏÖ ÄÉ×ÉÓØ fulltradesize."
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "òÏÚÍ¦Ò Í¦ÓÔÁ ÐÅÒÛ Î¦Ö Õ ÎØÏÍÕ Ú'Ñ×ÌÑÔØÓÑ ÎÅÝÁÓΦ"
 
-#: server/settings.c:600
+#: server/settings.c:591
 #, fuzzy
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
@@ -4485,11 +4502,11 @@ msgstr ""
 "ðÅÒÛ Î¦Ö ÂÕÄÕÀÔØÓÑ ¦ÎÛ¦ ÎÅÊÔÒÁ̦ÚÁÔÏÒÉ, ÐÅÒÛ¦ ÇÏÒÏÄÑÎÉ Õ Í¦ÓÔ¦ ÎÁÒÏÄÖÕÀÔØÓÑ "
 "ÎÅÊÔÒÁÌØÎÉÍÉ, ÕÓ¦ ¦ÎÛ¦ ÎÅÓÞÁÓÎÉÍÉ. ôÁËÏÖ ÄÉ×ÉÓØ cityfactor."
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "ë¦ÌØ˦ÓÔØ Í¦ÓÔ ÄÌÑ Â¦ÌØÛÏÇÏ ÎÅÓÞÁÓÔÑ."
 
-#: server/settings.c:609
+#: server/settings.c:600
 #, fuzzy
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
@@ -4501,12 +4518,12 @@ msgstr ""
 "ÇÏÒÏÄÑÎÉÎ ¤ ÎÅÓÞÁÓÎÉÍ; ÔÁËÏÖ ÄÉ×ÉÓØ unhappysize. ãÅ ÚÁ ÕÍÏ×É äÅÍÏËÒÁÔ¦§; ÄÌÑ "
 "¦ÎÛÉÈ ÆÏÒÍ ÐÒÁ×̦ÎÎÑ ÃÅ ÐÒÏÑ×ÌѤÔØÓÑ ÎÁ ÍÅÎÛ¦Ê Ë¦ÌØËÏÓÔ¦ ͦÓÔ."
 
-#: server/settings.c:618
+#: server/settings.c:609
 #, fuzzy
 msgid "Minimum distance between cities"
 msgstr "í¦Î¦ÍÁÌØÎÁ צÄÓÔÁÎØ Í¦Ö Í¦ÓÔÁÍÉ (Õ ÒÕÈÁÈ)"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4520,11 +4537,11 @@ msgstr ""
 "ñËÝÏ ×ÓÔÁÎÏ×ÌÅÎÏ 0 (ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ), ÚÎÁÞÅÎÎÑ ÂÅÒÅÔØÓÑ Ú ÐÏÔÏÞÎÉÈ ÐÒÁ×ÉÌ "
 "ËÏÌÉ ÇÒÁ ÓÔÁÒÔÕ¤."
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "ë¦ÌØ˦ÓÔØ ÈÏÄ¦× Í¦Ö ÂÕÍÁÍÉ"
 
-#: server/settings.c:631
+#: server/settings.c:622
 #, fuzzy
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
@@ -4533,11 +4550,11 @@ msgstr ""
 "÷ÓÔÁÎÏ×ÌÀ¤ ˦ÌØ˦ÓÔØ ÈÏÄ¦× Í¦Ö ×ÚÒÉ×ÎÉÍ ÚÒÏÓÔÁÎÎÑÍ Í¦ÓÔÁ. ñËÝÏ ×ÓÔÁÎÏ×ÌÅÎÏ Õ "
 "n ͦÓÔÏ ÚÒÏÓÔŠЦÓÌÑ ÂÕÍÕ ÎÁ n+1 ȦĦ."
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "êÍÏצÒΦÓÔØ ÚÎÉÝÅÎÎÑ ÂÕĦ×̦ ÐÒÉ ÚÁÈÏÐÌÅÎΦ ͦÓÔÁ"
 
-#: server/settings.c:641
+#: server/settings.c:632
 #, fuzzy
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
@@ -4546,11 +4563,11 @@ msgstr ""
 "ëÏÌÉ ÇÒÁ×ÅÃØ ÚÁÈÏÐÌÀ¤ ͦÓÔÏ, ÔÏ ËÏÖÎÁ ÂÕĦ×ÌÑ ÍÁ¤ ÔÁËÕ ÊÍÏצÒΦÓÔØ ÂÕÔÉ "
 "ÚÒÕÊÎÏ×ÁÎÏÀ. "
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "êÍÏצÒΦÓÔØ ÒÕÈÕ ×ÐÅÒÅÄ Ð¦ÓÌÑ ÁÔÁËÉ"
 
-#: server/settings.c:648
+#: server/settings.c:639
 #, fuzzy
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
@@ -4566,21 +4583,21 @@ msgstr ""
 "Í¦Ö 0 ÔÁ 100, ÃÅ ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÑË ÐÒÏÃÅÎÔ ÊÍÏצÒÎÏÓÔ¦ 'ÚÁÈÏÐÌÅÎÎÑ' "
 "ÔÅÒÉÔÏÒ¦§."
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr ""
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr ""
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "úÍÅÎÛÉÔÉ Í¦ÓÃÅ×Å ÎÁÓÅÌÅÎÎÑ Ð¦ÓÌÑ ÁÔÁËÉ"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4596,33 +4613,33 @@ msgstr ""
 "  4 = ÇÅ̦ËÏÐÔÅÒÉ\n"
 "  8 = ÐÏצÔÒÑΦ"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr ""
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
 "tiles or tiles within range of more than one nation's cities."
 msgstr ""
 
-#: server/settings.c:690
+#: server/settings.c:681
 #, fuzzy
 msgid "Units inside borders cause no unhappiness"
 msgstr "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ Õ ÐÏ̦ ÍÏÖÕÔØ ÓÐÒÉÞÉÎÉÔÉ ÎÅÝÁÓÔÑ."
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr ""
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr ""
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4631,11 +4648,11 @@ msgid ""
 "4 = diplomacy is disabled for everyone."
 msgstr ""
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "äÏÚ×ÏÌÅΦ ÎÁÚ×É Í¦ÓÔ"
 
-#: server/settings.c:708
+#: server/settings.c:699
 #, fuzzy
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
@@ -4656,11 +4673,11 @@ msgstr ""
 "ÇÌÏÂÁÌØÎÏ ÕΦËÁÌØÎÉÍÉ: ÕÓ¦ ͦÓÔÁ Õ ÇÒ¦ ÐÏ×ÉÎΦ ÍÁÔÉ Ò¦ÚΦ ÎÁÚ×É. ñËÝÏ 3, "
 "ÇÒÁ×ÃÀ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÎÁÚ×Õ Í¦ÓÔÁ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ ¦ÎÛϧ ÎÁæ§."
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "ò¦×ÅÎØ ÐÒÉÓÕÔÎÏÓÔØ ÄÉËÕΦ×"
 
-#: server/settings.c:737
+#: server/settings.c:728
 #, fuzzy
 msgid ""
 "0 = no barbarians \n"
@@ -4675,29 +4692,29 @@ msgstr ""
 "3 - ÞÁÓÔ¦ ÄÉËÕÎÓØ˦ ÎÁ¦Ǧ \n"
 "4 - ÎÁ×ÁÌÉ ÄÉËÕΦ×"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "ò¦Ë ÐÏÑ×É ÄÉËÕΦ×"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "äÉËÕÎÉ ÎÅ ÂÕÄÕÔØ Ú'Ñ×ÌÑÔÉÓÑ ÐÅÒÅÄ ÃÉÍ ÒÏËÏÍ."
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr ""
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
 msgstr ""
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "þÉ ×ÍÉËÁÔÉ ÍÁÒÕ ×¦ÊÎÉ"
 
-#: server/settings.c:765
+#: server/settings.c:756
 #, fuzzy
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
@@ -4708,31 +4725,31 @@ msgstr ""
 "÷ÁÛÉÈ Í¦ÓÔ ÔÁ ЦÄÒÏÚÄ¦Ì¦× ÄÏÓÔÕÐΦ ÷ÁÛÏÍÕ ÐÏÇÌÑÄÕ. ÷É ÎÅ ÐÏÂÁÞÉÔÅ ÎÏצ ͦÓÔÁ "
 "ÁÂÏ ÚͦÎÉ ÔÅÒÉÔÏÒ¦Ê ÎÁ Ë̦ÔÉÎÁÈ ÝÏ ÐÏÚÁ צÄÓÔÁÎ'À sightrange."
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr ""
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr ""
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "þÉ ÄÏÚ×ÏÌÅÎÏ ÚÁÓÅÌÅÎÎÑ ËÏÓÍÏÓÕ"
 
-#: server/settings.c:783
+#: server/settings.c:774
 #, fuzzy
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "ñËÝÏ 1, ÇÒÁ×æ ÍÁÀÔØ ÚÍÏÇÕ ÂÕÄÕ×ÁÔÉ ËÏÓͦÞÎ¦Ê ËÏÒÁÂÅÌØ."
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "í¦Î¦ÍÁÌØÎÁ ˦ÌØ˦ÓÔØ Í¦ÓÔ ÄÌÑ ÇÒÏÍÁÄÑÎÓØËϧ צÊÎÉ"
 
-#: server/settings.c:790
+#: server/settings.c:781
 #, fuzzy
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
@@ -4743,11 +4760,11 @@ msgstr ""
 "˦ÌØ˦ÓÔØ Í¦ÓÔ ÔÁ ÊÏÇÏ ÓÔÏÌÉÃÀ ÂÕÄÅ ÚÁÈÏÐÌÅÎÏ. ñËÝÏ ÃÀ ÏÐæÀ ×ÓÔÁÎÏ×ÌÅÎÏ Õ "
 "ÍÁËÓÉÍÁÌØÎÅ ÚÎÁÞÅÎÎÑ ÇÒÏÍÁÄÑÎÓØËÁ צÊÎÁ ÂÕÄÅ ×ÚÁÇÁ̦ ÚÁÂÏÒÏÎÅÎÁ."
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr ""
 
-#: server/settings.c:800
+#: server/settings.c:791
 #, fuzzy
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
@@ -4757,12 +4774,12 @@ msgstr ""
 "çÒÁ×æ ÍÏÖÕÔØ ÚÕÓÔÒ¦ÔÉÓØ ÄÌÑ Ä¦ÐÌÏÍÁÔÉÞÎÏÇÏ ÓЦÌËÕ×ÁÎÎÑ ÞÅÒÅÚ ÔÁËÕ Ë¦ÌØ˦ÓÔØ "
 "ÈÏÄ¦× Ð¦ÓÌÑ ÏÓÔÁÎÎØÏÇÏ ËÏÎÔÁËÔÕ. ÷ÓÔÁÎÏצÔØ Õ ÎÕÌØ ÁÂÉ ×ÉÍËÎÕÔÉ ÃÀ ÏÐæÀ."
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "âÕÄÕ×ÁÔÉ ÐÁÌÁà ÑËÝÏ ÓÔÏÌÉÃÀ ÚÁÈÏÐÌÅÎÏ"
 
-#: server/settings.c:811
+#: server/settings.c:802
 #, fuzzy
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
@@ -4774,11 +4791,11 @@ msgstr ""
 "ÂÅÚËÏÛÔÏ×ÎÏ ÂÕÄÕ¤ÔØÓÑ Õ ¦ÎÛÏÍÕ ×ÉÐÁÄËÏ×Ï ÏÂÒÁÎÏÍÕ Í¦ÓÔ¦, צÄÐÏצÄÎÏ ÄÏ "
 "ÚÎÁÎÎÑ ÐÒÏ âÕĦ×ÎÉÃÔ×Ï."
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "þÉ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÒÉÒÏÄΦ ÎÁÚ×É Í¦ÓÔ"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
@@ -4786,11 +4803,11 @@ msgstr ""
 "ñËÝÏ ÁËÔÉ×Ï×ÁÎÏ, ÎÁÚ×Á ͦÓÔÁ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ ÂÕÄÅ ÂÕÄÅ ×ÉÚÎÁÞÁÔÉÓÑ "
 "צÄÐÏצÄÎÏ ÄÏ ÐÒÉÌÅÇÌÉÈ ÚÅÍÅÌØ."
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr ""
 
-#: server/settings.c:835
+#: server/settings.c:826
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
@@ -4846,11 +4863,11 @@ msgstr ""
 "   (ΦÞÏÇÏ) = ìÉÛÅ ÏÄÉÎ ËÏÎÔÒÏÌÀÀÞÉÊ.\n"
 "âÁÇÁÔÏ Ú'¤ÄÎÁÎØ ÔÁ ÎÁÇÌÑÄÁÞ¦ ÎÁÒÁÚ¦ åëóðåòåíåîôáìøî¶."
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "þÉ ËÏÍÐ'ÀÔÅÒΦ ÇÒÁ×æ ÚÁÌÅÖÁÔØ ×¦Ä Ú'¤ÄÎÁÎØ."
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
@@ -4858,58 +4875,60 @@ msgstr ""
 "ñËÝÏ ×ÓÔÁÎÏ×ÌÅÎÏ Õ 1, ËÏÍÐ'ÀÔÅÒ ÐÅÒÅÄÁ¤ ËÅÒÕ×ÁÎÎÑ ÑËÝÏ ÇÒÁ×ÅÃØ "
 "ЦÄ'¤ÄÎÕ¤ÔØÓÑ, ÔÁ ÚÁÂÉÒÁ¤ ÊÏÇÏ ÎÁ ÓÅÂÅ ÐÒÉ ×¦Ä'¤ÄÎÁÎΦ."
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "ò¦Ë ˦ÎÃÑ ÇÒÉ"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr ""
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "ë¦ÌØ˦ÓÔØ ÓÅËÕÎÄ ÎÁ ȦÄ"
 
-#: server/settings.c:885
+#: server/settings.c:876
 #, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "ñËÝÏ ×Ó¦ ÇÒÁ×æ ÎÅ ÎÁÔÉÓÎÕÔØ 'úÁ×ÅÒÛÅÎÏ È¦Ä' ÄÏ ÚÁ˦ÎÞÅÎÎÑ ÃØÏÇÏ ÞÁÓÕ, ÔÏ "
 "È¦Ä ÚÁ×ÅÒÛÉÔØÓÑ Á×ÔÏÍÁÔÉÞÎÏ. 0 ×ÓÔÁÎÏ×ÌÀ¤ צÄÓÕÔΦÓÔØ ÔÁÊÍÁÕÔÕ. õ "
 "÷¶äìáäïþîéè ÓÅÒ×ÅÒÁÈ, ×ÓÔÁÎÏ×ÌÅÎÎÑ Õ -1 ×ÓÔÁÎÏ×ÌÀ¤ ÔÅÓÔÏ×ÉÊ ÒÅÖÉÍ Á×ÔÏÇÒÉ. "
 "÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ ÏÐæÀ ÒÁÚÏÍ Ú 'timeoutincrease' ÁÂÉ ÍÁÔÉ Ä¦ÎÁͦÞÎÉÊ ÔÁÊÍÁÕÔ."
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr ""
 
-#: server/settings.c:896
+#: server/settings.c:889
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
 "timeout is increased to this value."
 msgstr ""
 
-#: server/settings.c:905
+#: server/settings.c:898
 #, fuzzy
 msgid "Whether to have simultaneous player phases."
 msgstr "ëÕÄÉ ÚÂÅÒ¦ÇÁÔÉ ÖÕÒÎÁÌ ¦Ú ÓÔÁÔÉÓÔÉËÏÀ ÇÒÁ×ÃÑ"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr ""
 
-#: server/settings.c:913
+#: server/settings.c:906
 #, fuzzy
 msgid "Seconds to let a client's network connection block"
 msgstr "úÁÔÒÉÍËÁ Õ ÓÅËÕÎÄÁÈ ÂÌÏËÕ×ÁÎÎÑ Ú'¤ÄÎÁÎÎÑ Ë̦¤ÎÔÁ."
 
-#: server/settings.c:914
+#: server/settings.c:907
 #, fuzzy
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
@@ -4920,12 +4939,12 @@ msgstr ""
 "ÔÏĦ ×ÏÎÏ ÚÁËÒÉ×Á¤ÔØÓÑ. îÕÌØ ×ÓÔÁÎÏ×ÌÀ¤ צÄÓÕÔΦÓÔØ ÔÁÊÍÁÕÔ¦× ÏËÒ¦Í ÔÉÈ ÝÏ "
 "ͦÓÔÉÔØ Õ ÓϦ TCP ÐÒÏÔÏËÏÌ."
 
-#: server/settings.c:923
+#: server/settings.c:916
 #, fuzzy
 msgid "Max seconds for network buffers to drain"
 msgstr "úÁÔÒÉÍËÁ ÏÞÉËÕ×ÁÎÎÑ ÚצÌØÎÅÎÎÑ ÂÕÆÅÒ¦× TCP"
 
-#: server/settings.c:924
+#: server/settings.c:917
 #, fuzzy
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
@@ -4936,11 +4955,11 @@ msgstr ""
 "ÂÕÆÅÒÉ TCP ÕÓ¦È Ë̦¤ÎÔÓØËÉÈ Ú'¤ÄÎÁÎØ. îÕÌØ ÓÐÒÉÞÉÎѤ צÄÓÕÔΦÓÔØ ÏÞÉËÕ×ÁÎÎÑ "
 "ÓÅÒ×ÅÒÏÍ. "
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "úÁÔÒÉÍËÁ Õ ÓÅËÕÎÄÁÈ Í¦Ö ð¶îçÁÍÉ"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
@@ -4948,21 +4967,21 @@ msgstr ""
 "óÅÒ×ÅÒ ÐÅÒÅצÒѤ Ë̦¤ÎÔ¦× ð¶îç ÚÁÐÉÔÁÍÉ ËÏÖÎÏÇÏ ÒÁÚÕ ËÏÌÉ ÚÁÄÁÎÉÊ ÞÁÓ "
 "×ÉÞÅÒÐÕ¤ÔØÓÑ."
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "þÁÓ ÁÂÉ ×¦ÄÒ¦ÚÁÔÉ Ë̦¤ÎÔÁ"
 
-#: server/settings.c:941
+#: server/settings.c:934
 #, fuzzy
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr "ñËÝÏ Ë̦ÅÎÔ ÎŠצÄÐÏצÓÔØ ðïîçÏÍ ÚÁ ÃÅÊ ÞÁÓ, צΠצÄËÌÀÞÁ¤ÔØÓÑ."
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "âÌÏËÕ×ÁÎÎÑ ÇÒÉ ÐÏ ÈÏÄÁÈ"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
@@ -4971,11 +4990,11 @@ msgstr ""
 "ñËÝÏ ×ÓÔÁÎÏ×ÌÅÎÏ 1 - È¦Ä ÇÒÉ ÎÅ ÚÁ×ÅÒÛÅÎÏ ÄÏÔÉ, ÄÏ˦ ÕÓ¦ ÇÒÁ×æ (ÒÁÈÕÀÞÉ "
 "צÄËÌÀÞÅÎÉÈ) ÎÅ ÚÁ˦ÎÞÁÔØ Ó×¦Ê È¦Ä."
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "çÒÁ ÈÏÄÁÍÉ Æ¦ËÓÏ×ÁÎϧ ÄÏ×ÖÉÎÉ"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -4984,11 +5003,11 @@ msgstr ""
 "ñËÝÏ ×ÓÔÁÎÏ×ÌÅÎÏ 1 È¦Ä ÎÅ ÂÕÄÅ ÚÁ×ÅÒÛÅÎÏ ÄÏËÉ ÎÅ ×ÉÞÅÒÐÁ¤ÔØÓÑ ÞÁÓ ÚÁÔÒÉÍËÉ, "
 "ÎÅÚÁÌÅÖÎÏ ÞÉ ÇÒÁ×æ ÎÁÔÉÓÎÕÔØ 'úÁ×ÅÒÛÅÎÏ È¦Ä'."
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "ýÏ ×ËÌÀÞÁÔÉ Õ ÄÅÍÏÇÒÁƦÞÎÉÊ ÚצÔ"
 
-#: server/settings.c:964
+#: server/settings.c:957
 #, fuzzy
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
@@ -5023,11 +5042,11 @@ msgstr ""
 "    b = ×ËÌÀÞÁÔÉ ÓÔÏ×ÂÅÃØ 'ËÒÁÝÁ ÎÁæÑ'\n"
 "(ðÏÒÑÄÏË Ó̦ÄÕ×ÁÎÎÑ ÓÉÍ×ÏÌ¦× ÚÎÁÞÅÎÎÑ ÎÅ ÍÁ¤, ÎÁ צÄͦÎÕ ×¦Ä ÒÅǦÓÔÒÁ.)"
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "èÏÄ¦× Í¦Ö Á×ÔÏÚÂÅÒÅÖÅÎÎÑÍ"
 
-#: server/settings.c:989
+#: server/settings.c:982
 #, fuzzy
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
@@ -5036,11 +5055,11 @@ msgstr ""
 "çÒÁ ÂÕÄÅ Á×ÔÏÍÁÔÉÞÎÏ ÚÂÅÒ¦ÇÁÔÉÓÑ Ð¦ÓÌÑ ÚÁ˦ÎÞÅÎÎÑ ÚÁÄÁÎϧ ˦ÌØËÏÓÔ¦ ÈÏĦ×. "
 "îÕÌØ ÏÚÎÁÞÁ¤ ×ÉÍËÎÕÔÉ Á×ÔÏÚÂÅÒ¦ÇÁÎÎÑ."
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "ò¦×ÅÎØ ËÏÍÐÒÅÓ¦§ ÚÂÅÒÅÖÅÎÉÈ ¦ÇÒ"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 #, fuzzy
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
@@ -5051,11 +5070,11 @@ msgstr ""
 "gzip). â¦ÌØÛ¦ ÚÎÁÞÅÎÎÑ ÄÁÀÔØ ËÒÁÝÕ ËÏÍÐÒÅÓ¦À, ÁÌÅ ×ÏÎÁ ÄÏ×ÛÅ ×ÉËÏÎÕ¤ÔØÓÑ. "
 "ñËÝÏ ÍÁËÓÉÍÁÌØÎÅ ÚÎÁÞÅÎÎÑ ÎÕÌØ - ÔÏĦ ÓÅÒ×ÅÒ Ú¦ÂÒÁÎÏ ÂÅÚ zlib."
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "ðÒÅƦËÓ Á×ÔÏÍÁÔÉÞÎÏ ÚÂÅÒÅÖÅÎÉÈ ¦ÇÒ"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 #, fuzzy
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
@@ -5064,11 +5083,11 @@ msgstr ""
 "á×ÔÏÍÁÔÉÞÎÏ ÚÂÅÒÅÖÅΦ ¦ÇÒÉ ÍÁÀÔØ ÎÁÚ×Õ '<ÐÒÅƦËÓ><Ò¦Ë>.sav'.\n"
 "ãÑ ÏÐÃ¦Ñ ÚÁÄÁ¤ ÚÎÁÞÅÎÎÑ <ÐÒÅƦËÓ>."
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "ëÕÄÉ ÚÂÅÒ¦ÇÁÔÉ ÖÕÒÎÁÌ ¦Ú ÓÔÁÔÉÓÔÉËÏÀ ÇÒÁ×ÃÑ"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 #, fuzzy
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
@@ -5082,7 +5101,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "óÅÒ×ÅÒ ÎÅ ÍÏÖÅ ÐÒÏÞÉÔÁÔÉ ÓÔÁÎÄÁÒÔÎÉÊ ×צÄ. ¶ÇÎÏÒÕÀ ÊÏÇÏ."
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, fuzzy, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "íÅÔÁÓÅÒ×ÅÒ: ÐÏÇÁÎÁ ÁÄÒÅÓÁ: [%s:%d]."
@@ -5218,104 +5237,104 @@ msgstr "
 msgid "Game saved as %s"
 msgstr "çÒÕ ÚÂÅÒÅÖÅÎÏ Õ %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "çÒÁ ×ÖÅ ÚÁÐÕÝÅÎÁ."
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr ""
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "óÔÁÒÔÕÀ ÇÒÕ."
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "ÚÁÐÉÔ ÎÁ ÎÅצÄÏÍÉÊ Ú×¦Ô (ÔÉÐ %d)"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, fuzzy, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "õ×ÁÇÁ: õ %s ÏÞÉËÕÀÔØ ÇÏÌÏÄÏÍÏÒ."
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "ïÔÒÉÍÁÎÏ ÐÁËÅÔ ÔÉÐÕ %d ×¦Ä ÍÅÒÔ×ÏÇÏ ÇÒÁ×ÃÑ ÁÂÏ ÎÁÇÌÑÄÁÞÁ"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "ïÂÅÒ¦ÔØ ÎÅ ÐÕÓÔÅ ¦Í'Ñ."
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 #, fuzzy
 msgid "That nation is already in use."
 msgstr "çÒÁ ×ÖÅ ÚÁÐÕÝÅÎÁ."
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "¶ÎÛ¦Ê ÇÒÁ×ÅÃØ ×ÖÅ ÏÂÒÁ× ¦Í'Ñ '%s'. ïÂÅÒ¦ÔØ ¦ÎÛÅ."
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 #, fuzzy
 msgid "Please choose a name containing only ASCII characters."
 msgstr "ïÂÅÒ¦ÔØ ÎÅ ÐÕÓÔÅ ¦Í'Ñ."
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr ""
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, fuzzy, c-format
 msgid "%s nation is already in use."
 msgstr "çÒÁ ×ÖÅ ÚÁÐÕÝÅÎÁ."
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s ¤ ̦ÄÅÒÏÍ ÎÁæ§ %s - %s."
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, fuzzy, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "îÅ ÍÏÖÕ ÓÔÁÒÔÕ×ÁÔÉ ÇÒÕ: §§ ×ÖÅ ÚÁÐÕÝÅÎÏ."
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, fuzzy, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s ÄÏÄÁÎÏ ÑË ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ."
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "çÒÁ×ÅÃØ %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s ÇÏÌÏ×Õ¤ ÎÁÄ %s."
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "÷¦ÄÐÒÁ×ÌÑÀ ¦ÎÆÏ ÎÁ ÍÅÔÁÓÅÒ×ÅÒ [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "çÒÕ ÚÁ˦ÎÞÅÎÏ..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "ôÅÐÅÒ ÐÒÉÊÍÁ¤ÍÏ ÎÏצ Ú'¤ÄÎÁÎÎÑ."
 
@@ -5336,7 +5355,7 @@ msgstr "(
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5512,7 +5531,7 @@ msgstr "
 msgid "Removed player %s from the game."
 msgstr "÷ÉÄÁÌÅÎÏ ÇÒÁ×ÃÑ player %s Ú ÇÒÉ."
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr ""
@@ -5591,731 +5610,759 @@ msgid ""
 msgstr ""
 "îÅ ÍÏÖÕ Ú¦ÌØÛÉÔÉ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ÎÁ '%s'; ÷É ÍÁ¤ÔÅ ÌÉÛÅ '%s'."
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s' ÄÌÑ Ú'¤ÄÎÁÎÎÑ %s."
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ÎÅ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s' ÄÌÑ Ú'¤ÄÎÁÎÎÑ %s."
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s' ÄÌÑ ÎÏ×ÉÈ ÇÒÁ×æ×."
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr ""
 "ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s' ÄÌÑ ÐÅÒÛÏÇÏ ÈÔÏ ÚÁÂÅÒÅ ÊÏÇÏ."
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 #, fuzzy
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "ëÏÍÁÎÄÁ 'firstlevel' ÎÅ ÍÁ¤ ÓÅÎÓÕ Ú ËÏÎÓÏ̦ ÓÅÒ×ÅÒÁ."
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "÷É ×ÖÅ ÍÁ¤ÔÅ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ '%s' ÁÂÏ ËÒÁÝÅ."
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 #, fuzzy
 msgid "Someone else already is game organizer."
 msgstr "èÔÏÓØ ¦ÎÛ¦Ê ×ÖÅ ÍÁ¤ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ '%s' ÁÂÏ ËÒÁÝÅ."
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr ""
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "îÅצÒÎÉÊ ÁÒÇÕÍÅÎÔ %d."
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr ""
 "÷ÉËÏÒÉÓÔÁÎÎÑ: timeoutincrease <ÈÏÄÉ> <ȦÄ_ÐÒÉÒ¦ÓÔ> <ÚÎÁÞÅÎÎÑ> "
 "<ÚÎÁÞÅÎÎÑ_ÒÁÚÉ>."
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "ä¦ÎÁͦÞÎÉÊ ÔÁÊÍÁÕÔ ×ÓÔÁÎÏ×ÌÅÎÏ Õ %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "ïÐæÑ:"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "ïÐÉÓ:"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "óÔÁÔÕÓ: %s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "ÚͦÎÀ×ÁÎÁ"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "ƦËÓÏ×ÁÎÁ"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "úÎÁÞÅÎÎÑ: %d, í¦Î¦ÍÕÍ: 0, úÁÍÏ×ÞÕ×ÁÎÎÑ: %d, íÁËÓÉÍÕÍ: 1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "úÎÁÞÅÎÎÑ: %d, í¦Î¦ÍÕÍ: %d, úÁÍÏ×ÞÕ×ÁÎÎÑ: %d, íÁËÓÉÍÕÍ: %d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "úÎÁÞÅÎÎÑ: '%s', úÁÍÏ×ÞÕ×ÁÎÎÑ: '%s'"
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "òÏÚ'ÑÓÎÅÎÎÑ ÄÏÓÔÕÐΦ ÄÌÑ ÎÁÓÔÕÐÎÉÈ ÏÐÃ¦Ê ÓÅÒ×ÅÒÁ:"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "ðÏËÉÝÏ ÎÅÍÁ¤ ÐÏÑÓÎÅÎØ."
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "îÅÏÄÎÏÚÎÁÞÎÅ ¦Í'Ñ ÏÐæ§."
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "ïÐÅÒÁÔÏÒ ÓÅÒ×ÅÒÁ: %s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "çÒÁ×ÅÃØ '%s' ÔÅÐÅÒ ÍÁ¤ Ò¦×ÅÎØ ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ '%s'."
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "çÒÁ×ÅÃØ %s ÎÅ ËÏÎÔÒÏÌÀ¤ÔØÓÑ ËÏÍÐ'ÀÔÅÒÏÍ."
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "ò¦×ÅÎØ ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s'."
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "ãÅ ËÏÍÁÎÄÁ Ë̦¤ÎÔÁ."
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr ""
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s ×ÓÔÁÎÏ×ÌÅÎÏ Õ ÓÔÁΠצÄÓÕÔΦÊ."
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s ÐÏ×ÅÒÎÕ×ÓÑ ÄÏ ÇÒÉ."
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "÷ÉÂÁÞÔÅ, Õ ÷ÁÓ ÎÅ ÍÁ¤ ÄÏÓÔÕÐÕ ÄÌÑ ÐÅÒÅÇÌÑÄÕ ÏÐæ§ '%s'."
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "îÅצÄÏÍÁ ÏÐÃ¦Ñ '%s'."
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 #, fuzzy
 msgid "All options with non-default values"
 msgstr "= ×ËÁÚÕ¤, ÝÏ ÏÐÃ¦Ñ Í¦ÓÔÉÔØ ÚÎÁÞÅÎÎÑ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 #, fuzzy
 msgid "All options"
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÌÏËÁÌØΦ ÏÐæ§"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 #, fuzzy
 msgid "Vital options"
 msgstr "ïÐæ§ ͦÓÔÁ"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 #, fuzzy
 msgid "Situational options"
 msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÌÏËÁÌØΦ ÏÐæ§"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr ""
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ ×ËÁÚÕ¤, ÝÏ ÷É ÍÏÖÅÔÅ ÚͦÎÉÔÉ ÏÐæÀ"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= ×ËÁÚÕ¤, ÝÏ ÏÐÃ¦Ñ Í¦ÓÔÉÔØ ÚÎÁÞÅÎÎÑ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s ÚÎÁÞÅÎÎÑ (ͦÎ,ÍÁËÓ)      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "ïÐæÑ"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "ÏÐÉÓ"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
 msgstr ""
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "îÅ ÍÏÖÎÁ ÚͦÎÉÔÉ ËÏÍÁÎÄÕ Ð¦ÓÌÑ ÓÔÁÒÔÕ ÇÒÉ."
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 #, fuzzy
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "îÅצÄÏÍÉÊ ÁÒÇÕÍÅÎÔ. ÷ÉËÏÒÉÓÔÁÎÎÑ: team <ÇÒÁ×ÅÃØ> [ËÏÍÁÎÄÁ]."
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr ""
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 #, fuzzy
 msgid "Cannot team a barbarian."
 msgstr "îÅ ÍÏÖÌÉ×Ï ÐÅÒÅÍÉËÎÕÔÉ ÇÒÁ×ÃÑ ÄÉËÕÎÁ."
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "çÒÁ×ÅÃØ %s ÐÒɤÄÎÁ×ÓÑ ÄÏ ËÏÍÁÎÄÉ %s."
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 #, fuzzy
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "îÅצÄÏÍÉÊ ÁÒÇÕÍÅÎÔ. ÷ÉËÏÒÉÓÔÁÎÎÑ: team <ÇÒÁ×ÅÃØ> [ËÏÍÁÎÄÁ]."
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr ""
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
 msgstr ""
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr ""
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr ""
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr ""
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 #, fuzzy
 msgid "Value must be integer."
 msgstr "úÎÁÞÅÎÎÑ ÐÏ×ÉÎÏ ÂÕÔÉ Ã¦ÌÉÍ."
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr ""
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, fuzzy, c-format
 msgid "You voted for \"%s\""
 msgstr "÷É ÚÁÓÎÕ×ÁÌÉ %s"
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr ""
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
 msgstr ""
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 #, fuzzy
 msgid "Can only use this command once game has begun."
 msgstr "îÅ ÍÏÖÎÁ ÚͦÎÉÔÉ ËÏÍÁÎÄÕ Ð¦ÓÌÑ ÓÔÁÒÔÕ ÇÒÉ."
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr ""
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr ""
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 #, fuzzy
 msgid "Value 2 & 3 must be integer."
 msgstr "úÎÁÞÅÎÎÑ ÐÏ×ÉÎÏ ÂÕÔÉ Ã¦ÌÉÍ."
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr ""
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr ""
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr ""
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "%s %s ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ."
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "%s %s ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ."
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 #, fuzzy
 msgid "Value 2 must be integer."
 msgstr "úÎÁÞÅÎÎÑ ÐÏ×ÉÎÏ ÂÕÔÉ Ã¦ÌÉÍ."
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr ""
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "îÅצÄÏÍÉÊ ÁÒÇÕÍÅÎÔ. ÷ÉËÏÒÉÓÔÁÎÎÑ: set <ÏÐæÑ> <ÚÎÁÞÅÎÎÑ>."
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÃÀ ÏÐæÀ."
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "ãÑ ÕÓÔÁÎÏ×ËÁ ÎÅ ÍÏÖÅ ÂÕÔÉ ÚͦÎÅÎÁ ËÏÌÉ ÇÒÕ ×ÖÅ ÓÔÁÒÔÏ×ÁÎÏ."
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "úÎÁÞÅÎÎÑ ÐÏ×ÉÎÏ ÂÕÔÉ Ã¦ÌÉÍ."
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "úÎÁÞÅÎÎÑ ×ÉÈÏÄÉÔØ ÚÁ ÄÏÚ×ÏÌÅÎÉÊ Ä¦ÁÐÁÚÏÎ (ͦΦÍÕÍ: 0, ÍÁËÓÉÍÕÍ: 1)."
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "ïÐæÑ: %s ×ÓÔÁÎÏ×ÌÅÎÁ Õ %d."
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "úÎÁÞÅÎÎÑ ×ÉÈÏÄÉÔØ ÚÁ ÄÏÚ×ÏÌÅÎÉÊ Ä¦ÁÐÁÚÏÎ (ͦΦÍÕÍ: %d, ÍÁËÓÉÍÕÍ: %d)."
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "óÔÒÏËÏ×Å ÚÎÁÞÅÎÎÑ ÚÁÄÏ×ÇÅ. ÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ: set <ÏÐæÑ> <ÚÎÁÞÅÎÎÑ>."
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "ïÐæÑ: %s ×ÓÔÁÎÏ×ÌÅÎÁ Õ \"%s\"."
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr ""
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr ""
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "îÅ ÚצÔÕ¤ÍÏ ÍÅÔÁÓÅÒ×ÅÒÕ Õ Ã¦Ê ÇÒ¦."
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr ""
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 #, fuzzy
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "ðÅÒÅÈÏÐÌÅÎÏ Í¦ÓÃÅ ÇÒÁ×ÃÑ %s Õ ÇÒ¦."
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 #, fuzzy
 msgid "Sorry, one can't take dead players in this game."
 msgstr "îÅ ÚצÔÕ¤ÍÏ ÍÅÔÁÓÅÒ×ÅÒÕ Õ Ã¦Ê ÇÒ¦."
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 #, fuzzy
 msgid "Sorry, one can't take AI players in this game."
 msgstr "óÔ×ÏÒÉÔÉ ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ Ú ÔÁËÉÍ ¦Í'ÑÍ"
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr ""
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 #, fuzzy
 msgid "Sorry, one can't observe in this game."
 msgstr "îÅ ÚצÔÕ¤ÍÏ ÍÅÔÁÓÅÒ×ÅÒÕ Õ Ã¦Ê ÇÒ¦."
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 #, fuzzy
 msgid "Sorry, one can't take players in this game."
 msgstr "îÅ ÚצÔÕ¤ÍÏ ÍÅÔÁÓÅÒ×ÅÒÕ Õ Ã¦Ê ÇÒ¦."
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 #, fuzzy
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "ðÅÒÅÈÏÐÌÅÎÏ Í¦ÓÃÅ ÇÒÁ×ÃÑ %s Õ ÇÒ¦."
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 #, fuzzy
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: take [Ú'¤ÄÎÁÎÎÑ] <ÇÒÁ×ÅÃØ>"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 #, fuzzy
 msgid "Usage: observe [player-name]"
 msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: take <ÇÒÁ×ÅÃØ>"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, fuzzy, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s ×ÖÅ ËÏÎÔÒÏÌÀ¤ ÁÂÏ ÎÁÇÌÑÄÁ¤ ÎÁÄ %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, fuzzy, c-format
 msgid "%s is already observing %s."
 msgstr "%s ÂÕÄÕ¤ %s."
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, fuzzy, c-format
 msgid "%s is already observing."
 msgstr "%s ÂÕÄÕ¤ %s."
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, fuzzy, c-format
 msgid "%s now observes %s"
 msgstr "%s ÔÅÐÅÒ ËÏÎÔÒÏÌÀ¤ÔØÓÑ %s."
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, fuzzy, c-format
 msgid "%s now observes"
 msgstr "%s ÔÅÐÅÒ ËÏÎÔÒÏÌÀ¤ÔØÓÑ %s."
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 #, fuzzy
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: take [Ú'¤ÄÎÁÎÎÑ] <ÇÒÁ×ÅÃØ>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: take <ÇÒÁ×ÅÃØ>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: take [Ú'¤ÄÎÁÎÎÑ] <ÇÒÁ×ÅÃØ>"
 
-#: server/stdinhand.c:2951
+#: server/stdinhand.c:3010
 #, fuzzy, c-format
-msgid "%s already controls %s"
+msgid "%s already controls %s."
 msgstr "%s ×ÖÅ ËÏÎÔÒÏÌÀ¤ ÁÂÏ ÎÁÇÌÑÄÁ¤ ÎÁÄ %s"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "îÅÍÁ¤ Ú`¤ÄÎÁÎÎÑ ÁÂÏ ÇÒÁ×ÃÑ Ú ¦Í`ÑÍ %s."
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr ""
 
-#: server/stdinhand.c:3076
+#: server/stdinhand.c:3135
 #, fuzzy, c-format
-msgid "%s now controls %s (%s, %s)"
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s ÔÅÐÅÒ ËÏÎÔÒÏÌÀ¤ÔØÓÑ %s."
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "äÉËÕÎ"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "ëÏÍÐ'ÀÔÅÒ"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "ìÀÄÉÎÁ"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 #, fuzzy
 msgid "Alive"
 msgstr "áËÔÉצÚÕ×ÁÔÉ"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 #, fuzzy
 msgid "Dead"
 msgstr ", ðÏÍÅÒ"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s ÎÅ×ÄÁÌÁ ÎÁÚ×Á."
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 #, fuzzy
 msgid "Usage: detach <connection-name>"
 msgstr "cut <¦Í'Ñ-Ú'¤ÄÎÁÎÎÑ>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 #, fuzzy
 msgid "You can not detach other users."
 msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÁÔÁËÕ×ÁÔÉ ÔÕÔ."
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, fuzzy, c-format
 msgid "%s is not attached to any player."
 msgstr "%s ÎÅ×ÄÁÌÁ ÎÁÚ×Á."
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, fuzzy, c-format
 msgid "%s detaching from %s"
 msgstr "%s צÄ'¤ÄÎÁ×ÓÑ ×¦Ä %s"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, fuzzy, c-format
 msgid "%s no longer observing."
 msgstr "%s ÂÕÄÕ¤ %s."
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, fuzzy, c-format
 msgid "detaching from %s."
 msgstr "÷É×ÞÁ¤ÔØÓÑ %s."
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 #, fuzzy
 msgid "Usage: load <game name>"
 msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: load <ÆÁÊÌ>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 #, fuzzy
 msgid "Cannot load a game while another is running."
 msgstr "îÅ ÍÏÖÕ ÚÁ×ÁÎÔÁÖÉÔÉ ÇÒÕ ËÏÌÉ ¦ÎÛÕ ÚÁÐÕÝÅÎÏ."
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr ""
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, fuzzy, c-format
 msgid "Could not load savefile: %s"
 msgstr "îÅ ÍÏÖÕ ÚÁ×ÁÎÔÁÖÉÔÉ ÇÒÕ: %s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "ðÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ ÐÒÁ×ÉÌ \"%s\""
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "ëÁÔÁÌÏÇ ÐÒÁ×ÉÌ \"%s\" ÎÅ ÚÎÁÊÄÅÎÏ"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, fuzzy, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "ëÁÔÁÌÏÇ ÐÒÁ×ÉÌ ×ÓÔÁÎÏ×ÌÅÎÏ Õ \"%s\""
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "ëÁÔÁÌÏÇ ÐÒÁ×ÉÌ ×ÓÔÁÎÏ×ÌÅÎÏ Õ \"%s\""
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "äÏ ÐÏÂÁÞÅÎÎÑ."
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "÷ÉÂÁÞÔÅ ÁÌÅ ÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ËÏÍÁÎÄÉ ÓÅÒ×ÅÒÁ."
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr ""
 "õ×ÁÇÁ: '%s' ÔÒÁËÔÏ×ÁÎÏ ÑË '%s', ÁÌÅ ÍÁ¤ ͦÓÃÅ Ä×ÏÚÎÁÞΦÓÔØ. óÐÒÏÂÕÊÔÅ '%"
 "shelp'."
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "îÅצÄÏÍÁ ËÏÍÁÎÄÁ. óÐÒÏÂÕÊÔÅ '%shelp'."
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr ""
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr ""
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÃÀ ËÏÍÁÎÄÕ."
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "(ÓÅÒ×ÅÒ)"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 #, fuzzy
 msgid "Game ended in a draw."
 msgstr "çÒÕ ÚÁ˦ÎÞÅÎÏ"
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr ""
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "îÅ ÍÏÖÕ ÚÕÐÉÎÉÔÉ ÇÒÕ: §§ ÎÅ ÚÁÐÕÝÅÎÏ."
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr ""
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 #, fuzzy
 msgid "You cannot surrender now."
 msgstr "óÁÂÏÔÕ×ÁÔÉ ÂÕĦ×ÌÀ"
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
+msgstr "îÅ ×ÉÓÔÁÞÁ¤ ÇÒÁ×æ×, ÇÒÕ ÎÅ ÓÔÁÒÔÏ×ÁÎÏ."
+
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
 msgstr "îÅ ×ÉÓÔÁÞÁ¤ ÇÒÁ×æ×, ÇÒÕ ÎÅ ÓÔÁÒÔÏ×ÁÎÏ."
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "îÅ ×ÉÓÔÁÞÁ¤ ÇÒÁ×æ×, ÇÒÕ ÎÅ ÓÔÁÒÔÏ×ÁÎÏ."
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 #, fuzzy
 msgid "All players are ready; starting game."
 msgstr "çÒÁ×ÅÃØ Ú ÔÁËÉÍ ¦Í'ÑÍ ×ÖÅ ¦ÓÎÕ¤."
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 #, fuzzy
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr "îÅ ÍÏÖÕ ÓÔÁÒÔÕ×ÁÔÉ ÇÒÕ: §§ ×ÖÅ ÚÁÐÕÝÅÎÏ."
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "îÅ ÍÏÖÕ ÓÔÁÒÔÕ×ÁÔÉ ÇÒÕ: §§ ×ÖÅ ÚÁÐÕÝÅÎÏ."
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "÷ÉÄÁÌÑÀ Ú'¤ÄÎÁÎÎÑ %s."
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6353,78 +6400,78 @@ msgstr ""
 "  save   -  ÁÂÉ ÚÂÅÒÅÇÔÉ ÇÒÕ\n"
 "  quit   -  ÁÂÉ ×ÉÊÔÉ"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "ëÏÍÁÎÄÁ:"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "óÉÎÔÁËÓÉÓ:"
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "ò¦×ÅÎØ: %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "äÏÓÔÕÐΦ ÎÁÓÔÕÐΦ ËÏÍÁÎÄÉ ÓÅÒ×ÅÒÁ:"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "áÒÇÕÍÅÎÔ ÄÏÐÏÍÏÇÉ '%s' Ä×ÏÚÎÁÞÎÉÊ."
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "îÅÍÁ¤ ÓЦ×ÐÁĦÎØ ÄÌÑ ÁÒÇÕÍÅÎÔÁ ÄÏÐÏÍÏÇÉ '%s'."
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "ðÏÇÁÎÉÊ ÁÒÇÕÍÅÎÔ ÄÌÑ 'list': '%s'. óÐÒÏÂÕÊÔÅ '%shelp list'."
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "óÐÉÓÏË ÇÒÁ×æ×:"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<ÎÅÍÁ¤ ÇÒÁ×æ×>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "¦Í'Ñ %s, "
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr ", ðÏÍÅÒ"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr ", Ò¦×ÅÎØ ÓËÌÁÄÎÏÓÔ¦ %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr ", %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 #, fuzzy
 msgid ", ready"
 msgstr ", ðÏÍÅÒ"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr ""
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
@@ -6432,22 +6479,22 @@ msgstr[0] " %d 
 msgstr[1] " %d Ú'¤ÄÎÁÎÎÑ:"
 msgstr[2] " %d Ú'¤ÄÎÁÎØ:"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s ÐÒɤÄÎÁ×ÓÑ Ú %s (Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ %s), ÒÏÚÍ¦Ò ÂÕÆÅÒÕ=%dëâ"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " (ÒÅÖÉÍ ÎÁÇÌÑÄÁÞÁ)"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 #, fuzzy
 msgid "List of teams:"
 msgstr "óÐÉÓÏË ÇÒÁ×æ×:"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
@@ -6455,25 +6502,25 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr ""
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr ""
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "óÐÉÓÏË Ú'¤ÄÎÁÎØ ÓÅÒ×ÅÒÁ:"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<ÎÅÍÁ¤ Ú'¤ÄÎÁÎØ>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 #, fuzzy
 msgid "List of scenarios available:"
 msgstr "úÁÇÏÎ¦× ÎÅÍÁ¤"
@@ -6545,17 +6592,17 @@ msgstr ""
 msgid "Technology goal is %s."
 msgstr "ôÅÈÎÏÌÏǦÞÎÁ æÌØ %s."
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, c-format
 msgid "You steal %s from the %s."
 msgstr "÷É ×ËÒÁÌÉ %s Õ ÃÉצ̦ÚÁæ§ %s."
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, c-format
 msgid "The %s stole %s from you!"
 msgstr "%s ×ËÒÁ× Õ ÷ÁÓ %s!"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%s ×ËÒÁ× %s Ú %s."
@@ -7069,20 +7116,20 @@ msgstr ""
 msgid "Your %s has invalid orders."
 msgstr "÷ÁÛ Ð¦ÄÒÏÚÄ¦Ì %s ÐÏ×ÅÒÎÕ×ÓÑ ÄÌÑ ÚÁÐÒÁ×ËÉ."
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "âÁÇÁÔÏ ÚÅÍ̦ - ÃÅ ÚÁÊÍÅ ÄÅ˦ÌØËÁ ÓÅËÕÎÄ."
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, fuzzy, c-format
 msgid "Falling back to generator %d."
 msgstr "ðÏ×ÅÒÔÁÀÓØ ÄÏ ÇÅÎÅÒÁÔÏÒ 2"
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "çÅÎÅÒÁÔÏÒ 3 ÎÅ ÍÏÖÅ ÒÏÚÔÁÛÕ×ÁÔÉ ÕÓ¦ ×ÅÌÉ˦ ÏÓÔÒÏ×É."
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "çÅÎÅÒÁÔÏÒ 3 ÚÁÌÉÛÉ× ÎÅÒÏÚͦÝÅÎÉÍÉ %li ÚÅÍÅÌØ."
@@ -7169,16 +7216,17 @@ msgstr "
 msgid "Cannot find audio file %s"
 msgstr "îÅ ÚÎÁÊÄÅÎÏ ÁÕÄ¦Ï ÆÁÊÌ %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?ÚÁÐÏ×ÎÀ×ÁÞ:XXX/XXX XXX ÈÏĦ×"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "%3d ÇÒÉ×ÅÎØ ÚÁ ȦÄ"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
@@ -7186,30 +7234,30 @@ msgstr[0] "%3d Ȧ
 msgstr[1] "%3d ÈÏÄÉ"
 msgstr[2] "%3d ÈÏĦ×"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "ΦËÏÌÉ"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/ȦÄ"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
@@ -7217,76 +7265,76 @@ msgstr[0] "%s (%d) %d Ȧ
 msgstr[1] "%s (%d) %d ÈÏÄÉ"
 msgstr[2] "%s (%d) %d ÈÏĦ×"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "úÁÓÔÁÒ¦ÌÏ"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "úÂÕÄÏ×ÁÎÏ"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 #, fuzzy
 msgid "Great Wonder"
 msgstr "äÉ×Ï"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 #, fuzzy
 msgid "Small Wonder"
 msgstr "äÏÓÔÕÐΦ ÄÉ×Á"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/ȦÄ"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, fuzzy, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%s - %s ÇÏÒÏÄÑÎ"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr ""
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, fuzzy, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "ôÏÒÇÏ×ÉÈ ÛÌÑÈ¦× ÎÅ ¦ÓÎÕ¤.\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, fuzzy, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "âÕÄÕÀÔØ Ð¦ÄÒÏÚĦÌÉ"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -7399,8 +7447,8 @@ msgid "Best defending units"
 msgstr "îÁÊËÒÁݦ ÚÁÈÉÓΦ ÚÁÇÏÎÉ"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7583,8 +7631,8 @@ msgstr "?
 msgid "?cma:Governor"
 msgstr ""
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7854,21 +7902,21 @@ msgstr ""
 "á×ÔÏÍÁÔÉÞÎÏ Ú'¤ÄÎÕ×ÁÔÉÓØ Ú ÓÅÒ×ÅÒÏÍ \"%s\" ÎÁ ÐÏÒÔÕ %d ÑË \"%s\" ËÏÖΦ %d.%d "
 "ÓÅËÕÎÄ ÎÁÐÒÏÔÑÚ¦ %d ÒÁÚ¦×"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 #, fuzzy
 msgid "novice"
 msgstr "ÎÅÍÁ¤"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "ÌÅÇËÁ"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 #, fuzzy
 msgid "normal"
 msgstr "îÅÐÏÇÁÎÁ"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "×ÁÖËÁ"
 
@@ -7876,35 +7924,35 @@ msgstr "
 msgid "experimental"
 msgstr ""
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 #, fuzzy
 msgid "Starting server..."
 msgstr "óÔÁÒÔÕÀ ÇÒÕ."
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 #, fuzzy
 msgid "Couldn't start the server."
 msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÁÔÁËÕ×ÁÔÉ ÔÕÔ."
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr ""
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 #, fuzzy
 msgid "Couldn't connect to the server."
 msgstr "òÏÚ¦Ò×ÁÔÉ Ú'¤ÄÎÁÎÎÑ Ë̦¤ÎÔÁ ÄÏ ÓÅÒ×ÅÒÁ."
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr ""
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 #, fuzzy
 msgid "We have control of the server (command access level hack)"
 msgstr "÷É×ÏÄÉÔØ ÁÂÏ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ."
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr ""
 
@@ -7994,28 +8042,28 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, fuzzy, c-format
 msgid "Allows %s."
 msgstr "äÏÚ×ÏÌѤ %s.\n"
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, fuzzy, c-format
 msgid "Allows %s (with %s)."
 msgstr "äÏÚ×ÏÌѤ %s (Ú %s).\n"
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 #, fuzzy
 msgid " Rivers"
 msgstr "  ò¦ÞËÉ"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "÷ÉÂÁÞÔÅ, ÎÅ ÍÁ¤ ÄÏÐÏÍÏÇÉ ÐÏ %s.\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -8026,13 +8074,13 @@ msgstr ""
 "ãÀ ÓÔÏÒ¦ÎËÕ ÓÇÅÎÅÒÏ×ÁÎÏ Á×ÔÏÍÁÔÉÞÎÏ.\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 msgid ""
 "Requires: Nothing\n"
 "\n"
 msgstr ""
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, fuzzy, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr ""
@@ -8040,54 +8088,54 @@ msgstr ""
 "\n"
 "÷¦ÄËÒÉÔÔÑ %s ÒÏÂÉÔØ ÚÁÓÔÁÒ¦ÌÉÍ %s.  "
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, fuzzy, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "äÏÚ×ÏÌѤ ÕÓ¦Í ÇÒÁ×ÃÑÍ ÝÏ ×¦ÄËÒÉÌÉ %s ÂÕÄÕ×ÁÔÉ Ð¦ÄÒÏÚĦÌÉ %s.  "
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, fuzzy, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "äÏÚ×ÏÌѤ %s (Ú %s).\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, fuzzy, c-format
 msgid "* Allows %s.\n"
 msgstr "äÏÚ×ÏÌѤ %s.\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr ""
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr ""
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 #, fuzzy
 msgid "* May not be built in cities.\n"
 msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr ""
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr ""
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr ""
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr ""
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
@@ -8095,7 +8143,7 @@ msgstr[0] "* 
 msgstr[1] "* íÏÖÅ ÎÅÓÔÉ ÔÁ ÚÁÐÒÁ×ÌÑÔÉ %d ÁצÁÚÁÇÏÎÉ.\n"
 msgstr[2] "* íÏÖÅ ÎÅÓÔÉ ÔÁ ÚÁÐÒÁ×ÌÑÔÉ %d ÁצÁÚÁÇÏΦ×.\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
@@ -8103,7 +8151,7 @@ msgstr[0] "* 
 msgstr[1] "* íÏÖÅ ÎÅÓÔÉ ÔÁ ÚÁÐÒÁ×ÌÑÔÉ %d ÒÁËÅÔΦ ЦÄÒÏÚĦÌÉ.\n"
 msgstr[2] "* íÏÖÅ ÎÅÓÔÉ ÔÁ ÚÁÐÒÁ×ÌÑÔÉ %d ÒÁËÅÔÎÉÈ Ð¦ÄÒÏÚĦ̦×.\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
@@ -8111,140 +8159,140 @@ msgstr[0] "* 
 msgstr[1] "* íÏÖÅ ÐÅÒÅ×ÅÚÔÉ %d ÎÁÚÅÍΦ ЦÄÒÏÚĦÌÉ ÐÏ ×ÏĦ.\n"
 msgstr[2] "* íÏÖÅ ÐÅÒÅ×ÅÚÔÉ %d ÎÁÚÅÍÎÉÈ Ð¦ÄÒÏÚÄ¦Ì¦× ÐÏ ×ÏĦ.\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, fuzzy, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* äÏÐÏÍÏÇÁÀÔØ ÂÕÄÕ×ÁÔÉ ÄÉ×Á.\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr ""
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr ""
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 #, fuzzy
 msgid "* Can build roads and railroads.\n"
 msgstr "* äÏÐÏÍÏÇÁÀÔØ ÂÕÄÕ×ÁÔÉ ÄÉ×Á.\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 #, fuzzy
 msgid "* Can build mines on tiles.\n"
 msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 #, fuzzy
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 #, fuzzy
 msgid "* Can build farmland.\n"
 msgstr "âÕÄÕ×ÁÔÉ ÆÅÒÍÕ"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, fuzzy, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 #, fuzzy
 msgid "* Can build fortresses.\n"
 msgstr "äÏÚ×ÏÌѤ %s ÂÕÄÕ×ÁÔÉ ÕËÒ¦ÐÌÅÎÎÑ.\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr ""
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr ""
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 #, fuzzy
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "ïÞÉÓÔÉÔÉ ÒÁĦÁæÀ"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 #, fuzzy
 msgid "* Can transform tiles.\n"
 msgstr "* íÏÖÕÔØ ×ÉËÏÎÕ×ÁÔÉ Ä¦§ ËÏÌÏΦÓÔ¦×.\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 #, fuzzy
 msgid "* Can build airbases.\n"
 msgstr "* íÏÖÕÔØ ÚÁÓÎÏ×Õ×ÁÔÉ Í¦ÓÔÁ.\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr ""
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr ""
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr ""
 "* íÏÖÕÔØ ×ÉËÏÎÕ×ÁÔÉ Ä¦ÐÌÏÍÁÔÉÞΦ Ħ§, Á ÔÁËÏÖ ÄÅÑ˦ ÍÁÀÔØ ÛÐÉÇÕÎÓØ˦ "
 "ÍÏÖÌÉ×ÏÓÔ¦.\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* íÏÖÕÔØ ×ÉËÏÎÕ×ÁÔÉ Ä¦ÐÌÏÍÁÔÉÞΦ Ħ§.\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr ""
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr ""
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* íÏÖÕÔØ ÁÔÁËÕ×ÁÔÉ ×ÏÒÏÖ¦ ÐÏצÔÒÑΦ ЦÄÒÏÚĦÌÉ.\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr ""
 "* îÅ×ÉÄÉÍÉÊ ÑËÝÏ Õ ÓÕÓ¦ÄÎ¦Ê Ë̦ÔÉÎæ ÎÅ ÍÁ¤ ×ÏÒÏÖÏÇÏ Ð¦ÄÒÏÚĦÌÕ ÁÂÏ Í¦ÓÔÁ.\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* íÏÖÕÔØ ÁÔÁËÕ×ÁÔÉ ÌÉÛÅ Õ ÏËÅÁΦ (ÎÅ ÎÁ ÓÕÛ¦)\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 #, fuzzy
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
@@ -8253,76 +8301,76 @@ msgstr ""
 "* íÏÖ¤ ÁÔÁËÕ×ÁÔÉ Ú ×ÏÄÎÉÈ Ð¦ÄÒÏÚÄ¦Ì¦× ×ÏÒÏÖ¦ ͦÓÔÁ ÁÂÏ Ð¦ÄÒÏÚĦÌÉ ÎÁ "
 "ÓÕÈÏÐÕÔÎÉÈ ÔÅÒÉÔÏÒ¦ÑÈ."
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, fuzzy, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* íÏÖÅ ÂÕÄÉ ÐÁÒÁÛÕÔÏ×ÁÎÏ Ú ÄÒÕÖÎØÏÇÏ Í¦ÓÔÁ (÷¦ÄÓÔÁÎØ: %d)."
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* íÁ¤ ÐÏÄצÊÎÉÊ ÚÁÈÉÓÔ ×¦Ä '˦ÎÎÉÈ' ЦÄÒÏÚĦ̦×.\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* òÁÈÕ¤ÔØÓÑ ÑË '˦ÎÎÉÊ' ÐÒÏÔÉ ÄÅÑËÉÈ ÚÁÈÉÓÎÉ˦×.\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* òÁËÅÔÎÉÊ Ð¦ÄÒÏÚĦÌ: ×ÔÒÁÞÁ¤ÔØÓÑ Ð¦ÓÌÑ ×ÉËÏÎÁÎϧ ÁÔÁËÉ.\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* áÔÁËÁ ÚÁ˦ÎÞÕ¤ È¦Ä ÃØÏÇÏ Ð¦ÄÒÏÚĦÌÁ.\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* áÔÁËÁ ÃÉÍ Ð¦ÄÒÏÚĦÌÏÍ ÓÐÒÉÞÉÎѤ ÒÁĦÁæÊÎÅ ÚÁÂÒÕÄÎÅÎÎÑ!\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr ""
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* ¶ÇÎÏÒÕ¤ óÔ¦ÎÉ Í¦ÓÔÁ.\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* îÁÄÁ¤ Ð'ÑÔÉËÒÁÔÎÉÊ ÚÁÈÉÓÔ ÐÒÏÔÉ ÒÁËÅÔ ÔÁ ̦ÔÁ˦×.\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* ¶ÇÎÏÒÕ¤ ÌÁÎÛÁÆÔ (ÔÒÁËÔÕ¤ ÕÓÀ ÓÕÛÕ ÑË ÄÏÒÏÇÉ).\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* ¶ÇÎÏÒÕ¤ ÚÏÎÉ ËÏÎÔÒÏÌÀ.\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr ""
 "* îŠצÊÓØËÏ×ÉÊ Ð¦ÄÒÏÚÄ¦Ì (ÎÅÍÏÖÅ ÁÔÁËÕ×ÁÔÉ; ÎÅÍÁ¤ צÊÓØËÏ×ÏÇÏ ÐÏÌÏÖÅÎÎÑ).\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "* ðÏÌØÏ×ÉÊ Ð¦ÄÒÏÚĦÌ: ÏÄÉÎ ÎÅÝÁÓÎÉÊ ÎÁצÔØ ÑËÝÏ Ê ÎÅÁÇÒÅÓÉ×ÎÉÊ.\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr ""
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr ""
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, fuzzy, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
@@ -8331,12 +8379,12 @@ msgstr ""
 "* ðÏ×ÉÎÅÎ ÚÁ×ÅÒÛÉÔÉ È¦Ä Õ Í¦ÓÔ¦ ÁÂÏ ÐÏÂÌÉÚÕ ×¦Ä ÚÅÍ̦, ¦ÎÁËÛÅ ÍÁ¤ 50%% "
 "צÒÏǦÄΦÓÔØ ÂÕÔÉ ×ÔÒÁÞÅÎÉÍ Õ ÍÏÒ¦."
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr ""
@@ -8345,15 +8393,15 @@ msgstr ""
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " ÁÂÏ "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr "?ÁÂÏ:, "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
@@ -8361,12 +8409,12 @@ msgstr[0] "* 
 msgstr[1] "* ð¦ÄÒÏÚÄ¦Ì ÍÁ¤ ÂÕÔÉ Õ Í¦ÓÔ¦ ÁÂÏ ÎÁ ЦÄÒÏÚĦ̦ %s ЦÓÌÑ %d ÈÏĦ×.\n"
 msgstr[2] "* ð¦ÄÒÏÚÄ¦Ì ÍÁ¤ ÂÕÔÉ Õ Í¦ÓÔ¦ ÁÂÏ ÎÁ ЦÄÒÏÚĦ̦ %s ЦÓÌÑ %d ÈÏĦ×.\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "ñËÝÏ ÒÏÚÐÏÞÎÅÍÏ Ú %s ÔÏ ÂÕÄÅÍÏ ÐÏÔÒÅÂÕ×ÁÔÉ %d ÂÁ̦×."
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8375,90 +8423,90 @@ msgstr ""
 "áÂÉ ÄÏÓ̦ÄÉÔÉ %s ÎÁÍ ÓÐÅÒÛÕ ÐÏÔÒ¦ÂÎÏ ÏÔÒÉÍÁÔÉ %d ¦ÎÛÉÈ ÔÅÈÎÏÌÏǦÊ. ÷æÌÏÍÕ "
 "ÎÁÍ ÚÎÁÄÏÂÉÔØÓÑ %d ÂÁÌ¦× ÄÌÑ ÚÁ×ÅÒÛÅÎÎÑ."
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr ""
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr " ãÅ ÞÉÓÌÏ ÂÁÇÁÔÏ × ÞÏÍÕ ÚÁÌÅÖÉÔØ ×¦Ä ÔÏÇÏ, ÝÏ ×¦ÄËÒÉÀÔØ ¦ÎÛ¦ ÇÒÁ×æ.\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, fuzzy, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr "ðÅÒÛÉÊ ÇÒÁ×ÅÃØ ÝÏ ÄÏÓ̦ÄÉÔØ %s ÏÔÒÉÍÕ¤ ÎÅÇÁÊÎÅ ÚÎÁÎÎÑ.\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 #, fuzzy
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "ð¦Ä×ÉÝÕ¤ ÚÁÂÒÕÄÎÅÎÎÑ ÝÏ ÓÐÒÉÞÉÎÅÎÏ ÎÁÓÅÌÅÎÎÑÍ.\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, fuzzy, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "%s - ÄÏÚ×ÏÌѤ ÂÕÄÕ×ÁÔÉ ÛÌÑÈÉ ÞÅÒÅÚ Ò¦ËÉ.\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, fuzzy, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "äÏÚ×ÏÌѤ %s ÂÕÄÕ×ÁÔÉ ÕËÒ¦ÐÌÅÎÎÑ.\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, fuzzy, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "äÏÚ×ÏÌѤ %s ÂÕÄÕ×ÁÔÉ ÁצÁÂÁÚÉ.\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, fuzzy, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "äÏÚ×ÏÌѤ %s ÍÏÄÅÒΦÚÕ×ÁÔÉ ûÌÑÈÉ ÄÏ úÁ̦ÚÎÉÃØ.\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, fuzzy, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "äÏÚ×ÏÌѤ %s ÐÅÒÅÔ×ÏÒÀ×ÁÔÉ ÚÒÏÛÅÎÎÑ ÎÁ ÆÅÒÍÉ.\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr ""
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 #, fuzzy
 msgid "* You cannot build cities on this terrain."
 msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÐÅÒÅÔÑÇÎÕÔÉ ÎÁ Ó×¦Ê Â¦Ë Ð¦ÄÒÏÚÄ¦Ì Ã¦¤§ ÎÁæ§."
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr ""
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr ""
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr ""
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, fuzzy, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8470,7 +8518,7 @@ msgstr[0] "
 msgstr[1] "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ Õ ÐÏ̦ ÍÏÖÕÔØ ÓÐÒÉÞÉÎÉÔÉ ÎÅÝÁÓÔÑ."
 msgstr[2] "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ Õ ÐÏ̦ ÍÏÖÕÔØ ÓÐÒÉÞÉÎÉÔÉ ÎÅÝÁÓÔÑ."
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8478,48 +8526,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8527,23 +8575,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8555,7 +8603,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
@@ -8564,64 +8612,64 @@ msgstr[1] ""
 msgstr[2] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 #, fuzzy
 msgid "* Your units cannot be bribed.\n"
 msgstr "ãÅÊ Ð¦ÄÒÏÚÄ¦Ì ÎÅ ÍÏÖÅ ÂÕÔÉ ÐÁÒÁÛÕÔÏ×ÁÎÉÊ."
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 #, fuzzy
 msgid "* Your cities cannot be incited.\n"
 msgstr "í¦ÓÔÏ ÎÅ ÍÏÖÅ ÂÕÔÉ Ð¦ÄÂÕÒÅÎÏ!"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr ""
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 #, fuzzy
 msgid "* Has no unhappy citizens.\n"
 msgstr "%d ÄÏÄÁÔËÏ×ÉÈ ÎÅÝÁÓÎÉÈ ÇÏÒÏÄÑÎ."
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr ""
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 #, fuzzy
 msgid "* Veteran units.\n"
 msgstr "íÏÒÓØ˦ ЦÄÒÏÚĦÌÉ"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8629,7 +8677,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8637,71 +8685,71 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr ""
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, fuzzy, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "äÏÚ×ÏÌѤ %s ÂÕÄÕ×ÁÔÉ ÁצÁÂÁÚÉ.\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, fuzzy, c-format
 msgid "%s%d %s"
 msgstr "%3d/%3d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 msgid "?blistmore:, "
 msgstr ", "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d ÎÅÝÁÓÌÉצ"
@@ -9117,16 +9165,16 @@ msgstr "
 msgid "Start of turn %d"
 msgstr "ðÏÞÁÔÏË ÈÏÄÕ %d"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "ëÏÍÐ'ÀÔÅÒΦ ÇÒÁ×æ ÔÅÐÅÒ %s."
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "ôáë"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "î¶"
 
@@ -9160,13 +9208,13 @@ msgstr "?ͦ
 msgid "Username"
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "æÌÁÇ"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -9182,7 +9230,7 @@ msgstr "
 msgid "Score"
 msgstr "ïÔÒÉÍÁÔÉ ÒÁÈÕÎËÉ"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "ëÏÍÁÎÄÁ"
 
@@ -9217,37 +9265,37 @@ msgstr ""
 msgid "Ping"
 msgstr "ð¦ÎÇ"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 #, fuzzy
 msgid "You cannot sell improvements."
 msgstr "óÁÂÏÔÕ×ÁÔÉ ÂÕĦ×ÌÀ"
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, fuzzy, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "ðÒÏÄÁÎÏ %d %s ÚÁ %d ÇÒÉ×ÅÎØ"
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, fuzzy, c-format
 msgid "No %s could be sold."
 msgstr "îÅÍÁ¤ %s ÄÌÑ ÐÒÏÄÁÖÕ"
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr ""
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, fuzzy, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s ÎÅ ÍÏÖÅ ÕÔÒÉÍÕ×ÁÔÉ %s, ЦÄÒÏÚÄ¦Ì ÒÁÚÆÏÒÍÏ×ÁÎÏ."
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, fuzzy, c-format
 msgid "Disbanded %d %s."
 msgstr "òÏÚÐÕÝÅÎÏ ÷ÁÛ %s Õ (%d, %d)."
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, fuzzy, c-format
 msgid "No %s could be disbanded."
 msgstr "îÅÍÁ¤ %s ÄÌÑ ÐÒÏÄÁÖÕ"
@@ -9574,64 +9622,69 @@ msgstr "
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "ðÏÄÁÔËÉ:%d òÏÚ˦Û:%d îÁÕËÁ:%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Õ %s"
+
+#: client/text.c:609
 #, fuzzy, c-format
 msgid "Moving: %s"
 msgstr "Õ %s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr ""
 
-#: client/text.c:625
+#: client/text.c:629
 #, fuzzy, c-format
 msgid "%s People"
 msgstr "%s ìÁÓËÁ×Ï ÐÒÏÓÉÍÏ"
 
-#: client/text.c:629
+#: client/text.c:633
 #, fuzzy, c-format
 msgid "Turn: %d"
 msgstr "ôÅÒÉÔÏÒ¦Ñ: %s"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "çÒÏÛÅÊ: %d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr ""
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, fuzzy, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "ðÏÄÁÔËÉ:%d òÏÚ˦Û:%d îÁÕËÁ:%d"
 
-#: client/text.c:639
+#: client/text.c:643
 #, fuzzy, c-format
 msgid "Researching %s: %s"
 msgstr "äÏÓ̦ÄÖÕ¤ÔØÓÑ %s: %d/%d"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr ""
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "ëÅÒ¦×ÎÉÃÔ×Ï: %s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, fuzzy, c-format
 msgid "%d unit"
 msgid_plural "%d units"
@@ -9640,21 +9693,21 @@ msgstr[1] " 
 msgstr[2] " ÚÁǦÎ"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr ""
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr ""
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, fuzzy, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
@@ -9662,37 +9715,37 @@ msgstr[0] "
 msgstr[1] "÷ÉÂ¦Ò Ð¦ÄÒÏÚĦÌÕ"
 msgstr[2] "÷ÉÂ¦Ò Ð¦ÄÒÏÚĦÌÕ"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 #, fuzzy
 msgid "No units selected."
 msgstr "ïÂÒÁÎÏ ÎÁæÀ"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr ""
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr ""
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 #, fuzzy
 msgid "No units to upgrade!"
 msgstr "îÅ ÍÁ¤ ЦÄÒÏÚÄ¦Ì¦× ÄÌÑ ÍÏÄÅÒΦÚÁæ§."
 
-#: client/text.c:860
+#: client/text.c:864
 #, fuzzy
 msgid "None of these units may be upgraded."
 msgstr "îÅ ÍÁ¤ ЦÄÒÏÚÄ¦Ì¦× ÄÌÑ ÍÏÄÅÒΦÚÁæ§."
 
-#: client/text.c:866
+#: client/text.c:870
 #, fuzzy, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9710,14 +9763,14 @@ msgstr[2] ""
 "íÏÄÅÒΦÚÕ×ÁÔÉ %s ÄÏ %s ÚÁ %d ÇÒÉ×ÅÎØ?\n"
 "âÀÄÖÅÔ ÎÁ̦ÞÕ¤ %d ÇÒÉ×ÅÎØ."
 
-#: client/text.c:887
+#: client/text.c:891
 #, fuzzy
 msgid "Shows your progress in researching the current technology."
 msgstr ""
 "äÅÍÏÎÓÔÒÕ¤ ÐÒÏÇÒÅÓ Õ ×É×ÞÅÎΦ ÎÏ×ÉÈ ÔÅÈÎÏÌÏǦÊ.\n"
 "%s: %d/%d."
 
-#: client/text.c:893
+#: client/text.c:897
 #, fuzzy
 msgid "no research target."
 msgstr ""
@@ -9725,46 +9778,46 @@ msgstr ""
 "(ÎÅÍÁ¤ ÄÏÓ̦ÄÖÅÎØ)"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 #, fuzzy
 msgid "Shows the progress of global warming:"
 msgstr ""
 "äÅÍÏÎÓÔÒÕ¤ ÒÏÚ×ÉÔÏË ÇÌÏÂÁÌØÎÏÇÏ ÐÏÔÅÐ̦ÎÎÑ:\n"
 "%d."
 
-#: client/text.c:917
+#: client/text.c:921
 #, fuzzy, c-format
 msgid "Pollution rate: %d%%"
 msgstr "úÁÂÒÕÄÎÅÎÎÑ:   %3d"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr ""
 
-#: client/text.c:935
+#: client/text.c:939
 #, fuzzy
 msgid "Shows the progress of nuclear winter:"
 msgstr ""
 "äÅÍÏÎÓÔÒÕ¤ ÒÏÚ×ÉÔÏË ÒÁĦÁæÊÎϧ ÚÉÍÉ:\n"
 "%d."
 
-#: client/text.c:936
+#: client/text.c:940
 #, fuzzy, c-format
 msgid "Fallout rate: %d%%"
 msgstr "%s ÍÁËÓÉÍÁÌØÎÉÊ Ò¦×ÅÎØ: %d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr ""
 
-#: client/text.c:953
+#: client/text.c:957
 #, fuzzy
 msgid "Shows your current government:"
 msgstr ""
@@ -9772,25 +9825,25 @@ msgstr ""
 "%s."
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, fuzzy, c-format
 msgid "Population:      %5d"
 msgstr "îÁÓÅÌÅÎÎÑ: %s"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, fuzzy, c-format
 msgid "Energy:          %5d %%"
 msgstr "íÁÓÁ:                   %5d ÔÏÎÁ"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
@@ -9799,96 +9852,96 @@ msgstr[1] "
 msgstr[2] "íÁÓÁ:                   %5d ÔÏÎ"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "þÁÓ ÐÅÒÅÌØÏÔÕ:     %5.1f ÒÏ˦×"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "þÁÓ ÐÅÒÅÌØÏÔÕ:     ÎÅצÄÏÍÉÊ"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr ""
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr ""
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "?ÔÁÊÍÁÕÔ:Φ"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?ÓÅËÕÎÄ:%02dÓ"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?È×/ÓÅË:%02dÈ %02dÓ"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?ÞÁÓ¦×/È×:%02dÞ %02dÈ"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?ÄΦ×/ÞÁÓ¦×:%02dÄ %02dÞ"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?ÔÒÉ×Á̦ÓÔØ:ΦËÏÌÉ"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ÍÓ"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, fuzzy, c-format
 msgid "%s of the %s"
 msgstr "%s Ú %s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, fuzzy, c-format
 msgid "Observer: %s"
 msgstr " (ÓÐÏÓÔÅÒ¦ÇÁÞ)"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "âÕĦ×̦:"
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "î¦ÞÏÇÏ"
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "?blistend:"
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "äÉ×Á: "
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "í¦ÓÔÁ: ÚÁÇÁÌÏÍ %d, ÎÁ %d ¦ÌØÛÅ Î¦Ö ÐÏÒ¦Ç Õ %d ͦÓÔ."
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
@@ -9897,7 +9950,7 @@ msgstr[1] "%d 
 msgstr[2] "%d ÎÅÊÔÒÁÌØÎÉÈ ÄÏ ÛÔÒÁÆÕ "
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
@@ -9906,16 +9959,16 @@ msgstr[1] "%d 
 msgstr[2] "%d ÄÏÄÁÔËÏ×ÉÈ ÎÅÝÁÓÎÉÈ ÇÏÒÏÄÑÎ."
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "䦤 צÊÓØËÏ×ÉÊ ÓÔÁÎ ("
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "ÎÅ ÍÁËÓ¦ÍÕÍ, "
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
@@ -9924,20 +9977,20 @@ msgstr[1] "%d Ц
 msgstr[2] "%d ЦÄÒÏÚÄ¦Ì¦× ÍÁËÓÉÍÕÍ, "
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "%d ÎÁ ЦÄÒÏÚĦÌ). "
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ Õ ÐÏ̦ ÍÏÖÕÔØ ÓÐÒÉÞÉÎÉÔÉ ÎÅÝÁÓÔÑ."
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ ÎÅ ×ÐÌÉ×ÁÀÔØ ÎÁ ÝÁÓÔÑ."
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "òÏÚ˦Û: %d ÚÁÇÁÌÏÍ."
@@ -9979,12 +10032,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "ÎÅÍÁ¤"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "ÏÂÒÁÎÅ"
 
@@ -10041,12 +10094,14 @@ msgid "Ooops..."
 msgstr "ïÐæ§..."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 #, fuzzy
 msgid "This unit cannot be bribed!"
 msgstr "ãÅÊ Ð¦ÄÒÏÚÄ¦Ì ÎÅ ÍÏÖÅ ÂÕÔÉ ÐÁÒÁÛÕÔÏ×ÁÎÉÊ."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -10063,6 +10118,7 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -10103,6 +10159,7 @@ msgstr "
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "ñË ×ÉÒ¦ÛÉÔØ ÛÐÉÇÕÎ"
 
@@ -10127,12 +10184,13 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "÷ÉÒÏÂÎÉÃÔ×Ï Í¦ÓÔÁ"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "÷É ÎÅ ÍÏÖÅÔÅ ×ÌÁÛÔÕ×ÁÔÉ ÒÅ×ÏÌÀæÀ Õ %s."
@@ -10144,6 +10202,7 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -10160,6 +10219,7 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -10169,6 +10229,7 @@ msgstr ""
 "âÀÄÖÅÔ ÎÁ̦ÞÕ¤ %d ÇÒÉ×ÅÎØ."
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -10238,11 +10299,13 @@ msgid "Subvert Enemy Unit"
 msgstr "ðÅÒÅËÕÐÉÔÉ ×ÏÒÏÖ¦Ê Ð¦ÄÒÏÚĦÌ"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "ðÁÎÅ - ĦÐÌÏÍÁÔ ÏÞÉËÕ¤ ÷ÁÛϧ ËÏÍÁÎÄÉ"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "ðÁÎÅ - ÛÐÉÇÕÎ ÏÞÉËÕ¤ ÷ÁÛϧ ËÏÍÁÎÄÉ"
@@ -10345,7 +10408,7 @@ msgstr "
 msgid "_Overview"
 msgstr "ïÇÌÑÄ"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10370,11 +10433,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d ÈÏĦ×"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "ëÕÐÉÔÉ"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "÷ÉÒÏÂÎÉÃÔ×Ï"
@@ -10497,7 +10560,7 @@ msgstr "
 msgid "Present units %d"
 msgstr "ðÒÉÓÕÔΦ ЦÄÒÏÚĦÌÉ %d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "ãÅÎÔÒ"
 
@@ -10589,35 +10652,35 @@ msgstr "
 msgid "What should we rename the city to?"
 msgstr "ñËÁ ÎÏ×Á ÎÁÚ×Á ͦÓÔÁ?"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "úͦÎÉÔÉ"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 #, fuzzy
 msgid "Add _First"
 msgstr "äÏÄÁÔÉ ÐÒÅÄÕÓÔÁÎÏ×ËÕ"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 #, fuzzy
 msgid "Add _Next"
 msgstr "äÏÄÁÔÉ ÐÒÅÄÕÓÔÁÎÏ×ËÕ"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 #, fuzzy
 msgid "Add _Last"
 msgstr "äÏÄÁÔÉ ÐÒÅÄÕÓÔÁÎÏ×ËÕ"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "ïÂÅÒ¦ÔØ"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "ðÏËÁÚÁÔÉ"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10627,13 +10690,13 @@ msgstr "
 msgid "Cities"
 msgstr "í¦ÓÔÁ"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "ðÏËÁÚÁÔÉ"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10642,85 +10705,90 @@ msgstr "
 msgid "Improvements"
 msgstr "âÕĦ×̦"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "äÉ×Á"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "õÓ¦ ͦÓÔÁ"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "îÅÍÁ ͦÓÔ"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "ïÂÅÒÎÕÔÉ ×ÉĦÌÅÎÎÑ"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "âÕÄÕÀÔØ Ð¦ÄÒÏÚĦÌÉ"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "âÕÄÕÀÔØ ÂÕĦ×̦"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "âÕÄÕÀÔØ ÄÉ×Á"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "âÕÄÕ¤ ЦÄÒÏÚĦÌ"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "âÕÄÕ¤ ÂÕĦ×ÌÀ"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "âÕÄÕ¤ ÄÉ×Ï"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "ðÒÉÂÅÒÅÖΦ ͦÓÔÁ"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "ôÏÊ ÖÅ ÏÓÔÒ¦×"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "ð¦ÄÔÒÉÍÕ×ÁΦ ЦÄÒÏÚĦÌÉ"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "ðÒÉÓÕÔΦ ЦÄÒÏÚĦÌÉ"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "âÕĦ×̦ Õ Í¦ÓÔ¦"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "äÉ×Á Õ Í¦ÓÔ¦"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "äÏÓÔÕÐΦ ЦÄÒÏÚĦÌÉ"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "äÏÓÔÕÐΦ ÂÕĦ×̦"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "äÏÓÔÕÐΦ ÄÉ×Á"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "úÁÇÁÌÏÍ ËÏÛÔÕ¤:"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 #, fuzzy
 msgid ""
@@ -10788,129 +10856,129 @@ msgstr "
 msgid "Remove this preset?"
 msgstr "÷ÉÄÁÌÉÔÉ ÃÀ ÐÒÅÄÕÓÔÁÎÏ×ËÕ?"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "êÔÉ ÄÏ"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "÷¦ÄËÒÉÔÉ Í¦ÓÔÏ"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "÷É ËÁÚÁÌÉ, ÝÏ ÎÁÓÔÁ× ÞÁÓ ÒÅ×ÏÌÀæ§?"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "òÅ×ÏÌÀæÑ!"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "ýÏ ÒÕÊÎÕ×ÁÔÉ"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "ïÂÅÒ¦ÔØ ÝÏ ÒÕÊÎÕ×ÁÔÉ:"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 #, fuzzy
 msgid "Unit"
 msgstr "ð¦ÄÒÏÚĦÌÉ"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "îÁÚ×Á"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "÷ÉÂ¦Ò Ð¦ÄÒÏÚĦÌÕ"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "çÏÔÏ×ΦÓÔØ ÕÓ¦È"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "ðÒÉÓÐÁÔÉ ÂÅÚĦÑÌØΦ ЦÄÒÏÚĦÌÉ"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "_îÁæ§:"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "ñËÏÀ ÎÁæ¤À ×É ÂÕÄÅÔÅ ËÅÒÕ×ÁÔÉ?"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 #, fuzzy
 msgid "Pick Nation"
 msgstr "÷¦ÄÄ¦Ì Í¦Ì¦Ã¦§"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "ïÂ'¤ÄÎÁÎΦ ÎÁæ§"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "ïÂÅÒ¦ÔØ ÎÁæÀ"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "çÏÌÏ×Á:"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "ö¦ÎËÁ"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "þÏÌÏצË"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "óÔÉÌØ Í¦ÓÔ:"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "ìÅÇÅÎÄÁ"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "÷É ÐÏ×ÉΦ ×ËÁÚÁÔÉ ×ÁÛÕ ÓÔÁÔØ."
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "÷É ÐÏ×ÉΦ ÏÂÒÁÔÉ ÓÔÉÌØ Í¦ÓÔ."
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "÷É ÐÏ×ÉΦ ××ÅÓÔÉ ÎÏÒÍÁÌØÎÅ ¦Í'Ñ."
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "íÏÄÅÒΦÚÁÃ¦Ñ Ð¦ÄÒÏÚĦÌÕ!"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -11161,71 +11229,77 @@ msgstr ""
 msgid "Not _ready"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 #, fuzzy
 msgid "_Ready"
 msgstr "çÏÔÏ×ΦÓÔØ ÕÓ¦È"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 #, fuzzy
 msgid "_Start"
 msgstr "óÔÁÎ"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "í¦ÓÔÁ"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 #, fuzzy
 msgid "Pick _Nation"
 msgstr "÷¦ÄÄ¦Ì Í¦Ì¦Ã¦§"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 #, fuzzy
 msgid "_Observe"
 msgstr " (ÓÐÏÓÔÅÒ¦ÇÁÞ)"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "ÔÅÐÅÒ ËÏÎÔÒÏÌÀ¤ÔØÓÑ"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 #, fuzzy
 msgid "<AI>"
 msgstr "ëÏÍÐ'ÀÔÅÒ"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 #, fuzzy
 msgid "<Easy AI>"
 msgstr "ëÏÍÐ'ÀÔÅÒ"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr ""
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 #, fuzzy
 msgid "<Hard AI>"
 msgstr "ëÏÍÐ'ÀÔÅÒ"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 #, fuzzy
 msgid "Random"
 msgstr "òÁĦÏ"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Observer"
 msgstr " (ÓÐÏÓÔÅÒ¦ÇÁÞ)"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Detached"
 msgstr ", ðÏÍÅÒ"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr ""
 
@@ -12175,234 +12249,234 @@ msgstr ""
 msgid "Connect to Gaming _Zone"
 msgstr "ð¦Ä'¤ÄÎÁÔÉÓÑ ÄÏ"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "áÄÒÅÓÁ"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "ðÏÒÔ"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "÷ÅÒÓ¦Ñ"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "óÔÁÎ"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "çÒÁ×æ×"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "ëÏÍÅÎÔÁÒ¦"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 #, fuzzy
 msgid "Internet _Metaserver"
 msgstr "íÅÔÁÓÅÒ×ÅÒÉ"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "èÏÓÔ:"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "ðÏÒÔ:"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 #, fuzzy
 msgid "_Login:"
 msgstr "ìÅǦÏÎ"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 #, fuzzy
 msgid "C_onnect"
 msgstr "ðÒɤ'ÄÎÁÔÉÓØ"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, fuzzy, c-format
 msgid "Connection name: %s"
 msgstr "ú'¤ÄÎÁÎÎÑ"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, fuzzy, c-format
 msgid "Player name: %s"
 msgstr "?ͦÓÔÏ:îÁÚ×Á"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, fuzzy, c-format
 msgid "Host: %s"
 msgstr "áÄÒÅÓÁ:"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, fuzzy, c-format
 msgid "%s info"
 msgstr "í¦ÓÔÏ ¦ÎÆÏ"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 #, fuzzy
 msgid "Toggle player ready"
 msgstr "aitoggle <ÇÒÁ×ÅÃØ>"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 #, fuzzy
 msgid "Pick nation"
 msgstr "÷¦ÄÄ¦Ì Í¦Ì¦Ã¦§"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 #, fuzzy
 msgid "Take this player"
 msgstr "í¦ÓÔÁ"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 #, fuzzy
 msgid "Cut connection"
 msgstr "÷ÉÄÁÌÑÀ Ú'¤ÄÎÁÎÎÑ %s."
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 #, fuzzy
 msgid "Aitoggle player"
 msgstr "aitoggle <ÇÒÁ×ÅÃØ>"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 #, fuzzy
 msgid "Remove player"
 msgstr "÷ÉÄÁÌÑÀ ÇÒÁ×ÃÑ %s."
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr ""
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, fuzzy, c-format
 msgid "Put on %s"
 msgstr "îÁÓÅÌÅÎÎÑ: %s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "ë¦ÌØ˦ÓÔØ ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×æ×."
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 msgid "AI Skill _Level:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "ðÒÅÄÕÓÔÁÎÏ×ËÉ:"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 #, fuzzy
 msgid "_More Game Options..."
 msgstr "ïÐæ§ ÐÏצÄÏÍÌÅÎØ..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 #, fuzzy
 msgid "Record"
 msgstr "úצÔ"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 #, fuzzy
 msgid "Rating"
 msgstr "ïÞÉËÕ×ÁÎÎÑ"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 #, fuzzy
 msgid "Ready"
 msgstr "çÏÔÏ×ΦÓÔØ ÕÓ¦È"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "çÏÌÏ×Á"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr ""
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 #, fuzzy
 msgid "Choose a Scenario"
 msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÓÃÅÎÁÒ¦Ê"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 #, fuzzy
 msgid "Choose a _Scenario:"
 msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÓÃÅÎÁÒ¦Ê"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "ôÉÐ"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 #, fuzzy
 msgid "Choose a _nation to play:"
 msgstr "ïÂÅÒ¦ÔØ Ä¦ÑÌØΦÓÔØ Ð¦ÄÒÏÚĦÌÕ"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 #, fuzzy
 msgid "Select Location to Save"
 msgstr "ïÂÅÒ¦ÔØ ÎÁæÀ ÔÁ ¦Í`Ñ"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 #, fuzzy
 msgid "Saved _Games:"
 msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 #, fuzzy
 msgid "Save _Filename:"
 msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
@@ -12440,7 +12514,7 @@ msgstr "
 msgid "Count"
 msgstr "ë¦ÌØ˦ÓÔØ"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12687,28 +12761,28 @@ msgstr "
 msgid "Edit Global _Worklists"
 msgstr "äÏÄÁÔÉ ÇÌÏÂÁÌØÎÉÊ ÐÌÁÎ ÂÕĦ×ÎÉÃÔ×Á"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "èÏĦ×"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "äÖÅÒÅÌÏ úÁ×ÄÁÎØ:"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "ðÏËÁÚÕ×ÁÔÉ ÍÁÊÂÕÔΦ æ̦"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "ðÌÁÎ ÂÕĦ×ÎÉÃÔ×Á:"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "äÏÄÁÔÉ ÇÌÏÂÁÌØÎÉÊ ÐÌÁÎ ÂÕĦ×ÎÉÃÔ×Á"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 #, fuzzy
 msgid "Chan_ge Production"
 msgstr "úͦÎÉÔÉ ÂÕĦ×ÎÉÃÔ×Ï"
@@ -13014,8 +13088,8 @@ msgid "City shrinks: %d %s"
 msgstr "í¦ÓÔÏ: %s(%s)"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -13132,12 +13206,12 @@ msgstr "
 msgid "Maintenance Report"
 msgstr "îÁÕËÏ×ÉÊ ÚצÔ"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 #, fuzzy
 msgid "worklist"
 msgstr "(ÐÌÁÎ ÂÕĦ×ÎÉÃÔ×Á)"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13577,21 +13651,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -14906,7 +14980,7 @@ msgstr "
 msgid "Unit Selection"
 msgstr "÷ÉÂ¦Ò Ð¦ÄÒÏÚĦÌÕ"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "î¦ÞÏÇÏ"
 
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 0e64074..732e7c1 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index eb9628c..ceb5067 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: freeciv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-16 17:07+0900\n"
+"POT-Creation-Date: 2008-12-01 07:45+0900\n"
 "PO-Revision-Date: 2006-03-26 14:53+0800\n"
 "Last-Translator: Hongjia Cao <hjcao at yahoo.com>\n"
 "Language-Team: zh_CN <i18n-translation at linux.net.cn>\n"
@@ -50,22 +50,22 @@ msgstr "
 msgid "Science"
 msgstr "¿ÆÑÐ"
 
+#: common/city.c:350
+msgid "?built:B"
+msgstr "³É"
+
 #: common/city.c:352
+msgid "?wonder:w"
+msgstr "Ææ"
+
+#: common/city.c:359
 msgid "?obsolete:O"
 msgstr "ÌÔ"
 
-#: common/city.c:355
+#: common/city.c:362
 msgid "?redundant:*"
 msgstr "Èß"
 
-#: common/city.c:360
-msgid "?built:B"
-msgstr "³É"
-
-#: common/city.c:362
-msgid "?wonder:w"
-msgstr "Ææ"
-
 #: common/connection.c:515
 #, c-format
 msgid "%s from %s"
@@ -500,81 +500,81 @@ msgstr "
 msgid "AI Debug messages"
 msgstr ""
 
-#: common/player.c:727
+#: common/player.c:732
 msgid "?attitude:Genocidal"
 msgstr "ÖÖ×åÃð¾ø"
 
-#: common/player.c:729
+#: common/player.c:734
 msgid "?attitude:Belligerent"
 msgstr "½»Õ½ÖÐ"
 
-#: common/player.c:731
+#: common/player.c:736
 msgid "?attitude:Hostile"
 msgstr "µÐ¶Ô"
 
-#: common/player.c:733
+#: common/player.c:738
 msgid "?attitude:Uncooperative"
 msgstr "²»ºÏ×÷"
 
-#: common/player.c:735
+#: common/player.c:740
 msgid "?attitude:Uneasy"
 msgstr "²»°²"
 
-#: common/player.c:737
+#: common/player.c:742
 msgid "?attitude:Neutral"
 msgstr "ÖÐÁ¢"
 
-#: common/player.c:739
+#: common/player.c:744
 msgid "?attitude:Respectful"
 msgstr "Ç«¹§µÄ"
 
-#: common/player.c:741
+#: common/player.c:746
 msgid "?attitude:Helpful"
 msgstr "ÓÐÒæµÄ"
 
-#: common/player.c:743
+#: common/player.c:748
 msgid "?attitude:Enthusiastic"
 msgstr "¿ñÈȵÄ"
 
-#: common/player.c:745
+#: common/player.c:750
 msgid "?attitude:Admiring"
 msgstr "ÇÕÅåµÄ"
 
-#: common/player.c:748
+#: common/player.c:753
 msgid "?attitude:Worshipful"
 msgstr "³ç°ÝµÄ"
 
-#: common/player.c:759
+#: common/player.c:764
 msgid "?diplomatic_state:Armistice"
 msgstr "Í£»ð"
 
-#: common/player.c:760
+#: common/player.c:765
 msgid "?diplomatic_state:War"
 msgstr "Õ½Õù"
 
-#: common/player.c:761 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
 #: client/gui-sdl/diplodlg.c:462 client/gui-win32/diplodlg.c:307
 #: client/gui-xaw/diplodlg.c:524
 msgid "?diplomatic_state:Cease-fire"
 msgstr "Í£»ð"
 
-#: common/player.c:762 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
 #: client/gui-sdl/diplodlg.c:476 client/gui-win32/diplodlg.c:308
 #: client/gui-xaw/diplodlg.c:528
 msgid "?diplomatic_state:Peace"
 msgstr "ºÍƽ"
 
-#: common/player.c:763 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
 #: client/gui-sdl/diplodlg.c:491 client/gui-win32/diplodlg.c:309
 #: client/gui-xaw/diplodlg.c:532
 msgid "?diplomatic_state:Alliance"
 msgstr "ͬÃË"
 
-#: common/player.c:764
+#: common/player.c:769
 msgid "?diplomatic_state:Never met"
 msgstr "δÓö"
 
-#: common/player.c:765
+#: common/player.c:770
 msgid "?diplomatic_state:Team"
 msgstr "ÍŶÓ"
 
@@ -620,13 +620,13 @@ msgstr "%s 
 msgid "Size %d"
 msgstr "¹æÄ£ %d"
 
-#: common/tech.c:707 client/gui-gtk-2.0/repodlgs.c:498
+#: common/tech.c:715 client/gui-gtk-2.0/repodlgs.c:498
 #, c-format
 msgid "Future Tech. %d"
 msgstr "δÀ´¼¼Êõ %d"
 
 #. TRANS: "None" tech
-#: common/tech.c:782 common/tech.c:786 server/settings.c:41
+#: common/tech.c:790 common/tech.c:794 server/settings.c:41
 #: client/gui-gtk-2.0/helpdlg.c:110 client/gui-sdl/citydlg.c:722
 #: client/gui-sdl/gui_tilespec.c:482 client/gui-sdl/helpdlg.c:371
 #: client/gui-sdl/helpdlg.c:403 client/gui-sdl/helpdlg.c:792
@@ -638,65 +638,65 @@ msgstr "δ
 msgid "None"
 msgstr "ÎÞ"
 
-#: common/tech.c:790
+#: common/tech.c:798
 msgid "Future Tech."
 msgstr "δÀ´¼¼Êõ"
 
 #. TRANS: "Unknown" advance/technology
-#: common/tech.c:795 client/gui-gtk-2.0/inteldlg.c:386
+#: common/tech.c:803 client/gui-gtk-2.0/inteldlg.c:386
 msgid "(Unknown)"
 msgstr "£¨Î´Öª£©"
 
-#: common/terrain.c:387 common/terrain.c:568 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
 #: manual/civmanual.c:224
 msgid "Road"
 msgstr "¹«Â·"
 
-#: common/terrain.c:388 common/terrain.c:575 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
 #: client/gui-gtk-2.0/menu.c:798 client/gui-sdl/optiondlg.c:1906
 #: client/gui-win32/menu.c:344 client/gui-xaw/menu.c:151
 #: manual/civmanual.c:224
 msgid "Irrigation"
 msgstr "Ë®Àû"
 
-#: common/terrain.c:389 common/terrain.c:566 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
 #: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
 #: data/civ1/techs.ruleset:563
 msgid "Railroad"
 msgstr "Ìú·"
 
-#: common/terrain.c:390 common/terrain.c:579 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
 msgid "Mine"
 msgstr "¿ó¾®"
 
-#: common/terrain.c:391 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:548 server/report.c:124
 #: client/cityrepdata.c:521 client/gui-sdl/optiondlg.c:1773
 msgid "Pollution"
 msgstr "ÎÛȾ"
 
-#: common/terrain.c:392
+#: common/terrain.c:397
 msgid "Hut"
 msgstr "éÎÝ"
 
-#: common/terrain.c:393 common/terrain.c:583 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
 #: manual/civmanual.c:226
 msgid "Fortress"
 msgstr "ÒªÈû"
 
-#: common/terrain.c:394
+#: common/terrain.c:399
 msgid "River"
 msgstr "ºÓÁ÷"
 
-#: common/terrain.c:395 common/terrain.c:573
+#: common/terrain.c:400 common/terrain.c:579
 msgid "Farmland"
 msgstr "Å©³¡"
 
-#: common/terrain.c:396 common/terrain.c:587 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
 #: manual/civmanual.c:226
 msgid "Airbase"
 msgstr "¿Õ¾ü»ùµØ"
 
-#: common/terrain.c:397 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:576
 msgid "Fallout"
 msgstr "·øÉä"
 
@@ -806,11 +806,11 @@ msgstr "
 
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: common/unittype.c:349 client/helpdata.c:1402
+#: common/unittype.c:349 client/helpdata.c:1406
 msgid " and "
 msgstr "£¬"
 
-#: common/unittype.c:355 client/helpdata.c:1388
+#: common/unittype.c:355 client/helpdata.c:1392
 msgid "?and:, "
 msgstr "£¬"
 
@@ -964,79 +964,79 @@ msgid " (total %d repeat)"
 msgid_plural " (total %d repeats)"
 msgstr[0] " £¨¹²Öظ´ %d ´Î£©"
 
-#: utility/shared.c:176
+#: utility/shared.c:177
 #, c-format
 msgid "Empty argument for \"%s\".\n"
 msgstr "¡°%s¡±²ÎÊýΪ¿Õ¡£\n"
 
-#: utility/shared.c:180
+#: utility/shared.c:181
 #, c-format
 msgid "Missing argument for \"%s\".\n"
 msgstr "ȱÉÙ²ÎÊý¡°%s¡±¡£\n"
 
-#: utility/shared.c:500
+#: utility/shared.c:501
 #, c-format
 msgid "%d BC"
 msgstr "¹«ÔªÇ° %d"
 
-#: utility/shared.c:502
+#: utility/shared.c:503
 #, c-format
 msgid "%d AD"
 msgstr "¹«Ôª %d"
 
-#: utility/shared.c:899
+#: utility/shared.c:924
 msgid "FREECIV_PATH is set but empty; using default path instead."
 msgstr "FREECIV_PATH ÒÑÉèÖõ«Îª¿Õ£»ÒÔĬÈÏ·¾¶´úÌæ¡£"
 
-#: utility/shared.c:1003
+#: utility/shared.c:1028
 #, c-format
 msgid "Could not read data directory %s: %s."
 msgstr "ÎÞ·¨¶ÁÈ¡Êý¾ÝĿ¼ %s£º%s¡£"
 
-#: utility/shared.c:1254
+#: utility/shared.c:1279
 msgid "The data path may be set via the environment variable FREECIV_PATH."
 msgstr "¿ÉÒÔͨ¹ý»·¾³±äÁ¿ FREECIV_PATH À´ÉèÖÃÊý¾Ý·¾¶¡£"
 
-#: utility/shared.c:1256
+#: utility/shared.c:1281
 #, c-format
 msgid "Current data path is: \"%s\""
 msgstr "µ±Ç°Êý¾Ý·¾¶Îª£º¡°%s¡±"
 
-#: utility/shared.c:1258
+#: utility/shared.c:1283
 #, c-format
 msgid "The \"%s\" file is required ... aborting!"
 msgstr "Îļþ¡°%s¡±ÊDZØÐèµÄ ¡­¡­ ÖÐÖ¹£¡"
 
-#: utility/shared.c:1435
+#: utility/shared.c:1460
 #, c-format
 msgid "%s: Fatal error: you're trying to run me as superuser!\n"
 msgstr "%s£ºÖÂÃü´íÎó£ºÄúÊÔͼÒÔ³¬¼¶Óû§È¨ÏÞÔËÐÐÓÎÏ·£¡\n"
 
-#: utility/shared.c:1437
+#: utility/shared.c:1462
 msgid "Use a non-privileged account instead.\n"
 msgstr "ÇëÓ÷ÇÌØȨÓû§¡£\n"
 
-#: utility/shared.c:1453
+#: utility/shared.c:1478
 msgid "exact match"
 msgstr "¾«È·Æ¥Åä"
 
-#: utility/shared.c:1454
+#: utility/shared.c:1479
 msgid "only match"
 msgstr "ΨһµÄÆ¥Åä"
 
-#: utility/shared.c:1455
+#: utility/shared.c:1480
 msgid "ambiguous"
 msgstr "Ä£ºý"
 
-#: utility/shared.c:1456
+#: utility/shared.c:1481
 msgid "empty"
 msgstr "¿Õ"
 
-#: utility/shared.c:1457
+#: utility/shared.c:1482
 msgid "too long"
 msgstr "Ì«³¤"
 
-#: utility/shared.c:1458
+#: utility/shared.c:1483
 msgid "non-match"
 msgstr "ÎÞÆ¥Åä"
 
@@ -1065,108 +1065,108 @@ msgstr " %1$s 
 msgid "%s is selling %s (not needed) for %d."
 msgstr " %1$sÕýÔÚÒÔ %3$d ³öÊÛ %2$s £¨²»ÐèÒªµÄ£©¡£"
 
-#: ai/advdiplomacy.c:279
+#: ai/advdiplomacy.c:280
 #, c-format
 msgid "*%s (AI)* In away mode AI can't sign such a treaty."
 msgstr "*%s (AI)* ÔÚÀ뿪ģʽÏ AI ²»ÄÜÇ©¶©ÕâÑùµÄÌõÔ¼¡£"
 
-#: ai/advdiplomacy.c:289
+#: ai/advdiplomacy.c:290
 #, c-format
 msgid "*%s (AI)* First break alliance with %s, %s."
 msgstr "*%s (AI)* ÇëÊ×ÏÈÓë %s ½â³ýͬÃË£¬%s¡£"
 
-#: ai/advdiplomacy.c:302
+#: ai/advdiplomacy.c:303
 #, c-format
 msgid "*%s (AI)* Let us first cease hostilies, %s."
 msgstr "*%s (AI)* Ê×ÏÈÈÃÎÒÃÇÍ£Ö¹µÐ¶Ô״̬°É£¬%s¡£"
 
-#: ai/advdiplomacy.c:307
+#: ai/advdiplomacy.c:308
 #, c-format
 msgid ""
 "*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
 "first, %s."
 msgstr "*%s (AI)* ÎÒÏëÏÈ¿´µ½ÄãÄܱ£³Öµ±Ç°µÄÍ£»ð״̬¸ü¾ÃµÄʱ¼ä£¬%s¡£"
 
-#: ai/advdiplomacy.c:330
+#: ai/advdiplomacy.c:331
 #, c-format
 msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
 msgstr "*%s (AI)* ÎÒ»¹²»ÄÜÐÅÈÎÓëÄã½áÃË£¬%s¡£"
 
-#: ai/advdiplomacy.c:423
+#: ai/advdiplomacy.c:424
 #, c-format
 msgid "*%s (AI)* I do not know the city you mention."
 msgstr "*%s (AI)* ÎÒ²»ÖªµÀÄã˵µÄÄǸö³ÇÊС£"
 
-#: ai/advdiplomacy.c:453
+#: ai/advdiplomacy.c:454
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
 msgstr "* %s (AI)* ¶Ô²»Æ𣬺ÍÄã¹²ÏíÊÓÒ°²»°²È«¡£"
 
-#: ai/advdiplomacy.c:559
+#: ai/advdiplomacy.c:560
 #, c-format
 msgid "*%s (AI)* This deal was not very good for us, %s!"
 msgstr "*%s (AI)* Õâ×Ú½»Ò׶ÔÎÒÃÇûÓкô¦£¬%s£¡"
 
-#: ai/advdiplomacy.c:581
+#: ai/advdiplomacy.c:582
 #, c-format
 msgid "*%s (AI)* Welcome into our alliance %s!"
 msgstr "*%s (AI)* »¶Ó­¼ÓÈëÎÒÃǵÄͬÃË£¬%s£¡"
 
-#: ai/advdiplomacy.c:585
+#: ai/advdiplomacy.c:586
 #, c-format
 msgid "*%s (AI)* Yes, may we forever stand united, %s."
 msgstr "*%s (AI)* Êǵģ¬ÈÃÎÒÃÇÓÀԶ͎áÔÚÒ»Æð£¬%s"
 
-#: ai/advdiplomacy.c:592
+#: ai/advdiplomacy.c:593
 #, c-format
 msgid "*%s (AI)* Yes, peace in our time!"
 msgstr "*%s (AI)* Êǵģ¬ÎÒÃǺÍƽÏà´¦£¡"
 
-#: ai/advdiplomacy.c:597
+#: ai/advdiplomacy.c:598
 #, c-format
 msgid "*%s (AI)* Agreed. No more hostilities, %s."
 msgstr "*%s (AI)* ͬÒâ¡£²»Ôٵжԣ¬%s"
 
-#: ai/advdiplomacy.c:812
+#: ai/advdiplomacy.c:813
 #, c-format
 msgid ""
 "*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
 "other better?"
 msgstr "*%s (AI)* ÄúºÃ %s£¡ÈÃÎÒÃÇÍ£»ð£¬ÒÔÔö¼Ó»¥ÏàÁ˽âºÃÂð£¿"
 
-#: ai/advdiplomacy.c:1092
+#: ai/advdiplomacy.c:1097
 #, c-format
 msgid "*%s (AI)* Space will never be yours. "
 msgstr "*%s (AI)* ÄãÓÀÔ¶¶¼µÃ²»µ½Ì«¿Õ¡£ "
 
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1102
 #, c-format
 msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
 msgstr "*%s (AI)* ÎÒÒѾ­ÈÌÊÜÄãа¶ñµÄÐÐΪºÜ¾ÃÁË£¡Õ½Õù£¡"
 
-#: ai/advdiplomacy.c:1103
+#: ai/advdiplomacy.c:1108
 #, c-format
 msgid "*%s (AI)* Peace in ... some other time."
 msgstr "*%s (AI)* ºÍƽ¡­¡­ÔÙ˵°É"
 
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1113
 #, c-format
 msgid ""
 "*%s (AI)* Finally I get around to you! Did you really think you could get "
 "away with your crimes?"
 msgstr "*%s (AI)* ÖÕÓÚÂäµ½ÎÒÊÖÉÏÁË£¡ÄãÕæÒÔΪÄãÄÜÌÓÍÑÄãµÄ×ïÐÐÂð£¿"
 
-#: ai/advdiplomacy.c:1114
+#: ai/advdiplomacy.c:1119
 #, c-format
 msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
 msgstr "*%s (AI)* Äã͵͵ÃþÃþµÄµÄµÐ¶ÔÐÐΪÒýÀ´ÁËÕⳡսÕù£¡"
 
-#: ai/advdiplomacy.c:1121
+#: ai/advdiplomacy.c:1126
 #, c-format
 msgid "*%s (AI)* Your aggression against %s was your last mistake!"
 msgstr "*%s (AI)*  ¶Ô %s µÄ¹¥»÷ÊÇÄã×îºóÒ»´Î´íÎó£¡"
 
-#: ai/advdiplomacy.c:1204
+#: ai/advdiplomacy.c:1209
 #, c-format
 msgid ""
 "*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1176,14 +1176,14 @@ msgid_plural ""
 "the spaceship launch."
 msgstr[0] ""
 
-#: ai/advdiplomacy.c:1214
+#: ai/advdiplomacy.c:1219
 #, c-format
 msgid ""
 "*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
 "alliance!"
 msgstr "*%s (AI)* ÔÚÕâ¼þÊÂÇéÉÏÎÒÃÇÆÚÍûµÃµ½ÄãµÄ°ïÖú¡£ÎÒÃǹâÈÙµÄͬÃËÍòË꣡"
 
-#: ai/advdiplomacy.c:1220
+#: ai/advdiplomacy.c:1225
 #, c-format
 msgid ""
 "*%s (AI)* %s has grossly violated his treaties with us for own gain.  We "
@@ -1195,7 +1195,7 @@ msgid_plural ""
 "us and do likewise!"
 msgstr[0] ""
 
-#: ai/advdiplomacy.c:1233
+#: ai/advdiplomacy.c:1238
 #, c-format
 msgid ""
 "*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1205,13 +1205,13 @@ msgid_plural ""
 "declare war in %d turns."
 msgstr[0] "*%s (AI)* ÎÒÃÇÏëÂӶḻÓÐµÄ %s ÎÄÃ÷¡£ÎÒÃǽ«ÔÚ %d »ØºÏÄÚÐûÕ½¡£"
 
-#: ai/advdiplomacy.c:1241
+#: ai/advdiplomacy.c:1246
 #, c-format
 msgid ""
 "*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
 msgstr "*%s (AI)* Èç¹ûÄãÏë·ÖµãÕ½ÀûÆ·£¬ÄǾͲμÓÐж¯°É£¡"
 
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1251
 #, c-format
 msgid ""
 "*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1221,12 +1221,12 @@ msgid_plural ""
 "apart. We declare war in %d turns."
 msgstr[0] ""
 
-#: ai/advdiplomacy.c:1256
+#: ai/advdiplomacy.c:1261
 #, c-format
 msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
 msgstr "*%s (AI)* ×÷ΪΪÎÒÃǹâÈÙµÄÃËÓÑ£¬ÎÒÃÇÏ£ÍûÄúÄÜÔÚÕâ´ÎÕ½ÕùÖаïæ¡£"
 
-#: ai/advdiplomacy.c:1262
+#: ai/advdiplomacy.c:1267
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance and declare war on %s in %d turn.  "
@@ -1238,7 +1238,7 @@ msgstr[0] ""
 "*%1$s (AI)* ÎÒÃǽ«¶ÒÏÖͬÃ˵ijÐŵ£¬ÔÚ %3$d »ØºÏÄÚÏò %2$s ÐûÕ½¡£¼á³Öס£­£­ÎÒÃÇ"
 "À´ÁË£¡"
 
-#: ai/advdiplomacy.c:1271
+#: ai/advdiplomacy.c:1276
 #, c-format
 msgid ""
 "*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1250,40 +1250,40 @@ msgstr[0] ""
 "*%1$s (AI)* ÎÒÃǽ«¶ÒÏÖÓë %2$s ͬÃ˵ijÐŵ²¢ÔÚ %4$d »ØºÏÄÚÏò %3$s ÐûÕ½¡£ÎÒÃÇÏ£"
 "ÍûÄúÒ²ÕâÑù×ö¡£"
 
-#: ai/advdiplomacy.c:1339
+#: ai/advdiplomacy.c:1344
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
 "intentions, and I will have no more of our alliance!"
 msgstr "*%s (AI)* ÄãÏëÒ»¸öÈËÕ÷·þÌ«¿ÕµÄ³¢ÊÔ±©Â¶ÁËÄãµÄÕæʵÒâͼ£¬ÎÒ²»ÔÙºÍÄã½áÃË£¡"
 
-#: ai/advdiplomacy.c:1354
+#: ai/advdiplomacy.c:1359
 #, c-format
 msgid ""
 "*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
 "offensive."
 msgstr "*%s (AI)* ÄãÏëµ¥±ßµØͳÖÎÎÒÃÇÍⲿ̫¿ÕµÄÐÐΪ¾ßÓкܴóµÄð·¸ÐÔ¡£"
 
-#: ai/advdiplomacy.c:1357
+#: ai/advdiplomacy.c:1362
 #, c-format
 msgid ""
 "*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
 "take action!"
 msgstr "*%s (AI)* Èç¹ûÄ㲻ֹͣ½¨ÔìÌ«¿Õ·É´¬£¬ÎÒ½«±»ÆȲÉÈ¡Ðж¯£¡"
 
-#: ai/advdiplomacy.c:1469
+#: ai/advdiplomacy.c:1474
 #, c-format
 msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
 msgstr "* %s (AI)* ¶Ô²»Æ𣬺ÍÄã¹²ÏíÊÓÒ°²»ÔÙ°²È«¡£"
 
-#: ai/advdiplomacy.c:1544
+#: ai/advdiplomacy.c:1549
 #, c-format
 msgid ""
 "*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
 "our enemy, %s."
 msgstr "*%s (AI)* ÄúºÃ£¬ÎÒÃÇ×îÖµµÃÐÅÈεÄÃËÓÑ£¬ÎÒÃÇÑûÇëÄúÈ¥ÏûÃðÎÒÃǵĵÐÈË£¬%s¡£"
 
-#: ai/advdiplomacy.c:1550
+#: ai/advdiplomacy.c:1555
 #, c-format
 msgid ""
 "*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1292,7 +1292,7 @@ msgstr ""
 "*%s (AI)* ÄúºÃ£¬ÃËÓÑ£¬ÎÒ·¢ÏÖÄú»¹Ã»ÓÐͬÎÒÃǵĵÐÈË %s ÐûÕ½¡£ÎªÊ²Ã´·ÇÒªÎÒÌáÐÑÄú"
 "ËùÐíϵijÐŵÄØ£¿"
 
-#: ai/advdiplomacy.c:1557
+#: ai/advdiplomacy.c:1562
 #, c-format
 msgid ""
 "*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1302,26 +1302,26 @@ msgstr ""
 "*%s (AI)* Î޳ܵļһÎÒÃǶ©Á¢ÁËͬÃËЭ¶¨£¬µ«ÊÇÄ㻹ͬÎÒÃǵÄËÀµÐ %s ±£³ÖºÍƽ£¡"
 "ÕâÊDz»ÄÜÈÝÈ̵ģ¬ÎÒÃǵÄͬÃ˽áÊøÁË£¡"
 
-#: ai/advdiplomacy.c:1587
+#: ai/advdiplomacy.c:1592
 #, c-format
 msgid ""
 "*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
 "an alliance?"
 msgstr "*%s (AI)* ÄúºÃ£¬ÅóÓÑ£¬ÎÒÃǶ©Á¢Ð­¶¨²¢½áÃ˺ÃÂð£¿"
 
-#: ai/advdiplomacy.c:1602
+#: ai/advdiplomacy.c:1607
 #, c-format
 msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
 msgstr "*%s (AI)* ÄúºÃ£¬ÁÚ¾Ó£¬ÎÒÃÇ¿ÉÒÔ½¨Á¢¸ü¼ÓºÍƽµÄ¹ØϵÂð£¿"
 
-#: ai/advdiplomacy.c:1617
+#: ai/advdiplomacy.c:1622
 #, fuzzy, c-format
 msgid ""
 "*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
 "cessation of hostilities?"
 msgstr "*%s (AI)* ÎÒÃÇÑá¾ëÁËÕâÖÖʱ³£µÄÁ÷Ѫ¡£ÎÒÃÇ¿ÉÒÔÖÕÖ¹µÐ¶ÔÐÐΪÂð£¿"
 
-#: ai/advdiplomacy.c:1737
+#: ai/advdiplomacy.c:1742
 #, c-format
 msgid ""
 "*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1331,133 +1331,138 @@ msgstr ""
 "°É£¬ÄúµÄÃû×Ö½«»á±»ÓÀÊÀ²»Íü£¡"
 
 #. TRANS: Further information about option will follow.
-#: server/auth.c:168
+#: server/auth.c:170
 #, fuzzy, c-format
 msgid "Auth option \"%s\":"
 msgstr "ËùÓÐÑ¡Ïî"
 
 #. TRANS: After 'Auth option "user":'. Option value
 #. may have been inserted between these.
-#: server/auth.c:181
+#: server/auth.c:183
 msgid " missing from config file (using default)"
 msgstr ""
 
 #. TRANS: auth option originates from internal default
-#: server/auth.c:184
+#: server/auth.c:186
 msgid " (default)"
 msgstr ""
 
 #. TRANS: auth option originates from config file
-#: server/auth.c:189
+#: server/auth.c:191
 msgid " (config)"
 msgstr ""
 
 #. TRANS: auth option has been set from prompt
-#: server/auth.c:193
+#: server/auth.c:195
 #, fuzzy
 msgid " (set)"
 msgstr " (Àϱø)"
 
-#: server/auth.c:266
+#: server/auth.c:234
+#, c-format
+msgid "Illegal value for auth port: \"%s\""
+msgstr ""
+
+#: server/auth.c:281
 #, fuzzy, c-format
 msgid "Auth config filename \"%s\" not allowed!"
 msgstr "²»ÄÜʹÓøÃÃû×Ö¡£"
 
-#: server/auth.c:271
+#: server/auth.c:286
 #, fuzzy, c-format
 msgid "Cannot load auth config file \"%s\"!"
 msgstr "ÎÞ·¨ÕÒµ½ÒôЧÎļþ %s"
 
-#: server/auth.c:377
+#: server/auth.c:397
 #, c-format
 msgid "Warning: the guest name '%s' has been taken, renaming to user '%s'."
 msgstr "¾¯¸æ£º ¿ÍÈËÃû×Ö¡°%s¡±Òѱ»Ê¹Ó㬸üÃûΪ¡°%s¡±¡£"
 
-#: server/auth.c:384
+#: server/auth.c:404
 msgid "Guests are not allowed on this server. Sorry."
 msgstr "±§Ç¸£¬´Ë·þÎñÆ÷²»ÔÊÐí·Ã¿Í¡£"
 
-#: server/auth.c:386
+#: server/auth.c:406
 #, fuzzy, c-format
 msgid "%s was rejected: Guests not allowed."
 msgstr "%s ±»¾Ü¾ø£ºÖظ´µÄµÇ¼Ãû [%s]¡£"
 
-#: server/auth.c:405
+#: server/auth.c:425
 #, c-format
 msgid ""
 "There was an error reading the user database, logging in as guest connection "
 "'%s'."
 msgstr "¶ÁÈ¡Óû§Êý¾Ý¿â·¢Éú´íÎ󣬽«×÷Ϊ¿ÍÈËÁ¬½Ó¡°%s¡±µÇ¼¡£"
 
-#: server/auth.c:411
+#: server/auth.c:431
 msgid ""
 "There was an error reading the user database and guest logins are not "
 "allowed. Sorry"
 msgstr "¶ÁÈ¡Óû§Êý¾Ý¿â·¢Éú´íÎó²¢ÇÒ²»ÔÊÐí¿ÍÈ˵Ǽ¡£±§Ç¸"
 
-#: server/auth.c:414
+#: server/auth.c:434
 #, c-format
 msgid "%s was rejected: Database error and guests not allowed."
 msgstr ""
 
-#: server/auth.c:421
+#: server/auth.c:441
 #, c-format
 msgid "Enter password for %s:"
 msgstr "ÇëÊäÈë %s µÄ¿ÚÁ"
 
-#: server/auth.c:430
+#: server/auth.c:450
 msgid "Enter a new password (and remember it)."
 msgstr "ÇëÊäÈëпÚÁ²¢¼ÇסËü£©¡£"
 
-#: server/auth.c:436
+#: server/auth.c:456
 msgid "This server allows only preregistered users. Sorry."
 msgstr "´Ë·þÎñÆ÷Ö»ÔÊÐíÔ¤ÏÈ×¢²áµÄÓû§¡£±§Ç¸¡£"
 
-#: server/auth.c:439
+#: server/auth.c:459
 #, fuzzy, c-format
 msgid "%s was rejected: Only preregister users allowed."
 msgstr "´Ë·þÎñÆ÷Ö»ÔÊÐíÔ¤ÏÈ×¢²áµÄÓû§¡£±§Ç¸¡£"
 
-#: server/auth.c:468 server/auth.c:527
+#: server/auth.c:488 server/auth.c:547
 msgid "Sorry, too many wrong tries..."
 msgstr "±§Ç¸£¬Ì«¶à´íÎó³¢ÊÔÁË¡­¡­"
 
-#: server/auth.c:469
+#: server/auth.c:489
 #, c-format
 msgid "%s was rejected: Too many wrong password verifies for new user."
 msgstr ""
 
-#: server/auth.c:485
+#: server/auth.c:505
 msgid ""
 "Warning: There was an error in saving to the database. Continuing, but your "
 "stats will not be saved."
 msgstr ""
 "¾¯¸æ£º ±£´æµ½Êý¾Ý¿â¹ý³ÌÖз¢Éú´íÎó¡£¼ÌÐøÖУ¬µ«ÊÇÄúµÄͳ¼ÆÐÅÏ¢½«²»»á±»±£´æ¡£"
 
-#: server/auth.c:529
+#: server/auth.c:549
 #, fuzzy, c-format
 msgid "%s was rejected: Too many wrong password tries."
 msgstr "%s ±»¾Ü¾ø£º²»Æ¥ÅäµÄ¹¦ÄÜ¡£"
 
-#: server/auth.c:538
+#: server/auth.c:558
 msgid "Your password is incorrect. Try again."
 msgstr "ÄúµÄ¿ÚÁî²»ÕýÈ·¡£ÇëÔÙÊÔÒ»´Î¡£"
 
-#: server/auth.c:549
+#: server/auth.c:569
 msgid "Sorry, your connection timed out..."
 msgstr ""
 
-#: server/auth.c:551
+#: server/auth.c:571
 #, c-format
 msgid "%s was rejected: Connection timeout waiting for password."
 msgstr ""
 
-#: server/auth.c:616
+#: server/auth.c:636
 #, c-format
 msgid "Your password is too short, the minimum length is %d. Try again."
 msgstr "ÄúµÄ¿ÚÁîÌ«¶Ì£¬×îС³¤¶ÈÊÇ %d ¡£ÇëÔÙÊÔÒ»´Î¡£"
 
-#: server/auth.c:622
+#: server/auth.c:642
 #, c-format
 msgid ""
 "The password must have at least %d capital letters, %d numbers, and be at "
@@ -2200,16 +2205,14 @@ msgid "Cast a vote."
 msgstr "½øÐÐͶƱ"
 
 #: server/commands.c:111
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "A player with info level access issuing a control level command starts a new "
 "vote for the command.  The /vote command followed by \"yes\" or \"no\", and "
 "optionally a vote number, gives your vote.  If you do not add a vote number, "
 "your vote applies to the latest command.  You can only suggest one vote at a "
 "time.  The vote will pass immediately if more than half of the players vote "
-"for it, or fail immediately if at least half of the players vote against "
-"it.  If one full turn elapses the vote may pass in any case if nobody votes "
-"against it."
+"for it, or fail immediately if at least half of the players vote against it."
 msgstr ""
 "¾ßÓÐinfo·ÃÎʼ¶±ðµÄÍæ¼Ò·¢³öÒ»¸ö¿ØÖƼ¶±ðµÄÃüÁîʱ½«Æô¶¯Ò»¸ö¹ØÓÚËù·¢³öÃüÁîµÄÐÂͶ"
 "Ʊ¡£ºó¸ú¡°yes¡±»ò¡°no¡±£¬ÒÔ¼°¿ÉÑ¡µÄͶƱ±àÂëµÄ¡°/vote¡±ÃüÁͶ³öÄúµÄƱ¡£Èç¹û"
@@ -2217,7 +2220,7 @@ msgstr ""
 "°ëÊýÍæ¼ÒÖ§³Ö£¬Í¶Æ±½«Á¢¼´Í¨¹ý£¬Èç¹û³¬¹ý°ëÊýÍæ¼Ò·´¶Ô£¬Í¶Æ±½«Á¢¼´±»·ñ¾ö¡£Èç¹ûÔÚ"
 "Ò»¸öÍêÕûµÄ»ØºÏºóûÓÐÈκÎÈËͶƱ·´¶ÔÄÇôͶƱ½«»áͨ¹ý¡£"
 
-#: server/commands.c:122
+#: server/commands.c:121
 msgid ""
 "debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
 "<player> | timing | info]"
@@ -2225,33 +2228,33 @@ msgstr ""
 "debug [player <Íæ¼Ò> | city <x> <y> | units <x> <y> | unit <id> | tech <Íæ¼Ò"
 "> | timing | info]"
 
-#: server/commands.c:124
+#: server/commands.c:123
 msgid "Turn on or off AI debugging of given entity."
 msgstr "´ò¿ª»ò¹Ø±ÕÒ»¸ö¸ø¶¨ÊµÌåµÄ AI µ÷ÊÔ¡£"
 
-#: server/commands.c:125
+#: server/commands.c:124
 msgid ""
 "Print AI debug information about given entity and turn continous debugging "
 "output for this entity on or off."
 msgstr "´òÓ¡¸ø¶¨ÊµÌåµÄAIµ÷ÊÔÐÅÏ¢²¢´ò¿ª»ò¹Ø±Õ´ËʵÌåµÄÁ¬Ðøµ÷ÊÔÊä³ö¡£"
 
-#: server/commands.c:129
+#: server/commands.c:128
 msgid "set <option-name> <value>"
 msgstr "set <Ñ¡ÏîÃû> <Öµ>"
 
-#: server/commands.c:130
+#: server/commands.c:129
 msgid "Set server option."
 msgstr "É趨·þÎñÆ÷Ñ¡Ïî¡£"
 
-#: server/commands.c:133
+#: server/commands.c:132
 msgid "team <player> [team]"
 msgstr "team  <Íæ¼ÒÃû³Æ> [ÍŶÓÃû]"
 
-#: server/commands.c:134
+#: server/commands.c:133
 msgid "Change, add or remove a player's team affiliation."
 msgstr "¸Ä±ä£¬Ìí¼Ó£¬»òÕßɾ³ýÒ»¸öÍæ¼ÒµÄÍŶÓÁ¥Êô¡£"
 
-#: server/commands.c:135
+#: server/commands.c:134
 msgid ""
 "Sets a player as member of a team. If no team specified, the player is set "
 "teamless. Use \"\" if names contain whitespace. A team is a group of players "
@@ -2263,15 +2266,15 @@ msgstr ""
 "µÄ£¬ÓµÓй²ÏíÊÓÒ°ºÍʹ¹Ý£¬ËûÃǹ²Í¬×÷Õ½ÒÔ»ñµÃÍŶÓʤÀû£¬Ã¿¸öÍæ¼Ò½«¾ßÓÐƽ¾ù¸öÈ˵Ã"
 "·Ö¡£"
 
-#: server/commands.c:142
+#: server/commands.c:141
 msgid "rulesetdir <directory>"
 msgstr "rulesetdir <Ŀ¼>"
 
-#: server/commands.c:143
+#: server/commands.c:142
 msgid "Choose new ruleset directory or modpack."
 msgstr "Ñ¡ÔñеĹæÔò¼¯Ä¿Â¼»ò modpack¡£"
 
-#: server/commands.c:144
+#: server/commands.c:143
 msgid ""
 "Choose new ruleset directory or modpack. Calling this\n"
 " without any arguments will show you the currently selected ruleset."
@@ -2280,15 +2283,15 @@ msgstr ""
 "ûÓÐÈκβÎÊýµ÷ÓôËÃüÁÏÔʾÏÖÔÚËùÑ¡ÔñµÄ¹æÔò¼¯ºÏ¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:150
+#: server/commands.c:149
 msgid "metainfo <meta-line>"
 msgstr "metainfo <ÔªÐÅÏ¢ÐÐ>"
 
-#: server/commands.c:151
+#: server/commands.c:150
 msgid "Set metaserver info line."
 msgstr "É趨Ԫ·þÎñÆ÷ÐÅÏ¢ÐС£"
 
-#: server/commands.c:152
+#: server/commands.c:151
 msgid ""
 "Set user defined metaserver info line. If parameter is omitted,\n"
 "previously set metamessage will be removed. For most of the time\n"
@@ -2297,19 +2300,19 @@ msgid ""
 msgstr ""
 
 #. TRANS: translate text between <> only
-#: server/commands.c:159
+#: server/commands.c:158
 msgid "metapatch <meta-line>"
 msgstr "metapatch <ÔªÐÅÏ¢ÐÐ>"
 
-#: server/commands.c:160
+#: server/commands.c:159
 msgid "Set metaserver patches line."
 msgstr "É趨Ԫ·þÎñÆ÷²¹¶¡ÐС£"
 
-#: server/commands.c:166
+#: server/commands.c:165
 msgid "Control metaserver connection."
 msgstr "¿ØÖÆÔª·þÎñÆ÷Á¬½Ó¡£"
 
-#: server/commands.c:167
+#: server/commands.c:166
 msgid ""
 "'metaconnection ?' reports on the status of the connection to metaserver.\n"
 "'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2320,33 +2323,33 @@ msgstr ""
 "¡°metaconnection up¡± »ò ¡°metac u¡± ½«´ò¿ªµ½Ôª·þÎñÆ÷µÄÁ¬½Ó¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:173
+#: server/commands.c:172
 msgid "metaserver <address>"
 msgstr "metaserver <µØÖ·>"
 
-#: server/commands.c:174
+#: server/commands.c:173
 msgid "Set address (URL) for metaserver to report to."
 msgstr "ÉèÖÃÔª·þÎñÆ÷±¨¸æµÄµØÖ·£¨URL£©µØÖ·¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:178
+#: server/commands.c:177
 msgid "aitoggle <player-name>"
 msgstr "aitoggle <Íæ¼ÒÃû×Ö>"
 
-#: server/commands.c:179
+#: server/commands.c:178
 msgid "Toggle AI status of player."
 msgstr "Çл»Íæ¼ÒµÄ AI ״̬¡£"
 
 #. TRANS: translate text between [] and <> only
-#: server/commands.c:183
+#: server/commands.c:182
 msgid "take [connection-name] <player-name>"
 msgstr "take [Á¬½ÓÃû³Æ] <Íæ¼ÒÃû³Æ>"
 
-#: server/commands.c:184
+#: server/commands.c:183
 msgid "Take over a player's place in the game."
 msgstr "½ÓÌæÓÎÏ·ÖÐÒ»¸öÍæ¼Ò¡£"
 
-#: server/commands.c:185
+#: server/commands.c:184
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to take over a player. If you're not one of these, only the "
@@ -2359,15 +2362,15 @@ msgstr ""
 "µÄÁ¬½Ó»¹Ã»ÓпØÖÆÈκÎÍæ¼Ò£¬Ôò´´½¨Ò»¸öÍæ¼Ò²¢·ÖÅä¸ø¸ÃÁ¬½Ó¡£"
 
 #. TRANS: translate text between [] only
-#: server/commands.c:193
+#: server/commands.c:192
 msgid "observe [connection-name] [player-name]"
 msgstr "ovserve [Á¬½ÓÃû³Æ] [Íæ¼ÒÃû³Æ]"
 
-#: server/commands.c:194
+#: server/commands.c:193
 msgid "Observe a player or the whole game."
 msgstr "ÅÔ¹ÛÒ»¸öÍæ¼Ò»òÕû¸öÓÎÏ·¡£"
 
-#: server/commands.c:195
+#: server/commands.c:194
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to observe a player. If you're not one of these, only the "
@@ -2380,15 +2383,15 @@ msgstr ""
 "½ÓûÓÐʹÓòÎÊý£¬ÔòÁ¬½Ó±»¸½½Óµ½È«¾ÖÅÔ¹ÛÕß¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:203
+#: server/commands.c:202
 msgid "detach <connection-name>"
 msgstr "detach <Á¬½ÓÃû>"
 
-#: server/commands.c:204
+#: server/commands.c:203
 msgid "detach from a player."
 msgstr "´ÓÒ»¸öÍæ¼ÒÍÑÀë¡£"
 
-#: server/commands.c:205
+#: server/commands.c:204
 msgid ""
 "Only the console and connections with cmdlevel 'hack' can force other "
 "connections to detach from a player."
@@ -2396,20 +2399,20 @@ msgstr ""
 "Ö»ÓпØÖÆ̨ºÍ¾ßÓÐÃüÁî·ÃÎʼ¶±ð¡°hack¡±µÄÁ¬½Ó¿ÉÒÔÇ¿ÖƱðµÄÁ¬½Ó´ÓÒ»¸öÍæ¼ÒÍÑÀë¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:210
+#: server/commands.c:209
 msgid "create <player-name>"
 msgstr "create <Íæ¼ÒÃû³Æ>"
 
-#: server/commands.c:211
+#: server/commands.c:210
 msgid "Create an AI player with a given name."
 msgstr "ÒÔÖ¸¶¨µÄÃû³Æ´´½¨ AI Íæ¼Ò¡£"
 
-#: server/commands.c:212
+#: server/commands.c:211
 msgid ""
 "The 'create' command is only available before the game has been started."
 msgstr "Ö»ÄÜÔÚÓÎÏ·¿ªÊ¼Ç°Ê¹Óá°create¡±ÃüÁî¡£"
 
-#: server/commands.c:216
+#: server/commands.c:215
 msgid ""
 "away\n"
 "away"
@@ -2417,16 +2420,16 @@ msgstr ""
 "away\n"
 "À뿪"
 
-#: server/commands.c:218
+#: server/commands.c:217
 msgid "Set yourself in away mode. The AI will watch your back."
 msgstr "½«×Ô¼ºÉèÖÃΪÀ뿪ģʽ¡£AI½«ÊØ»¤Ö±µ½Äú»ØÀ´¡£"
 
-#: server/commands.c:219
+#: server/commands.c:218
 msgid "The AI will govern your nation but do minimal changes."
 msgstr "AI½«¹ÜÀíÄúµÄ¹ú¼Òµ«Êǽ«Ö»×÷ºÜÉٵı䶯¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:223
+#: server/commands.c:222
 msgid ""
 "novice\n"
 "novice <player-name>"
@@ -2434,11 +2437,11 @@ msgstr ""
 "novice\n"
 "novice <Íæ¼ÒÃû³Æ>"
 
-#: server/commands.c:225
+#: server/commands.c:224
 msgid "Set one or all AI players to 'novice'."
 msgstr "½«Ò»¸ö»ò¶à¸öAIÍæ¼ÒÉèÖÃΪ¡°ºÜÈÝÒס±¡£"
 
-#: server/commands.c:226
+#: server/commands.c:225
 msgid ""
 "With no arguments, sets all AI players to skill level 'novice', and sets the "
 "default level for any new AI players to 'novice'.  With an argument, sets "
@@ -2448,7 +2451,7 @@ msgstr ""
 "¼¶±ðÉèΪ¡°ºÜÈÝÒס±¡£ÓÐÒ»¸ö²ÎÊýµÄÇé¿öÏ£¬Ö»ÉèÖøÃÍæ¼ÒµÄ¼¶±ð¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:232
+#: server/commands.c:231
 msgid ""
 "easy\n"
 "easy <player-name>"
@@ -2456,11 +2459,11 @@ msgstr ""
 "easy\n"
 "easy <Íæ¼ÒÃû³Æ>"
 
-#: server/commands.c:234
+#: server/commands.c:233
 msgid "Set one or all AI players to 'easy'."
 msgstr "½«Ò»¸ö»ò¶à¸ö AI Íæ¼ÒÉèÖÃΪ¡°ÈÝÒס±¡£"
 
-#: server/commands.c:235
+#: server/commands.c:234
 msgid ""
 "With no arguments, sets all AI players to skill level 'easy', and sets the "
 "default level for any new AI players to 'easy'.  With an argument, sets the "
@@ -2470,7 +2473,7 @@ msgstr ""
 "±ðÉèΪ¡°ÈÝÒס±¡£ÓÐÒ»¸ö²ÎÊýµÄÇé¿öÏ£¬Ö»ÉèÖøÃÍæ¼ÒµÄ¼¶±ð¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:241
+#: server/commands.c:240
 msgid ""
 "normal\n"
 "normal <player-name>"
@@ -2478,11 +2481,11 @@ msgstr ""
 "normal\n"
 "normal <Íæ¼ÒÃû³Æ>"
 
-#: server/commands.c:243
+#: server/commands.c:242
 msgid "Set one or all AI players to 'normal'."
 msgstr "½«Ò»¸ö»ò¶à¸ö AI Íæ¼ÒÉèÖÃΪ¡°ÆÕͨ¡±¡£"
 
-#: server/commands.c:244
+#: server/commands.c:243
 msgid ""
 "With no arguments, sets all AI players to skill level 'normal', and sets the "
 "default level for any new AI players to 'normal'.  With an argument, sets "
@@ -2492,7 +2495,7 @@ msgstr ""
 "±ðÉèΪ¡°ÆÕͨ¡±¡£ÓÐÒ»¸ö²ÎÊýµÄÇé¿öÏ£¬Ö»ÉèÖøÃÍæ¼ÒµÄ¼¶±ð¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:250
+#: server/commands.c:249
 msgid ""
 "hard\n"
 "hard <player-name>"
@@ -2500,11 +2503,11 @@ msgstr ""
 "hard\n"
 "hard <Íæ¼ÒÃû³Æ>"
 
-#: server/commands.c:252
+#: server/commands.c:251
 msgid "Set one or all AI players to 'hard'."
 msgstr "½«Ò»¸ö»ò¶à¸öÍæ¼ÒÉèÖÃΪ¡°ÄÑ¡±¡£"
 
-#: server/commands.c:253
+#: server/commands.c:252
 msgid ""
 "With no arguments, sets all AI players to skill level 'hard', and sets the "
 "default level for any new AI players to 'hard'.  With an argument, sets the "
@@ -2514,7 +2517,7 @@ msgstr ""
 "ÉèΪ¡°ÄÑ¡±¡£ÓÐÒ»¸ö²ÎÊýµÄÇé¿öÏ£¬Ö»ÉèÖøÃÍæ¼ÒµÄ¼¶±ð¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:259
+#: server/commands.c:258
 msgid ""
 "experimental\n"
 "experimental <player-name>"
@@ -2522,11 +2525,11 @@ msgstr ""
 "experimental\n"
 "experimental <Íæ¼ÒÃû³Æ>"
 
-#: server/commands.c:261
+#: server/commands.c:260
 msgid "Set one or all AI players to 'experimental'."
 msgstr "½«Ò»¸ö»ò¶à¸öAIÍæ¼ÒÉèÖÃΪ¡°ÊµÑéÐÔ¡±¡£"
 
-#: server/commands.c:262
+#: server/commands.c:261
 msgid ""
 "With no arguments, sets all AI players to skill 'experimental', and sets the "
 "default level for any new AI players to this.  With an argument, sets the "
@@ -2538,7 +2541,7 @@ msgstr ""
 "ÌØÐÔ£¡¶ÔÓÚÆÕͨ·þÎñÆ÷£¬´ËÑ¡ÏîûÓÐ×÷Óá£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:270
+#: server/commands.c:269
 msgid ""
 "cmdlevel\n"
 "cmdlevel <level>\n"
@@ -2552,11 +2555,11 @@ msgstr ""
 "cmdlevel <¼¶±ð> first\n"
 "cmdlevel <¼¶±ð> <Á¬½ÓÃû>"
 
-#: server/commands.c:275
+#: server/commands.c:274
 msgid "Query or set command access level access."
 msgstr "²éѯ»òÉèÖÃÃüÁî·ÃÎʼ¶±ð¡£"
 
-#: server/commands.c:276
+#: server/commands.c:275
 msgid ""
 "The command access level controls which server commands are available\n"
 "to users via the client chatline.  The available levels are:\n"
@@ -2595,20 +2598,20 @@ msgstr ""
 "Óв»¿ÉÐÅÈεÄÈËÓÃÏàͬµÄÃû×ÖÖØÐÂÁ¬½Ó½øÀ´¡£Çë×¢Òâ´ËÃüÁîÏÖÔÚ\n"
 "È¡Á¬½ÓÃû³Æ¶ø²»ÊÇÍæ¼ÒÃû×Ö×÷²ÎÊý¡£"
 
-#: server/commands.c:297
+#: server/commands.c:296
 msgid "If there is none, become the game organizer with increased permissions."
 msgstr "Èç¹û»¹Ã»ÓÐÓÎÏ·×éÖ¯Õߣ¬Ôò³ÉΪÓÎÏ·×éÖ¯Õߣ¬¾ßÓиü¸ßµÄȨÏÞ¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:302
+#: server/commands.c:301
 msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
 msgstr "timeoutincrease <»ØºÏ> <»ØºÏÔöÁ¿> <Öµ> <Öµ³ËÊý>"
 
-#: server/commands.c:303
+#: server/commands.c:302
 msgid "See \"help timeoutincrease\"."
 msgstr "²Î¼û¡°help timeoutincrease¡±"
 
-#: server/commands.c:304
+#: server/commands.c:303
 msgid ""
 "Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
 "<turn> and multiply <value> by <valuemult>.  Use this command in concert "
@@ -2619,24 +2622,24 @@ msgstr ""
 "ÈÏΪ 0 0 0 1¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:310
+#: server/commands.c:309
 msgid "endgame"
 msgstr ""
 
-#: server/commands.c:311
+#: server/commands.c:310
 msgid "End the game immediately in a draw."
 msgstr "Á¢¼´½áÊøÓÎÏ·£¬²»·Öʤ¸º¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:315
+#: server/commands.c:314
 msgid "surrender"
 msgstr ""
 
-#: server/commands.c:316
+#: server/commands.c:315
 msgid "Concede the game."
 msgstr "ÈÏÊä¡£"
 
-#: server/commands.c:317
+#: server/commands.c:316
 msgid ""
 "This tells everyone else that you concede the game, and if all but one "
 "player (or one team) have conceded the game in this way then the game ends."
@@ -2645,22 +2648,22 @@ msgstr ""
 "Ï·½áÊø¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:323
+#: server/commands.c:322
 msgid "remove <player-name>"
 msgstr "remove <Íæ¼ÒÃû³Æ>"
 
-#: server/commands.c:324
+#: server/commands.c:323
 msgid "Fully remove player from game."
 msgstr "´ÓÓÎÏ·Öг¹µ×ɾ³ýÍæ¼Ò¡£"
 
-#: server/commands.c:325
+#: server/commands.c:324
 msgid ""
 "This *completely* removes a player from the game, including all cities and "
 "units etc.  Use with care!"
 msgstr "Õ⽫´ÓÓÎÏ·ÖÐ*ÍêÈ«*ɾ³ýÒ»¸öÍæ¼Ò£¬°üÀ¨ËùÓеijÇÊкͲ¿¶ÓµÈ¡£ÇëСÐÄʹÓã¡"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:330
+#: server/commands.c:329
 msgid ""
 "save\n"
 "save <file-name>"
@@ -2668,11 +2671,11 @@ msgstr ""
 "save\n"
 "save <ÎļþÃû>"
 
-#: server/commands.c:332
+#: server/commands.c:331
 msgid "Save game to file."
 msgstr "½«ÓÎÏ·±£´æµ½ÎļþÖС£"
 
-#: server/commands.c:333
+#: server/commands.c:332
 msgid ""
 "Save the current game to file <file-name>.  If no file-name argument is "
 "given saves to \"<auto-save name prefix><year>m.sav[.gz]\".\n"
@@ -2688,7 +2691,7 @@ msgstr ""
 "Æô¶¯·þÎñÆ÷£¬²¢ÇÒµ±Íæ¼Ò¶¼ÖØÐÂÁ¬ÈëºóʹÓá°start¡±ÃüÁʼÓÎÏ·¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:342
+#: server/commands.c:341
 msgid ""
 "load\n"
 "load <file-name>"
@@ -2696,11 +2699,11 @@ msgstr ""
 "load\n"
 "load <ÎļþÃû>"
 
-#: server/commands.c:344
+#: server/commands.c:343
 msgid "Load game from file."
 msgstr "´ÓÎļþÖÐÔØÈëÓÎÏ·¡£"
 
-#: server/commands.c:345
+#: server/commands.c:344
 msgid ""
 "Load a game from <file-name>. Any current data including players, rulesets "
 "and server options are lost.\n"
@@ -2709,28 +2712,28 @@ msgstr ""
 "ʧ¡£\n"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:350
+#: server/commands.c:349
 msgid "read <file-name>"
 msgstr "read <ÎļþÃû>"
 
-#: server/commands.c:351
+#: server/commands.c:350
 msgid "Process server commands from file."
 msgstr "´¦ÀíÀ´×ÔÎļþµÄ·þÎñÆ÷ÃüÁî¡£"
 
 #. TRANS: translate text between <> only
-#: server/commands.c:355
+#: server/commands.c:354
 msgid "write <file-name>"
 msgstr "write <ÎļþÃû>"
 
-#: server/commands.c:356
+#: server/commands.c:355
 msgid "Write current settings as server commands to file."
 msgstr "½«µ±Ç°ÉèÖÃ×÷Ϊ·þÎñÆ÷ÃüÁîдÈëÎļþ¡£"
 
-#: server/commands.c:360
+#: server/commands.c:359
 msgid "Switch server output between 'RFC-style' and normal style."
 msgstr "ÔÚ¡°RFC·ç¸ñ¡±ºÍ¡°ÆÕͨ·ç¸ñ¡±Ö®¼äÇл»·þÎñÆ÷Êä³ö¡£"
 
-#: server/commands.c:364
+#: server/commands.c:363
 msgid "Simply returns the id of the server."
 msgstr "·µ»Ø·þÎñÆ÷µÄ id¡£"
 
@@ -3239,25 +3242,34 @@ msgstr "
 msgid "%s have caused an incident while inciting a revolt in %s."
 msgstr "%s ÔÚ %s ÖÐÉ¿¶¯ÆðÒåʱÒý·¢ÁËÒâÍâ¡£"
 
-#: server/gamehand.c:136
+#: server/gamehand.c:137
 #, c-format
 msgid "Sea moving start units are not yet supported. Nobody gets %s."
 msgstr "»¹²»Ö§³Öº£ÑóÒƶ¯µÄ³õʼ²¿¶Ó¡£Ã»È˵õ½ %s ¡£"
 
-#: server/gamehand.c:309 client/text.c:628
+#: server/gamehand.c:310 client/text.c:632
 #, c-format
 msgid "Year: %s"
 msgstr "Äê´ú£º%s"
 
-#: server/gamehand.c:388
+#: server/gamehand.c:389
 msgid "The turn timeout has exceeded its maximum value, fixing at its maximum"
 msgstr "»ØºÏ³¬Ê±³¬³öÁË×î´óÖµ£¬¸ÄÕýΪÆä×î´óÖµ"
 
-#: server/gamehand.c:396
+#: server/gamehand.c:397
 msgid "The turn timeout is smaller than zero, fixing at zero."
 msgstr "»ØºÏ³¬Ê±Ð¡ÓÚ0£¬¸ÄÕýΪ0 ¡£"
 
-#: server/ggzserver.c:207 client/ggzclient.c:109
+#: server/ggzserver.c:123
+msgid "Unable to make temporary directory for GGZ game.\n"
+msgstr ""
+
+#: server/ggzserver.c:131
+#, c-format
+msgid "Unable to change into temporary server directory %s.\n"
+msgstr ""
+
+#: server/ggzserver.c:266 client/ggzclient.c:109
 msgid "Only the GGZ client must call civclient in ggz mode!\n"
 msgstr ""
 
@@ -3300,25 +3312,25 @@ msgstr "û
 msgid "There is no player nor connection by the name %s."
 msgstr "ûÓÐÃûΪ %s µÄÍæ¼Ò»òÁ¬½Ó¡£"
 
-#: server/maphand.c:253
+#: server/maphand.c:252
 msgid "Global warming has occurred!"
 msgstr "·¢ÉúÈ«Çò±äů£¡"
 
-#: server/maphand.c:255
+#: server/maphand.c:254
 msgid ""
 "Coastlines have been flooded and vast ranges of grassland have become "
 "deserts."
 msgstr "º£°¶±»ÑÍû£¬´ó·¶Î§µÄ²ÝµØ±ä³ÉÁËɳĮ¡£"
 
-#: server/maphand.c:297
+#: server/maphand.c:296
 msgid "Nuclear winter has occurred!"
 msgstr "ºË¶¬ÌìÀ´ÁÙ£¡"
 
-#: server/maphand.c:299
+#: server/maphand.c:298
 msgid "Wetlands have dried up and vast ranges of grassland have become tundra."
 msgstr "ʪµØ±ä¸É£¬´ó·¶Î§µÄ²ÝµØ±ä³ÉÁË̦ԭ¡£"
 
-#: server/maphand.c:320
+#: server/maphand.c:319
 msgid ""
 "New hope sweeps like fire through the country as the discovery of railroad "
 "is announced.\n"
@@ -3327,7 +3339,7 @@ msgstr ""
 "Ìú·Ñо¿³É¹¦µÄÏûÏ¢Ïñ»ðÒ»ÑùÔÚÈ«¹úȼÆðÁËеÄÏ£Íû¡£\n"
 "        ¹¤ÈËÃÇ×Ô·¢µØ¼¯½áÆðÀ´²¢ÓÃÌú·Éý¼¶ÁËËùÓеijÇÊС£"
 
-#: server/maphand.c:326
+#: server/maphand.c:325
 msgid ""
 "The people are pleased to hear that your scientists finally know about "
 "railroads.\n"
@@ -3336,12 +3348,12 @@ msgstr ""
 "ÈËÃñΪÄúµÄ¿Æѧ¼Ò×îÖÕÕÆÎÕÁËÌú·¶ø¼¤Àø¡£\n"
 "        ¹¤ÈËÃÇ×Ô·¢µØ¼¯½áÆðÀ´²¢ÓÃÌú·Éý¼¶ÁËËùÓеijÇÊС£"
 
-#: server/maphand.c:1416
+#: server/maphand.c:1418
 #, c-format
 msgid "Moved your %s due to changing terrain."
 msgstr "ÒòΪ¸Ä±äµØÐζøÒƶ¯ÁËÄúµÄ %s ¡£"
 
-#: server/maphand.c:1434
+#: server/maphand.c:1436
 #, c-format
 msgid "Disbanded your %s due to changing terrain."
 msgstr "ÒòΪ¸Ä±äµØÐζø½âÉ¢ÁËÄúµÄ %s ¡£"
@@ -3399,119 +3411,119 @@ msgstr "
 msgid "You should choose a new government from the government menu."
 msgstr "ÄúÓ¦¸Ã´ÓÕþ¸®²Ëµ¥ÖÐÑ¡ÔñÒ»¸öеÄÕþ¸®¡£"
 
-#: server/plrhand.c:425
+#: server/plrhand.c:424
 #, c-format
 msgid "Tax rate exceeded the max rate for %s; adjusted."
 msgstr "Ë°Âʳ¬³öÁË %s µÄ×î¸ß±ÈÂÊ£»Òѵ÷Õû¡£"
 
-#: server/plrhand.c:431
+#: server/plrhand.c:429
 #, c-format
 msgid "Science rate exceeded the max rate for %s; adjusted."
 msgstr "¿ÆÑбÈÂʳ¬³öÁË %s µÄ×î¸ß±ÈÂÊ£»Òѵ÷Õû¡£"
 
-#: server/plrhand.c:437
+#: server/plrhand.c:434
 #, c-format
 msgid "Luxury rate exceeded the max rate for %s; adjusted."
 msgstr "ÓéÀÖ±ÈÂʳ¬³öÁË %s µÄ×î¸ß±ÈÂÊ£»Òѵ÷Õû¡£"
 
-#: server/plrhand.c:492
+#: server/plrhand.c:489
 #, c-format
 msgid "%s no longer gives us shared vision!"
 msgstr "%s ²»ÔÙÏòÄúÌṩ¹²ÏíÊÓÒ°£¡"
 
-#: server/plrhand.c:503
+#: server/plrhand.c:500
 #, c-format
 msgid ""
 "The senate will not allow you to break treaty with the %s.  You must either "
 "dissolve the senate or wait until a more timely moment."
 msgstr "Òé»á²»ÔÊÐíÄú˺»ÙÓë %s µÄЭ¶¨¡£Äú±ØÐë½âÉ¢Òé»á»òÕߵȴý¸üºÏÊʵÄʱ»ú¡£"
 
-#: server/plrhand.c:556
+#: server/plrhand.c:553
 #, c-format
 msgid ""
 "The senate passes your bill because of the constant provocations of the %s."
 msgstr "ÓÉÓÚ %s ²»¶ÏµÄÌôÐÆ£¬Òé»áͨ¹ýÁËÄúµÄÌá°¸¡£"
 
-#: server/plrhand.c:561
+#: server/plrhand.c:558
 #, c-format
 msgid ""
 "The senate refuses to break treaty with the %s, but you have no trouble "
 "finding a new senate."
 msgstr "Òé»á¾Ü¾ø˺»ÙÓë %s µÄЭ¶¨£¬µ«ÊÇÄú¿ÉÒÔºÜÈÝÒ×½¨Á¢ÐµÄÒé»á¡£"
 
-#: server/plrhand.c:593
+#: server/plrhand.c:590
 #, c-format
 msgid "The diplomatic state between the %s and the %s is now %s."
 msgstr "%s ºÍ %s Ö®¼äµÄÍ⽻״̬ÏÖÔÚΪ %s¡£"
 
-#: server/plrhand.c:599
+#: server/plrhand.c:596
 #, c-format
 msgid ""
 " %s canceled the diplomatic agreement! The diplomatic state between the %s "
 "and the %s is now %s."
 msgstr "%s È¡ÏûÁËÍ⽻Э¶¨£¡ %s ºÍ %s ¼äµÄÍ⽻״̬ÏÖÔÚΪ %s¡£"
 
-#: server/plrhand.c:617
+#: server/plrhand.c:614
 #, c-format
 msgid ""
 "%s has attacked your ally %s! You cancel your alliance to the aggressor."
 msgstr "%s ¹¥»÷ÁËÄúµÄͬÃË %s £¡ÄúÈ¡ÏûÁ˺ÍÇÖÂÔÕßµÄͬÃË¡£"
 
-#: server/plrhand.c:629
+#: server/plrhand.c:626
 #, c-format
 msgid ""
 "Your team mate %s declared war on %s. You are obligated to cancel alliance "
 "with %s."
 msgstr "ÄúµÄÍŶӻï°é %s ¶Ô %s ÐûÕ½ÁË¡£Äú±»ÆÈÈ¡ÏûÁËÓë %s µÄͬÃË¡£"
 
-#: server/plrhand.c:1101
+#: server/plrhand.c:1103
 #, c-format
 msgid "Removing player %s."
 msgstr "ÕýÔÚɾ³ýÍæ¼Ò %s¡£"
 
-#: server/plrhand.c:1103
+#: server/plrhand.c:1105
 msgid "You've been removed from the game!"
 msgstr "ÄúÒѾ­±»´ÓÓÎÏ·ÖÐɾ³ýÁË£¡"
 
-#: server/plrhand.c:1106
+#: server/plrhand.c:1108
 #, c-format
 msgid "%s has been removed from the game."
 msgstr "%s ÒѾ­±»´ÓÓÎÏ·ÖÐɾ³ýÁË¡£"
 
-#: server/plrhand.c:1149 server/plrhand.c:1154
+#: server/plrhand.c:1153 server/plrhand.c:1158
 #, c-format
 msgid "You have made contact with the %s, ruled by %s."
 msgstr "ÄúÁªÏµµ½ÁË %s £¬ËüÓÉ %s ËùͳÖΡ£"
 
-#: server/plrhand.c:1174
+#: server/plrhand.c:1178
 #, fuzzy, c-format
 msgid ""
 "%s and %s meet and go to instant war. You cancel your alliance with both."
 msgstr "%s ¹¥»÷ÁËÄúµÄͬÃË %s £¡ÄúÈ¡ÏûÁ˺ÍÇÖÂÔÕßµÄͬÃË¡£"
 
-#: server/plrhand.c:1652
+#: server/plrhand.c:1656
 #, c-format
 msgid "Could not throw %s into civil war - too many players"
 msgstr "²»ÄÜ°Ñ %s Ç£ÈëÄÚÕ½ £­ Íæ¼ÒÌ«¶à"
 
-#: server/plrhand.c:1659
+#: server/plrhand.c:1663
 #, fuzzy, c-format
 msgid "Could not throw %s into civil war - no available nations"
 msgstr "²»ÄÜ°Ñ %s Ç£ÈëÄÚÕ½ £­ Íæ¼ÒÌ«¶à"
 
-#: server/plrhand.c:1682
+#: server/plrhand.c:1686
 #, c-format
 msgid ""
 "Your nation is thrust into civil war,  %s is declared the leader of the "
 "rebel states."
 msgstr "ÄúµÄ¹ú¼Ò±»ÍÆÈëÄÚÕ½£¬%s ±»Ðû²¼ÎªÆðÒåÕþ¸®µÄÊ×Áì¡£"
 
-#: server/plrhand.c:1703
+#: server/plrhand.c:1707
 #, c-format
 msgid "%s declares allegiance to %s."
 msgstr "%s Ïò %s ±íʾЧÖÒ¡£"
 
-#: server/plrhand.c:1718
+#: server/plrhand.c:1722
 #, fuzzy, c-format
 msgid ""
 "Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3743,19 +3755,19 @@ msgstr "
 msgid "th"
 msgstr "ºÅ"
 
-#: server/report.c:698
+#: server/report.c:700
 msgid "Demography string contains invalid characters. Try \"help demography\"."
 msgstr "ÈË¿Úͳ¼Æ´®°üº¬ÎÞЧµÄ×Ö·û¡£Çë³¢ÊÔ¡°help demography¡±¡£"
 
-#: server/report.c:741 server/report.c:764
+#: server/report.c:743 server/report.c:766
 msgid "Demographics Report:"
 msgstr "ÈË¿Úͳ¼Æ±¨¸æ£º"
 
-#: server/report.c:742
+#: server/report.c:744
 msgid "Sorry, the Demographics report is unavailable."
 msgstr "±§Ç¸£¬ÈË¿Úͳ¼Æ±¨¸æÉв»¿ÉÓá£"
 
-#: server/report.c:746
+#: server/report.c:748
 #, c-format
 msgid "The %s of the %s (%s)"
 msgstr "%2$s£¨%3$s£© µÄ %1$s"
@@ -3766,11 +3778,11 @@ msgstr "%2$s
 msgid "Could not find a readable \"%s.%s\" ruleset file."
 msgstr "ÎÞ·¨ÕÒµ½¿É¶ÁµÄ¡°%s.%s¡±¹æÔò¼¯Îļþ¡£"
 
-#: server/ruleset.c:2348
+#: server/ruleset.c:2356
 msgid "No barbarian nation in rulesets, at least one required!"
 msgstr ""
 
-#: server/ruleset.c:3158
+#: server/ruleset.c:3166
 msgid "Loading rulesets"
 msgstr "ÕýÔÚÔØÈë¹æÔò¼¯"
 
@@ -3785,7 +3797,7 @@ msgstr ""
 "´æÅÌÎļþº¬Óв»ÍêÕûµÄµØͼÊý¾Ý¡£Õâ¿ÉÄÜÊǾɵĴæÅÌÓÎÏ·£¬»òÕß±íÃ÷ÕâÊÇÒ»¸öÎÞЧµÄ´æ"
 "ÅÌÎļþ¡£Èç¹û¼ÌÐøµÄ»°ºó¹û×Ô¸º¡£"
 
-#: server/savegame.c:3590
+#: server/savegame.c:3588
 #, fuzzy
 msgid "Saved game is too old, at least version 1.9.0 required."
 msgstr "Savegame Ì«³Â¾É£¬ÖÁÉÙÐèÒª 1.9.0 °æ±¾¡£"
@@ -3805,13 +3817,13 @@ msgid ""
 msgstr "¾¯¸æ£º ²»Í¬µÄ¹æÔò¼¯ºÏĿ¼£¨¡°%s¡±ºÍ¡°%s¡±£©²»ÔÙÖ§³Ö¡£½«Ê¹Óá°%s¡±¡£"
 
 #. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4046
+#: server/savegame.c:4051
 #, c-format
 msgid "%s had invalid nation; changing to %s."
 msgstr ""
 
 #. TRANS: ... <Danish> alliance to <Poles>....
-#: server/savegame.c:4068
+#: server/savegame.c:4073
 #, fuzzy, c-format
 msgid ""
 "Illegal alliance structure detected: %s alliance to %s reduced to peace "
@@ -3846,7 +3858,7 @@ msgstr "
 msgid "Networking"
 msgstr "ÍøÂç"
 
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:730
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
 #: client/gui-win32/dialogs.c:532
 msgid "All"
 msgstr "È«²¿"
@@ -3867,7 +3879,7 @@ msgstr "
 msgid "Changed"
 msgstr "ÒѸıä"
 
-#: server/settings.c:102
+#: server/settings.c:83
 msgid ""
 "Allowed take string contains invalid\n"
 "characters.  Try \"help allowtake\"."
@@ -3875,7 +3887,7 @@ msgstr ""
 "ÔÊÐí½ÓÌæ×Ö·û´®°üº¬ÎÞЧ×Ö·û¡£\n"
 "Çë²Î¼û¡°help allowtake¡±¡£"
 
-#: server/settings.c:136
+#: server/settings.c:119
 msgid ""
 "Starting units string contains invalid\n"
 "characters.  Try \"help startunits\"."
@@ -3883,7 +3895,7 @@ msgstr ""
 "³õʼ²¿¶Ó×Ö·û´®°üº¬ÎÞЧ×Ö·û¡£\n"
 "Çë²Î¼û¡°help startunits¡±¡£"
 
-#: server/settings.c:142
+#: server/settings.c:125
 msgid ""
 "Starting units string does not contain\n"
 "at least one city founder.  Try \n"
@@ -3892,26 +3904,31 @@ msgstr ""
 "Æðʼ²¿¶Ó×Ö·û´®Ã»Óаüº¬³ÇÊн¨Á¢Õß¡£\n"
 "Çë²Î¿¼¡°help startunits¡±¡£"
 
-#: server/settings.c:159
+#: server/settings.c:143
 msgid "Cannot set endyear earlier than current year."
 msgstr ""
 
-#: server/settings.c:175
+#: server/settings.c:160
 msgid "Cannot change maxplayers in GGZ mode."
 msgstr "ÔÚ GGZ ģʽϲ»Äܸıä maxplayers¡£"
 
-#: server/settings.c:180
+#: server/settings.c:165
 #, fuzzy
 msgid ""
 "Number of players is higher than requested value;\n"
 "Keeping old value."
 msgstr "Íæ¼ÒÊý³¬³öÁËÇëÇóÖµ£¬±£³Ö¾ÉÖµ"
 
-#: server/settings.c:236
+#: server/settings.c:181
+#, fuzzy
+msgid "You are not allowed to set timeout values less than 30 seconds."
+msgstr "²»ÔÊÐíÄúÉèÖôËÑ¡Ïî¡£"
+
+#: server/settings.c:227
 msgid "Map size (in thousands of tiles)"
 msgstr "µØͼ´óС£¨ÒÔǧ·½¸ñ¼Æ£©"
 
-#: server/settings.c:237
+#: server/settings.c:228
 msgid ""
 "This value is used to determine the map dimensions.\n"
 "  size = 4 is a normal map of 4,000 tiles (default)\n"
@@ -3921,12 +3938,12 @@ msgstr ""
 "  size = 4 ÊÇ 4,000 ¸ö·½¸ñµÄÆÕͨµØͼ£¨È±Ê¡£©\n"
 "  size = 20 ÊÇ 20,000 ¸ö·½¸ñµÄ¾Þ´óµØͼ"
 
-#: server/settings.c:243
+#: server/settings.c:234
 msgid "Map topology index"
 msgstr "µØͼÍØÆËË÷Òý"
 
 #. TRANS: do not edit the ugly ASCII art
-#: server/settings.c:245
+#: server/settings.c:236
 msgid ""
 "Freeciv maps are always two-dimensional. They may wrap at the north-south "
 "and east-west directions to form a flat map, a cylinder, or a torus (donut). "
@@ -3993,11 +4010,11 @@ msgstr ""
 "   | | | | | | |            / \\_/ \\_/ \\_/ \\_/ \\      \n"
 "   \\/\\/\\/\\/\\/\\/             \\_/ \\_/ \\_/ \\_/ \\_/    \n"
 
-#: server/settings.c:287
+#: server/settings.c:278
 msgid "Method used to generate map"
 msgstr "ÓÃÓÚÉú³ÉµØͼµÄ·½·¨"
 
-#: server/settings.c:288
+#: server/settings.c:279
 msgid ""
 "0 = Scenario map - no generator;\n"
 "1 = Fully random height generator;              [4]\n"
@@ -4016,11 +4033,11 @@ msgstr ""
 "[]ÖеÄÊý×Ö¸ø³öÁËÆðʼλÖÃÉèÖõÄȱʡֵ¡£Èç¹ûʹÓÃÆðʼλÖõÄȱʡֵ£¬½«»á»ùÓÚÉú³É"
 "Æ÷Ñ¡ÔñÒ»¸öÆðʼλÖõÄÉèÖá£Çë²Î¼û¡°ÆðʼλÖá±ÉèÖá£"
 
-#: server/settings.c:301
+#: server/settings.c:292
 msgid "Method used to choose start positions"
 msgstr "Ñ¡ÔñÆðʼλÖõķ½·¨"
 
-#: server/settings.c:302
+#: server/settings.c:293
 msgid ""
 "0 = Generator's choice.  Selecting this setting means\n"
 "    the default value will be picked based on the generator\n"
@@ -4040,35 +4057,35 @@ msgstr ""
 "4 = ¸ù¾Ý´ó½Ãæ»ý´óС·ÅÖÃÍæ¼Ò¡£\n"
 "×¢Ò⣺Éú³ÉÆ÷½«³¢ÊÔΪѡÔñµÄÆðʼλÖúÍÍæ¼ÒÊýÄ¿´´½¨ºÏÊÊÊýÄ¿µÄ´ó½¡£"
 
-#: server/settings.c:315
+#: server/settings.c:306
 msgid "Presence of 1x1 islands"
 msgstr "ÓÐÎÞ 1x1 ´óСµÄµº"
 
-#: server/settings.c:316
+#: server/settings.c:307
 msgid "0 = no 1x1 islands; 1 = some 1x1 islands"
 msgstr "0 = ûÓÐ 1x1 ´óСµÄµº£»1 = ÓÐ 1x1 ´óСµÄµº"
 
-#: server/settings.c:321
+#: server/settings.c:312
 msgid "Whether the poles are separate continents"
 msgstr "Á½¼«ÊÇ·ñÊÇ·Ö¿ªµÄ´ó½"
 
-#: server/settings.c:322
+#: server/settings.c:313
 msgid "0 = continents may attach to poles; 1 = poles will usually be separate"
 msgstr "0 = ´ó½¿ÉÄÜÁ¬½Óµ½¼«µØ£»1 = ¼«µØÊÇ·Ö¸ô¿ªµÄ"
 
-#: server/settings.c:328
+#: server/settings.c:319
 msgid "All the map is temperate"
 msgstr "µØͼȫ²¿ÊÇδø"
 
-#: server/settings.c:329
+#: server/settings.c:320
 msgid "0 = normal Earth-like planet; 1 = all-temperate planet "
 msgstr "0 = ÀàËÆÕý³£µØÇòµÄÐÇÇò£»1 = È«ÊÇδøµÄÐÇÇò"
 
-#: server/settings.c:334
+#: server/settings.c:325
 msgid "Average temperature of the planet"
 msgstr "ÐÇÇòµÄƽ¾ùζÈ"
 
-#: server/settings.c:335
+#: server/settings.c:326
 msgid ""
 "Small values will give a cold map, while larger values will give a hotter "
 "map.\n"
@@ -4098,31 +4115,31 @@ msgstr ""
 "\n"
 "0 ½«µÃµ½·Ç³£º®ÀäµÄÐÇÇò£¬´ó·¶Î§µÄ¼«µØº®ÀäÇø£¬Ã»ÓÐÈÈ´ø¡£"
 
-#: server/settings.c:352
+#: server/settings.c:343
 msgid "Percentage of the map that is land"
 msgstr "µØͼÖнµØµÄ±ÈÀý"
 
-#: server/settings.c:353
+#: server/settings.c:344
 msgid ""
 "This setting gives the approximate percentage of the map that will be made "
 "into land."
 msgstr "´ËÑ¡ÏîÉèÖõØͼÖнµØµÄ´ó¸Å°Ù·Ö±È"
 
-#: server/settings.c:359
+#: server/settings.c:350
 msgid "Amount of hills/mountains"
 msgstr "ÇðÁê»òɽÂöµÄ±ÈÀý"
 
-#: server/settings.c:360
+#: server/settings.c:351
 msgid ""
 "Small values give flat maps, while higher values give a steeper map with "
 "more hills and mountains."
 msgstr "½ÏСµÄÖµÉú³Éƽ̹µÄµØͼ£¬½Ï´óµÄÖµ½«Éú³É¸ü¶àµÄÇðÁêºÍɽÂö¡£"
 
-#: server/settings.c:366
+#: server/settings.c:357
 msgid "Amount of water on lands"
 msgstr "½µØÉÏË®µÄÊýÁ¿"
 
-#: server/settings.c:367
+#: server/settings.c:358
 msgid ""
 "Small values mean lots of dry, desert-like land; higher values give a wetter "
 "map with more swamps, jungles, and rivers."
@@ -4130,11 +4147,11 @@ msgstr ""
 "½ÏСµÄÖµ½«µÃµ½´óÁ¿¸Éºµ¡¢ÀàɳĮµÄ½µØ£»½Ï´óµÄÖµ½«µÃµ½Óиü¶àÕÓÔó¡¢´ÔÁֺͺÓÁ÷µÄ"
 "ʪÈóµØͼ¡£"
 
-#: server/settings.c:374
+#: server/settings.c:365
 msgid "Map generation random seed"
 msgstr "Éú³ÉµØͼµÄËæ»úÊýÖÖ×Ó"
 
-#: server/settings.c:375
+#: server/settings.c:366
 msgid ""
 "The same seed will always produce the same map; for zero (the default) a "
 "seed will be chosen based on the time to give a random map. This setting is "
@@ -4143,31 +4160,31 @@ msgstr ""
 "ÏàͬµÄÖÖ×Ó×ÜÊÇÉú³ÉÏàͬµÄµØͼ£»ÒÔÁ㣨ĬÈÏÖµ£©×÷ΪÖÖ×Ó½«¸ù¾Ýʱ¼äÑ¡ÔñÖÖ×Ó£¬ÒÔÉú"
 "³ÉËæ»úµØͼ¡£´ËÑ¡Ïîͨ³£Ö»ÓÃÓÚµ÷ÊÔ¡£"
 
-#: server/settings.c:388
+#: server/settings.c:379
 msgid "Game random seed"
 msgstr "ÓÎÏ·Ëæ»úÊýÖÖ×Ó"
 
-#: server/settings.c:389
+#: server/settings.c:380
 msgid ""
 "For zero (the default) a seed will be chosen based on the time. This setting "
 "is usually only of interest while debugging the game"
 msgstr "ÒÔÁ㣨ĬÈÏÖµ£©ÎªÖÖ×Ó½«¸ù¾Ýʱ¼äÑ¡ÔñÖÖ×Ó(ĬÈÏ)¡£´ËÑ¡Ïîͨ³£Ö»ÓÃÓÚµ÷ÊÔ¡£"
 
-#: server/settings.c:396
+#: server/settings.c:387
 msgid "Amount of \"special\" resource squares"
 msgstr "¡°ÌØÊ⡱Îï×Ê·½¿éµÄÊýÁ¿"
 
-#: server/settings.c:397
+#: server/settings.c:388
 msgid ""
 "Special resources improve the basic terrain type they are on. The server "
 "variable's scale is parts per thousand."
 msgstr "ÌØÊâÎï×ʸĽøËüÃÇËùÔڵķ½¸ñ¡£´Ë·þÎñÆ÷±äÁ¿µÄ³ß¶ÈÊÇǧ·ÖÖ®Ò»¡£"
 
-#: server/settings.c:404
+#: server/settings.c:395
 msgid "Amount of huts (minor tribe villages)"
 msgstr "éÎÝ£¨Ð¡ÐͲ¿Âä´åׯ£©µÄÊýÁ¿"
 
-#: server/settings.c:405
+#: server/settings.c:396
 msgid ""
 "This setting gives the exact number of huts that will be placed on the "
 "entire map. Huts are small tribal villages that may be investigated by units."
@@ -4175,21 +4192,22 @@ msgstr ""
 "´ËÑ¡ÏȷµØ¸ø³ö±»·ÅÖÃÔÚÕû¸öµØͼÉϵÄéÎÝÊýÁ¿¡£Ã©ÎÝÊÇ¿ÉÒÔ±»²¿¶Ó̽Ë÷µÄСÐͲ¿Âä"
 "´åׯ¡£"
 
-#: server/settings.c:418
+#: server/settings.c:409
 msgid "Minimum number of players"
 msgstr "×îÉÙµÄÍæ¼ÒÊý"
 
-#: server/settings.c:419
+#: server/settings.c:410
+#, fuzzy
 msgid ""
-"There must be at least this many players (connected human players or AI "
-"players) before the game can start."
+"There must be at least this many players (connected human players) before "
+"the game can start."
 msgstr "ÖÁÉÙÓÐÕâô¶àµÄÍæ¼Ò(½ÓÈëµÄÍæ¼Ò»òµçÄÔÍæ¼Ò)²ÅÄÜ¿ªÊ¼ÓÎÏ·¡£"
 
-#: server/settings.c:426
+#: server/settings.c:417
 msgid "Maximum number of players"
 msgstr "×î¶àµÄÍæ¼ÒÊý"
 
-#: server/settings.c:427
+#: server/settings.c:418
 msgid ""
 "The maximal number of human and AI players who can be in the game. When this "
 "number of players are connected in the pregame state, any new players who "
@@ -4198,22 +4216,22 @@ msgstr ""
 "ÓÎÏ·ÖÐÄܹ»´æÔÚµÄÈËÀàºÍµçÄÔÍæ¼ÒµÄ×î´óÊýÄ¿¡£ÔÚÔ¤±¸ÓÎϷ״̬Öе±Á¬ÈëÍæ¼ÒµÄÊýÄ¿´ï"
 "µ½Õâ¸öÏÞ¶Èʱ£¬½«¾Ü¾øÈκÎÊÔͼ½ÓÈëµÄÐÂÍæ¼Ò"
 
-#: server/settings.c:435
+#: server/settings.c:426
 msgid "Total number of players (including AI players)"
 msgstr "×ÜÍæ¼ÒÊý£¨°üÀ¨AIÍæ¼Ò£©"
 
-#: server/settings.c:436
+#: server/settings.c:427
 msgid ""
 "If set to a positive value, then AI players will be automatically created or "
 "removed to keep the total number of players at this amount."
 msgstr ""
 "Èç¹ûÉèÖÃΪÕýÖµ£¬½«»á×Ô¶¯´´½¨»òɾ³ý AI Íæ¼ÒÀ´Ê¹µÃ×ܹ²µÄÍæ¼ÒÊýÄ¿±£³Ö´ËÖµ¡£"
 
-#: server/settings.c:448
+#: server/settings.c:439
 msgid "List of players' initial units"
 msgstr "Íæ¼ÒµÄ³õʼ²¿¶ÓÁбí"
 
-#: server/settings.c:449
+#: server/settings.c:440
 msgid ""
 "This should be a string of characters, each of which specifies a unit role. "
 "There must be at least one city founder in the string. The characters and "
@@ -4240,27 +4258,27 @@ msgstr ""
 "    a   = ¿ìËÙ¹¥»÷²¿¶Ó£¨ÈçÆï±ø£©\n"
 "    A   = Ç¿¹¥»÷²¿¶Ó£¨Èçʯåó£©\n"
 
-#: server/settings.c:466
+#: server/settings.c:457
 msgid "Area where initial units are located"
 msgstr "³õʼ²¿¶ÓËùÔÚÇøÓò"
 
-#: server/settings.c:467
+#: server/settings.c:458
 msgid "This is the radius within which the initial units are dispersed."
 msgstr "´ËֵΪÍæ¼Ò³õʼ²¿¶ÓµÄ·Ö²¼ÇøÓò°ë¾¶¡£"
 
-#: server/settings.c:473
+#: server/settings.c:464
 msgid "Starting gold per player"
 msgstr "ÿ¸öÍæ¼Ò¿ªÊ¼Ê±µÄ»Æ½ð"
 
-#: server/settings.c:474
+#: server/settings.c:465
 msgid "At the beginning of the game, each player is given this much gold."
 msgstr "ÔÚÓÎÏ·¿ªÊ¼Ê±£¬Ã¿¸öÍæ¼ÒµÃµ½Õâô¶àµÄ»Æ½ð¡£"
 
-#: server/settings.c:480
+#: server/settings.c:471
 msgid "Number of initial techs per player"
 msgstr "ÿ¸öÍæ¼Ò¿ªÊ¼Ê±µÄ¿Æ¼¼ÊýÁ¿"
 
-#: server/settings.c:481
+#: server/settings.c:472
 msgid ""
 "At the beginning of the game, each player is given this many technologies. "
 "The technologies chosen are random for each player. Depending on the value "
@@ -4270,11 +4288,11 @@ msgstr ""
 "ÔÚÓÎÏ·¿ªÊ¼Ê±£¬Ã¿¸öÍæ¼ÒµÃµ½Õâô¶àÖֿƼ¼¡£Ã¿¸öÍæ¼ÒµÃµ½µÄ¿Æ¼¼ÊÇËæ»úµÄ¡£¸ù¾Ý¹æÔò"
 "¼¯ÖÐ tech_cost_style µÄÖµµÄÉèÖ㬴óµÄ techlevel Öµ¿ÉÒÔʹÏÂÒ»¸ö¿Æ¼¼·Ç³£°º¹ó¡£"
 
-#: server/settings.c:490
+#: server/settings.c:481
 msgid "Technology cost multiplier percentage"
 msgstr "¿Æ¼¼³É±¾³ËÊý°Ù·Ö±È"
 
-#: server/settings.c:491
+#: server/settings.c:482
 msgid ""
 "This affects how quickly players can research new technology. All tech costs "
 "are multiplied by this amount (as a percentage). The base tech costs are "
@@ -4283,11 +4301,11 @@ msgstr ""
 "ÕâÓ°ÏìÁËÍæ¼ÒÄÜÒÔ¶à¿ìµÄËÙ¶ÈÑо¿Ð¿Ƽ¼¡£ËùÓпƼ¼µÄ³É±¾¶¼±»³ËÉÏ´ËÖµ£¨×÷Ϊ°Ù·Ö"
 "±È£©¡£»ù´¡µÄ¿Æ¼¼³É±¾ÓɹæÔò¼¯»òÆäËûÓÎÏ·ÉèÖþö¶¨¡£"
 
-#: server/settings.c:500
+#: server/settings.c:491
 msgid "Percentage penalty when changing tech"
 msgstr "¸Ä±ä¿Æ¼¼Ê±µÄËðʧ°Ù·Ö±È"
 
-#: server/settings.c:501
+#: server/settings.c:492
 msgid ""
 "If you change your current research technology, and you have positive "
 "research points, you lose this percentage of those research points. This "
@@ -4296,12 +4314,12 @@ msgstr ""
 "Èç¹ûÄú¸Ä±äµ±Ç°Ñо¿µÄ¿Æ¼¼£¬²¢ÇÒÄúÒѾ­ÓÐÁËÑо¿½ø¶È£¬½«Ëðʧ´Ë±ÈÀýµÄÑо¿½ø¶È¡£²»"
 "ÊÊÓÃÓÚÄúµ±Ç°»ØºÏ¸Õ¸Õ¿ªÊ¼Ñо¿Ä³Ïî¿Æ¼¼µÄÇé¿ö¡£"
 
-#: server/settings.c:510
+#: server/settings.c:501
 #, fuzzy
 msgid "Penalty when getting tech or gold from treaty"
 msgstr "´ÓЭ¶¨»ñµÃ¿Æ¼¼ËùÊܵÄËðʧ"
 
-#: server/settings.c:511
+#: server/settings.c:502
 #, fuzzy
 msgid ""
 "For each technology you gain from a diplomatic treaty, you lose research "
@@ -4312,11 +4330,11 @@ msgstr ""
 "¶ÔÿÏî´ÓÍ⽻Э¶¨»ñµÃµÄ¿Æ¼¼½øÕ¹£¬ÄúËðʧµÄÑо¿µãÊýÓëÑо¿Ò»ÏîнøÕ¹ËùÐèµãÊýµÄ±È"
 "ÀýµÈÓÚ´Ë°Ù·Ö±ÈÖµ¡£Èç¹û´ËÖµ·Ç0Äú¿ÉÄܵõ½¸ºµÄÑо¿µãÊý¡£"
 
-#: server/settings.c:521
+#: server/settings.c:512
 msgid "Penalty when getting tech from conquering"
 msgstr "´ÓÕ÷·þ»ñµÃ¿Æ¼¼ËùÊܵÄËðʧ"
 
-#: server/settings.c:522
+#: server/settings.c:513
 msgid ""
 "For each technology you gain by conquering an enemy city, you lose research "
 "points equal to this percentage of the cost to research a new technology. If "
@@ -4325,11 +4343,11 @@ msgstr ""
 "¶ÔÿÏî´ÓÕ÷·þµÐ·½³ÇÊÐËù»ñµÃµÄ¿Æ¼¼½øÕ¹£¬ÄúËðʧµÄÑо¿µãÊýÓëÑо¿Ò»ÏîнøÕ¹ËùÐèµã"
 "ÊýµÄ±ÈÀýµÈÓÚ´Ë°Ù·Ö±ÈÖµ¡£Èç¹û´ËÖµ·Ç0Äú¿ÉÄܵõ½¸ºµÄÑо¿µãÊý¡£"
 
-#: server/settings.c:532
+#: server/settings.c:523
 msgid "Penalty when getting a free tech"
 msgstr "»ñµÃÃâ·Ñ¿Æ¼¼ËùÊܵÄËðʧ"
 
-#: server/settings.c:533
+#: server/settings.c:524
 msgid ""
 "For each technology you gain \"for free\" (other than covered by diplcost or "
 "conquercost: specifically, from huts or from Great Library effects), you "
@@ -4341,11 +4359,11 @@ msgstr ""
 "˵£¬´ÓéÎÝ»ò´óͼÊé¹Ý»ñµÃµÄ£©£¬ÄúËðʧµÄÑо¿µãÊýÓëÑо¿Ò»ÏîнøÕ¹ËùÐèµãÊýµÄ±ÈÀý"
 "µÈÓÚ´Ë°Ù·Ö±ÈÖµ¡£Èç¹û´ËÖµ·Ç0Äú¿ÉÄܵõ½¸ºµÄÑо¿µãÊý¡£<"
 
-#: server/settings.c:544
+#: server/settings.c:535
 msgid "Food required for a city to grow"
 msgstr "³ÇÊÐÔö³¤ËùÐèµÄʳÎï"
 
-#: server/settings.c:545
+#: server/settings.c:536
 msgid ""
 "This is the base amount of food required to grow a city. This value is "
 "multiplied by another factor that comes from the ruleset and is dependent on "
@@ -4354,12 +4372,12 @@ msgstr ""
 "ÕâÊÇÔö³¤³ÇÊÐËùÐèҪʳÎïµÄ»ù±¾ÊýÁ¿¡£´ËÖµ½«±»³ËÉÏÀ´×Ô¹æÔò¼¯²¢ÇÒÒÀÀµÓÚ³ÇÊйæÄ£µÄ"
 "ÁíÒ»¸öÒò×Ó¡£"
 
-#: server/settings.c:553
+#: server/settings.c:544
 #, fuzzy
 msgid "Percentage food lost when building needed"
 msgstr "ÐèÒªÒýË®¹¤³ÌʱËðʧʳÎïµÄ°Ù·Ö±È"
 
-#: server/settings.c:554
+#: server/settings.c:545
 msgid ""
 "If a city would expand, but it can't because it needs an Aqueduct (or Sewer "
 "System), it loses this percentage of its foodbox (or half that amount when "
@@ -4368,22 +4386,22 @@ msgstr ""
 "Èç¹ûÒ»¸ö³ÇÊм´½«Ôö³¤£¬µ«ÊÇÒòΪÐèÒªÒýË®¹¤³Ì£¨»òÏÂË®µÀϵͳ£©¶ø²»ÄܽøÐУ¬Ëü½«Ê§"
 "È¥´Ë±ÈÀýµÄÁ¸²ÖÖеÄʳÎ»òÕß¼õ°ë£¬Èç¹û³ÇÊÐÓйȲֵĻ°£©¡£"
 
-#: server/settings.c:563
+#: server/settings.c:554
 msgid "Multiplier percentage for production costs"
 msgstr "Éú²ú³É±¾³ËÊý°Ù·Ö±È"
 
-#: server/settings.c:564
+#: server/settings.c:555
 msgid ""
 "This affects how quickly units and buildings can be produced.  The base "
 "costs are multiplied by this value (as a percentage)."
 msgstr ""
 "Ó°Ï첿¶ÓºÍ½¨ÖþÒÔ¶à¿ìËٶȱ»Éú²ú£¨ÐÞ½¨£©¡£»ù´¡³É±¾±»³ËÉÏ´ËÖµ£¨×÷Ϊ°Ù·Ö±È£©¡£"
 
-#: server/settings.c:578
+#: server/settings.c:569
 msgid "Minimum city size to get full trade"
 msgstr "»ñµÃÍêȫóÒ×µÄ×îС³ÇÊйæÄ£"
 
-#: server/settings.c:579
+#: server/settings.c:570
 msgid ""
 "There is a trade penalty in all cities smaller than this. The penalty is "
 "100% (no trade at all) for sizes up to notradesize, and decreases gradually "
@@ -4394,11 +4412,11 @@ msgstr ""
 "±¾Ã»ÓÐóÒ×£©£¬²¢Ëæ×ųÇÊйæÄ£Ôö¼Óµ½fulltradesizeÖð½¥¼õÉÙµ½0%£¨³ýÁËÕý³£µÄ¸¯°ÜÖ®"
 "ÍâûÓÐËðʧ£©¡£Çë²Î¼ûnotradesieze¡£"
 
-#: server/settings.c:589
+#: server/settings.c:580
 msgid "Maximum size of a city without trade"
 msgstr "ÎÞóÒ׵ijÇÊÐ×î´ó¹æÄ£"
 
-#: server/settings.c:590
+#: server/settings.c:581
 msgid ""
 "Cities do not produce any trade at all unless their size is larger than this "
 "amount. The produced trade increases gradually for cities larger than "
@@ -4407,11 +4425,11 @@ msgstr ""
 "ËùÓÐСÓÚµÈÓڴ˹æÄ£µÄ³ÇÊж¼²»»á²ú³öóÒס£Ã³Òײú³öÔÚ¹æÄ£ÊÇnotradesizeºÍ"
 "fulltradesizeÖ®¼äµÄ³ÇÊÐÖð½¥Ôö³¤¡£Ò²Çë²Î¼ûfulltradesize¡£"
 
-#: server/settings.c:599
+#: server/settings.c:590
 msgid "City size before people become unhappy"
 msgstr "³öÏÖÓÇÓôÊÐÃñ֮ǰµÄ³ÇÊйæÄ£"
 
-#: server/settings.c:600
+#: server/settings.c:591
 msgid ""
 "Before other adjustments, the first unhappysize citizens in a city are "
 "content, and subsequent citizens are unhappy. See also cityfactor."
@@ -4419,11 +4437,11 @@ msgstr ""
 "ÔÚûÓÐÆäËüµ÷ÕûµÄÇé¿öÏ£¬Ò»¸ö³ÇÊÐÖÐ×î³õµÄunhappysize¸öÊÐÃñÊÇÂú×ãµÄ£¬½ÓÏÂÀ´µÄÊÐ"
 "ÃñÊÇÓÇÓôµÄ¡£Çë²Î¼ûcityfactor¡£"
 
-#: server/settings.c:608
+#: server/settings.c:599
 msgid "Number of cities for higher unhappiness"
 msgstr "²úÉú¸ü¸ßÓÇÓôµÄ³ÇÊÐÊýÄ¿¡£"
 
-#: server/settings.c:609
+#: server/settings.c:600
 msgid ""
 "When the number of cities a player owns is greater than cityfactor, one "
 "extra citizen is unhappy before other adjustments; see also unhappysize. "
@@ -4434,11 +4452,11 @@ msgstr ""
 "±ä³ÉÓÇÓôµÄ£»Çë²Î¼ûunhappysize¡£ÕâÊǼÙÉèÔÚÃñÖ÷ÖÆϵÄÇé¿ö£»¶ÔÓÚÆäËüÕþ¸®£¬Ð§¹û·¢"
 "ÉúÔÚ¸üÉٵijÇÊÐÊýĿʱ¡£"
 
-#: server/settings.c:618
+#: server/settings.c:609
 msgid "Minimum distance between cities"
 msgstr "³ÇÊÐÖ®¼äµÄ×îС¾àÀë"
 
-#: server/settings.c:619
+#: server/settings.c:610
 #, fuzzy
 msgid ""
 "When a player attempts to found a new city, there may be no other city in "
@@ -4450,32 +4468,32 @@ msgstr ""
 "citymindistÊÇ3£¬ÄÇôÔÚÿ¸ö·½ÏòÉÏÁ½¸ö³ÇÊÐÖ®¼äÖÁÉÙÒªÓÐ2¸ö¿ÕµÄ·½¸ñ¡£Èç¹ûÉèÖÃΪ0"
 "£¨Ä¬ÈÏ£©£¬½«Ê¹Óõ±Ç°¹æÔò¼¯ÖеÄÖµ¡£"
 
-#: server/settings.c:630
+#: server/settings.c:621
 msgid "Number of turns between rapture effect"
 msgstr "²úÉú¿ñ»¶Ð§¹ûÐèÒªµÄ»ØºÏÊý"
 
-#: server/settings.c:631
+#: server/settings.c:622
 msgid ""
 "Sets the number of turns between rapture growth of a city. If set to n a "
 "city will grow after celebrating for n+1 turns."
 msgstr ""
 "ÉèÖóÇÊÐÔÚ¿ñ»¶Ôö³¤Ö®¼äµÄ»ØºÏÊý¡£Èç¹ûÉèÖÃΪn£¬³ÇÊн«ÔÚ¿ñ»¶n+1¸ö»ØºÏºóÔö³¤¡£"
 
-#: server/settings.c:640
+#: server/settings.c:631
 msgid "Chance for conquered building destruction"
 msgstr "±»Õ÷·þ½¨Öþ»Ù»µµÄ»ú»á"
 
-#: server/settings.c:641
+#: server/settings.c:632
 msgid ""
 "When a player conquers a city, each city improvement has this percentage "
 "chance to be destroyed."
 msgstr "µ±Íæ¼ÒÕ÷·þÒ»¸ö³ÇÊÐʱ£¬Ã¿¸ö³ÇÊн¨ÖþÓд˰ٷֱȵĻú»á±»´Ý»Ù¡£"
 
-#: server/settings.c:647
+#: server/settings.c:638
 msgid "Chance of moving into tile after attack"
 msgstr "¹¥»÷ºóÒƶ¯µ½·½¸ñµÄ»ú»á"
 
-#: server/settings.c:648
+#: server/settings.c:639
 msgid ""
 "If set to 0, combat is Civ1/2-style (when you attack, you remain in place). "
 "If set to 100, attacking units will always move into the tile they attacked "
@@ -4487,21 +4505,21 @@ msgstr ""
 "µÄ²¿¶ÓÈôÓ®µÃÕ½¶·£¨²¢ÇÒ·½¸ñÖв»ÔÙÓез½²¿¶Ó£©½«×ÜÊÇÒƶ¯µ½ËüÃÇËù½ø¹¥µÄ·½¸ñ¡£Èç"
 "ÉèΪ0µ½100Ö®¼äµÄÖµ£¬½«×÷Ϊ¡°Õ¼Á족ÁìÍÁ»ú»áµÄ°Ù·Ö±È¡£"
 
-#: server/settings.c:659
+#: server/settings.c:650
 msgid "Turn on/off server-side autoattack"
 msgstr "´ò¿ª/¹Ø±Õ·þÎñÆ÷¶Ë×Ô¶¯¹¥»÷"
 
-#: server/settings.c:660
+#: server/settings.c:651
 msgid ""
 "If set to on, units with move left will automatically consider attacking "
 "enemy units that move adjacent to them."
 msgstr "Èç¹û´ò¿ª£¬¾ßÓÐÒƶ¯Á¦µÄ²¿¶Ó½«×Ô¶¯¿¼Âǹ¥»÷¿¿½üËüÃǵĵз½²¿¶Ó¡£"
 
-#: server/settings.c:666
+#: server/settings.c:657
 msgid "Reduce city population after attack"
 msgstr "ÔÚ¹¥»÷ºó¼õÉÙ³ÇÊÐÈË¿Ú"
 
-#: server/settings.c:667
+#: server/settings.c:658
 msgid ""
 "This flag indicates whether city population is reduced after successful "
 "attack of enemy unit, depending on its movement type (OR-ed):\n"
@@ -4517,11 +4535,11 @@ msgstr ""
 "  4£½Ö±Éý·É»ú\n"
 "  8£½¿ÕÖв¿¶Ó"
 
-#: server/settings.c:679
+#: server/settings.c:670
 msgid "National borders radius"
 msgstr "¹ú½ç°ë¾¶"
 
-#: server/settings.c:680
+#: server/settings.c:671
 msgid ""
 "If this is set to greater than 0, then any land tiles within the given "
 "radius of a city will be owned by that nation. Special rules apply for ocean "
@@ -4530,21 +4548,21 @@ msgstr ""
 "Èç¹ûÉèÖÃΪ´óÓÚ0£¬Ôò³ÇÊÐÖÜΧָ¶¨°ë¾¶·¶Î§ÄڵĽµØ·½¸ñ½«ÓɸÃÃñ×åËùÓС£¶ÔÓÚº£Ñó·½"
 "¸ñºÍÔÚ³¬¹ýÒ»¸öÃñ×åµÄ³ÇÊз¶Î§Äڵķ½¸ñ£¬½«ÓÉÌØÊâµÄ¹æÔò¾õµÃÊôÓÚÄĸöÃñ×å¡£"
 
-#: server/settings.c:690
+#: server/settings.c:681
 msgid "Units inside borders cause no unhappiness"
 msgstr "¾üʲ¿¶Ó¹ú½çÄÚ²»»áÒýÆðÓÇÓô¡£"
 
-#: server/settings.c:691
+#: server/settings.c:682
 msgid ""
 "If this is set, units will not cause unhappiness when inside your own "
 "borders."
 msgstr "Èç¹ûÉèÖã¬ÔòÔÚÄú×Ô¼ºµÄ¹ú½çÄÚ¾üʲ¿¶Ó²»»áÒýÆðÓÇÓô¡£"
 
-#: server/settings.c:697
+#: server/settings.c:688
 msgid "Ability to do diplomacy with other players"
 msgstr "ÓëÆäËûÍæ¼Ò½øÐÐÍâ½»µÄÄÜÁ¦"
 
-#: server/settings.c:698
+#: server/settings.c:689
 msgid ""
 "0 = default; diplomacy is enabled for everyone.\n"
 "1 = diplomacy is only allowed between human players.\n"
@@ -4558,11 +4576,11 @@ msgstr ""
 "3 = ½öÔÊÐíÔÚÍŶÓÖ®ÄÚ½øÐÐÍâ½»¡£\n"
 "4 = ¶ÔËùÓÐÍæ¼Ò½ûÖ¹Íâ½»¡£"
 
-#: server/settings.c:707
+#: server/settings.c:698
 msgid "Allowed city names"
 msgstr "ÔÊÐíµÄ³ÇÊÐÃû³Æ"
 
-#: server/settings.c:708
+#: server/settings.c:699
 msgid ""
 "0 = There are no restrictions: players can have multiple cities with the "
 "same names.\n"
@@ -4586,11 +4604,11 @@ msgstr ""
 "3 = ÀàËÆ2£¬µ«ÊÇÍæ¼Ò²»ÔÊÐíʹÓÃÁíÒ»¸öÃñ×åµÄĬÈϳÇÊÐÃû×Ö£¬³ý·ÇÄÇÒ²ÊÇËûÃñ×åµÄĬÈÏ"
 "³ÇÊÐÃû×Ö¡£"
 
-#: server/settings.c:736
+#: server/settings.c:727
 msgid "Barbarian appearance frequency"
 msgstr "Ò°È˳öÏÖƵÂÊ"
 
-#: server/settings.c:737
+#: server/settings.c:728
 msgid ""
 "0 = no barbarians \n"
 "1 = barbarians only in huts \n"
@@ -4604,19 +4622,19 @@ msgstr ""
 "3 = ¾­³£Ò°ÈËÆðÒå\n"
 "4 = ¿ñ±©µÄÓÎÄÁ²¿Â䣬ºÜ¶àÒ°ÈË"
 
-#: server/settings.c:747
+#: server/settings.c:738
 msgid "Barbarian onset year"
 msgstr "Ò°È˳öÏÖÄê´ú"
 
-#: server/settings.c:748
+#: server/settings.c:739
 msgid "Barbarians will not appear before this year."
 msgstr "Ò°È˲»»áÔÚ´ËÄê´ú֮ǰ³öÏÖ¡£"
 
-#: server/settings.c:754
+#: server/settings.c:745
 msgid "Length in turns of revolution"
 msgstr "¸ïÃüËùÐè»ØºÏÊý"
 
-#: server/settings.c:755
+#: server/settings.c:746
 msgid ""
 "When changing governments, a period of anarchy lasting this many turns will "
 "occur. Setting this value to 0 will give a random length of 1-6 turns."
@@ -4624,11 +4642,11 @@ msgstr ""
 "µ±¸Ä±äÕþ¸®ÀàÐÍʱ£¬½«»áÓÐÒ»¶Î³ÖÐøÕâô¾ÃµÄÎÞÕþ¸®×´Ì¬Ê±ÆÚ¡£ÉèÖÃΪ0½«Ê¹ÓÃ1-6¸ö»Ø"
 "ºÏÖ®¼äµÄËæ¼´ÊýÖµ¡£"
 
-#: server/settings.c:764
+#: server/settings.c:755
 msgid "Whether to enable fog of war"
 msgstr "ÊÇ·ñʹÄÜÕ½Îí"
 
-#: server/settings.c:765
+#: server/settings.c:756
 msgid ""
 "If this is set to 1, only those units and cities within the vision range of "
 "your own units and cities will be revealed to you. You will not see new "
@@ -4637,30 +4655,30 @@ msgstr ""
 "Èç¹ûÉèÖÃΪ1£¬Ö»ÓÐÄÇЩλÓÚÄú×Ô¼ºµÄ²¿¶ÓºÍ³ÇÊÐÊÓÒ°·¶Î§ÄڵIJ¿¶ÓºÍ³ÇÊлáÏÔʾ¸øÄú¡£"
 "Äú²»ÄÜ¿´µ½¹Û²ì²»µ½µÄ·½¸ñÄÚµÄгÇÊлòµØÐα仯¡£"
 
-#: server/settings.c:773
+#: server/settings.c:764
 msgid "Base chance for diplomats and spies to succeed."
 msgstr "Íâ½»¹ÙºÍ¼äµý³É¹¦µÄ»ù´¡¼¸ÂÊ¡£"
 
-#: server/settings.c:775
+#: server/settings.c:766
 #, no-c-format
 msgid ""
 "The chance of a spy returning from a successful mission and the base chance "
 "of success for diplomats and spies."
 msgstr "¼äµý³É¹¦Íê³ÉʹÃüºó·µ»ØµÄ»ú»á£¬ÒÔ¼°Íâ½»¹ÙºÍ¼äµý³É¹¦µÄ»ù´¡»ú»á¡£"
 
-#: server/settings.c:782
+#: server/settings.c:773
 msgid "Whether to allow space race"
 msgstr "ÊÇ·ñÔÊÐíÌ«¿Õ¾ºÈü"
 
-#: server/settings.c:783
+#: server/settings.c:774
 msgid "If this option is set to 1, players can build spaceships."
 msgstr "Èç¹û´ËÑ¡ÏîΪ 1£¬Íæ¼Ò¿ÉÒÔ½¨ÔìÓîÖæ·É´¬¡£"
 
-#: server/settings.c:789
+#: server/settings.c:780
 msgid "Minimum number of cities for civil war"
 msgstr "·¢ÉúÄÚÕ½µÄ×îС³ÇÊÐÊýÄ¿"
 
-#: server/settings.c:790
+#: server/settings.c:781
 msgid ""
 "A civil war is triggered when a player has at least this many cities and the "
 "player's capital is captured. If this option is set to the maximum value, "
@@ -4669,11 +4687,11 @@ msgstr ""
 "Èç¹ûÍæ¼ÒÓµÓÐÖÁÉÙÕâô¶àµÄ³ÇÊУ¬²¢ÇÒÍæ¼ÒµÄÊ׶¼±»Õ¼Á죬½«»á·¢ÉúÄÚÕ½¡£Èç¹û´ËÑ¡Ïî"
 "±»ÉèÖÃΪ×î´óÖµ£¬½«½ûÖ¹ÄÚÕ½¡£"
 
-#: server/settings.c:799
+#: server/settings.c:790
 msgid "Turns until player contact is lost"
 msgstr "Íæ¼ÒÁªÏµ¶ªÊ§µÄ»ØºÏÊý"
 
-#: server/settings.c:800
+#: server/settings.c:791
 msgid ""
 "Players may meet for diplomacy this number of turns after their units have "
 "last met, even when they do not have an embassy. If set to zero, then "
@@ -4682,12 +4700,12 @@ msgstr ""
 "Íæ¼ÒÔÚËûÃǵIJ¿¶ÓÉÏ´ÎÏàÓöÕâô¶à¸ö»ØºÏÄÚ¿ÉÒÔ½øÐÐÍâ½»»áÎ¼´Ê¹ËûÃÇûÓдóʹ¹Ý¡£"
 "ÈôÉè³É 0 ÔòÍæ¼Ò³ý·ÇÓдóʹ¹Ý²»ÄÜ»áÎî¡£"
 
-#: server/settings.c:810
+#: server/settings.c:801
 #, fuzzy
 msgid "Rebuild palace whenever capital is conquered"
 msgstr "ÈôÊ׶¼±»Õ÷·þ¾ÍÖؽ¨»Ê¹¬"
 
-#: server/settings.c:811
+#: server/settings.c:802
 msgid ""
 "If this is set to 1, when the capital is conquered the palace is "
 "automatically rebuilt for free in another randomly choosen city. This is "
@@ -4697,21 +4715,21 @@ msgstr ""
 "Èç¹û´ËÑ¡Ïî±»ÉèÖÃΪ1£¬µ±Ê׶¼±»Õ÷·þºó£¬»Ê¹¬×Ô¶¯ÔÚÒ»¸öËæ»úÑ¡ÔñµÄ³ÇÊÐÖÐÃâ·Ñ½¨Ôì¡£"
 "ÕâºÜÖØÒªÒòΪÐÞ½¨»Ê¹¬ËùÐèÒªµÄ¿Æ¼¼½«±»ºöÂÔ¡£"
 
-#: server/settings.c:820
+#: server/settings.c:811
 msgid "Whether to use natural city names"
 msgstr "ÊÇ·ñʹÓÃ×ÔÈ»³ÇÊÐÃû"
 
-#: server/settings.c:821
+#: server/settings.c:812
 msgid ""
 "If enabled, the default city names will be determined based on the "
 "surrounding terrain."
 msgstr "Èç¹ûÆôÓ㬽«¸ù¾ÝÖÜΧµØÐÎÈ·¶¨Ä¬ÈϳÇÊÐÃû¡£"
 
-#: server/settings.c:834
+#: server/settings.c:825
 msgid "Players that users are allowed to take"
 msgstr "Óû§¿ÉÒÔ½ÓÌæµÄÍæ¼Ò"
 
-#: server/settings.c:835
+#: server/settings.c:826
 msgid ""
 "This should be a string of characters, each of which specifies a type or "
 "status of a civilization (player). Clients will only be permitted to take or "
@@ -4770,44 +4788,47 @@ msgstr ""
 "     4 = ²»ÔÊÐí¿ØÖÆÕߣ¬ÔÊÐíÅÔ¹ÛÕߣ»\n"
 "\n"
 
-#: server/settings.c:870
+#: server/settings.c:861
 msgid "Whether AI-status toggles with connection"
 msgstr "ÊÇ·ñËæÁ¬½Ó״̬Çл» AI ״̬"
 
-#: server/settings.c:871
+#: server/settings.c:862
 msgid ""
 "If this is set to 1, AI status is turned off when a player connects, and on "
 "when a player disconnects."
 msgstr "Èç¹û´ËÑ¡Ïî±»ÉèÖÃΪ1£¬ÄÇôµ±Íæ¼ÒÁ¬ÈëʱAI״̬±»¹Ø±Õ£¬Íæ¼Ò¶Ï¿ªÊ±±»´ò¿ª¡£"
 
-#: server/settings.c:877
+#: server/settings.c:868
 msgid "Year the game ends"
 msgstr "ÓÎÏ·½áÊøµÄÄê´ú"
 
-#: server/settings.c:878
+#: server/settings.c:869
 msgid "The game will end at the end of the given year."
 msgstr "ÓÎÏ·½«ÔÚÖ¸¶¨µÄÄê´ú½áÊøºó½áÊø¡£"
 
-#: server/settings.c:884
+#: server/settings.c:875
 msgid "Maximum seconds per turn"
 msgstr "ÿһ»ØºÏµÄ×î´óÃëÊý"
 
-#: server/settings.c:885
+#: server/settings.c:876
+#, fuzzy
 msgid ""
 "If all players have not hit \"Turn Done\" before this time is up, then the "
 "turn ends automatically. Zero means there is no timeout. In servers compiled "
-"with debugging, a timeout of -1 sets the autogame test mode. Use this with "
-"the command \"timeoutincrease\" to have a dynamic timer."
+"with debugging, a timeout of -1 sets the autogame test mode. Only "
+"connections with hack level access may set the timeout to lower than 30 "
+"seconds. Use this with the command \"timeoutincrease\" to have a dynamic "
+"timer."
 msgstr ""
 "Èç¹ûÔÚÕâô³¤µÄʱ¼äÄÚ»¹ÓÐÍæ¼ÒûÓеã»÷¡°»ØºÏ½áÊø¡±°´Å¥£¬Ôò»ØºÏ×Ô¶¯½áÊø¡£0Òâζ×Å"
 "ûÓг¬Ê±¡£ÔÚ´øÓÐdebug¹¦ÄܱàÒëµÄ·þÎñÆ÷ÖУ¬³¬Ê±ÖµÎª-1½«ÉèÖÃ×Ô¶¯ÓÎÏ·²âÊÔģʽ¡£ºÍ"
 "ÃüÁî¡°timeoutincrease¡±Ò»ÆðʹÓÃÒÔ»ñµÃ¶¯Ì¬³¬Ê±Ê±¼ä¡£"
 
-#: server/settings.c:895
+#: server/settings.c:888
 msgid "Timeout at least n seconds when enemy moved"
 msgstr "µÐÈËÒƶ¯Ê±µÄ×îÉÙ³¬Ê±ÃëÊý"
 
-#: server/settings.c:896
+#: server/settings.c:889
 #, fuzzy
 msgid ""
 "Any time a unit moves while in sight of an enemy player, the remaining "
@@ -4816,21 +4837,21 @@ msgstr ""
 "ÎÞÂÛºÎʱµ±²¿¶ÓÒƶ¯µ½µÐÈËÍæ¼ÒµÄÊÓÒ°ÖÐʱ£¬Èç¹ûÊ£ÓàµÄ³¬Ê±Ê±¼ä±È´ËֵСÔò±»ÉèÖÃΪ"
 "´ËÖµ¡£"
 
-#: server/settings.c:905
+#: server/settings.c:898
 msgid "Whether to have simultaneous player phases."
 msgstr "Íæ¼ÒÊÇ·ñͬʱÒƶ¯¡£"
 
-#: server/settings.c:906
+#: server/settings.c:899
 msgid ""
 "If true, all players' movement phases will occur simultaneously; if false, "
 "then players will alternate movement."
 msgstr "Èç¹ûÉèÖÃΪÕ棬ËùÓÐÍæ¼Ò½«Í¬Ê±Òƶ¯£»Èç¹ûΪ¼ÙÔòÍæ¼Ò½«½»»¥Òƶ¯¡£"
 
-#: server/settings.c:913
+#: server/settings.c:906
 msgid "Seconds to let a client's network connection block"
 msgstr "¿Í»§¶ËÁ¬½Ó¿ÉÒÔ×èÈûµÄÃëÊý"
 
-#: server/settings.c:914
+#: server/settings.c:907
 msgid ""
 "If a network connection is blocking for a time greater than this value, then "
 "the connection is closed. Zero means there is no timeout (although "
@@ -4839,11 +4860,11 @@ msgstr ""
 "Èç¹ûÒ»¸öÍøÂçÁ¬½Ó×èÈû³¬¹ý´Ëʱ¼ä£¬Ôò¸ÃÁ¬½Ó±»¹Ø±Õ¡£0Òâζ×ÅûÓг¬Ê±£¨¾¡¹ÜÁ¬½Ó×îÖÕ"
 "½«»á±»×Ô¶¯¶Ï¿ª£©¡£"
 
-#: server/settings.c:923
+#: server/settings.c:916
 msgid "Max seconds for network buffers to drain"
 msgstr "µÈ´ýÍøÂ绺³åÇø±ä¿ÕµÄ×î´óÃëÊý"
 
-#: server/settings.c:924
+#: server/settings.c:917
 msgid ""
 "The server will wait for up to the value of this parameter in seconds, for "
 "all client connection network buffers to unblock. Zero means the server will "
@@ -4852,30 +4873,30 @@ msgstr ""
 "·þÎñÆ÷½«µÈ´ý×î¶à´Ë²ÎÊý³¤µÄʱ¼ä£¬ÓÃÓÚʹËùÓеĿͻ§¶ËÁ¬½Ó»º³åÇø½â³ý×èÈû¡£0Òâζ×Å"
 "·þÎñÆ÷¸ù±¾²»µÈ´ý¡£"
 
-#: server/settings.c:932
+#: server/settings.c:925
 msgid "Seconds between PINGs"
 msgstr "PING Ö®¼ä¼ä¸ôµÄÃëÊý"
 
-#: server/settings.c:933
+#: server/settings.c:926
 msgid ""
 "The civserver will poll the clients with a PING request each time this "
 "period elapses."
 msgstr "ÿ¸ôÕâô¾Ã·þÎñÆ÷½«Í¨¹ýÒ»¸öPINGÇëÇóÂÖѯ¿Í»§¶Ë¡£"
 
-#: server/settings.c:940
+#: server/settings.c:933
 msgid "Time to cut a client"
 msgstr "¶Ï¿ªÒ»¸ö¿Í»§¶ËµÄʱ¼ä"
 
-#: server/settings.c:941
+#: server/settings.c:934
 msgid ""
 "If a client doesn't reply to a PING in this time the client is disconnected."
 msgstr "Èç¹û¿Í»§¶ËÔÚ´Ëʱ³¤ÄÚûÓÐÏìÓ¦PINGÇëÇ󣬸ÿͻ§¶Ë½«±»¶Ï¿ª¡£"
 
-#: server/settings.c:947
+#: server/settings.c:940
 msgid "Turn-blocking game play mode"
 msgstr "»ØºÏ×èÈûģʽ"
 
-#: server/settings.c:948
+#: server/settings.c:941
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn is not advanced until all players have "
@@ -4883,11 +4904,11 @@ msgid ""
 msgstr ""
 "Èç¹ûÉèÖÃΪ1£¬ÔòÖ±µ½ËùÓÐÍæ¼Ò¶¼½áÊø»ØºÏ£¬°üÀ¨¶Ï¿ªÁ¬½ÓµÄÍæ¼Ò£¬ÓÎÏ·»ØºÏ²ÅËã½áÊø¡£"
 
-#: server/settings.c:955
+#: server/settings.c:948
 msgid "Fixed-length turns play mode"
 msgstr "¹Ì¶¨Ê±¼ä»ØºÏģʽ"
 
-#: server/settings.c:956
+#: server/settings.c:949
 #, fuzzy
 msgid ""
 "If this is set to 1 the game turn will not advance until the timeout has "
@@ -4896,11 +4917,11 @@ msgstr ""
 "Èç¹û±»ÉèÖÃΪ1£¬ÔòÓÎÏ·µÄÿ¸ö»ØºÏÔÚ³¬Ê±Ö®Ç°²»»á½áÊø£¬¼´Ê¹ËùÓÐÍæ¼Ò¶¼µã»÷ÁË¡°»ØºÏ"
 "½áÊø¡±¡£"
 
-#: server/settings.c:963
+#: server/settings.c:956
 msgid "What is in the Demographics report"
 msgstr "ÈË¿Úͳ¼Æ±¨¸æµÄÄÚÈÝ"
 
-#: server/settings.c:964
+#: server/settings.c:957
 msgid ""
 "This should be a string of characters, each of which specifies the inclusion "
 "of a line of information in the Demographics report.\n"
@@ -4938,21 +4959,21 @@ msgstr ""
 "    b = ÏÔʾ¡°×î¼ÑÃñ×塱ÁÐ\n"
 "£¨ÕâЩ×Ö·ûµÄ˳Ðò²»ÖØÒª£¬µ«ÊÇËüÃǵĴóСдÖØÒª¡££©"
 
-#: server/settings.c:988
+#: server/settings.c:981
 msgid "Turns per auto-save"
 msgstr "×Ô¶¯´æÅÌÖ®¼äµÄ»ØºÏÊý"
 
-#: server/settings.c:989
+#: server/settings.c:982
 msgid ""
 "The game will be automatically saved per this number of turns. Zero means "
 "never auto-save."
 msgstr "ÿ¸ôÕâô¶à¸ö»ØºÏÓÎÏ·½«×Ô¶¯±£´æ¡£0Òâζ×Ų»×Ô¶¯±£´æ¡£"
 
-#: server/settings.c:999 server/settings.c:1010
+#: server/settings.c:992 server/settings.c:1003
 msgid "Savegame compression level"
 msgstr "´æÅÌÓÎÏ·µÄѹËõ¼¶±ð"
 
-#: server/settings.c:1000 server/settings.c:1011
+#: server/settings.c:993 server/settings.c:1004
 msgid ""
 "If non-zero, saved games will be compressed using zlib (gzip format). Larger "
 "values will give better compression but take longer. If the maximum is zero "
@@ -4961,22 +4982,22 @@ msgstr ""
 "Èô·Ç0£¬±£´æµÄÓÎÏ·½«±»Ê¹ÓÃzlib£¨gzip¸ñʽ£©Ñ¹Ëõ¡£ÖµÔ½´ó½«µÃµ½¸üºÃµÄѹËõЧ¹ûµ«ÊÇ"
 "½«ºÄ·Ñ¸ü³¤µÄʱ¼ä¡£Èô×î´óֵΪ0±íÃ÷´Ë·þÎñÆ÷±»±àÒëΪ²»ÄÜʹÓÃzlib¡£"
 
-#: server/settings.c:1022
+#: server/settings.c:1015
 msgid "Auto-save name prefix"
 msgstr "×Ô¶¯±£´æÃû³Æǰ׺"
 
-#: server/settings.c:1023
+#: server/settings.c:1016
 msgid ""
 "Automatically saved games will have name \"<prefix><year>.sav\". This "
 "setting sets the <prefix> part."
 msgstr ""
 "×Ô¶¯±£´æµÄÓÎÏ·½«¾ßÓÐÃû×Ö¡°<ǰ׺><Äê´ú>.sav¡±¡£´ËÑ¡ÏÉèÖÃ<ǰ׺>²¿·ÖµÄ¸ñʽ¡£"
 
-#: server/settings.c:1030
+#: server/settings.c:1023
 msgid "Whether to log player statistics"
 msgstr "ÊÇ·ñ¼Ç¼Íæ¼Òͳ¼ÆÐÅÏ¢"
 
-#: server/settings.c:1031
+#: server/settings.c:1024
 msgid ""
 "If this is set to 1, player statistics are appended to the file \"civscore."
 "log\" every turn. These statistics can be used to create power graphs after "
@@ -4989,7 +5010,7 @@ msgstr ""
 msgid "Server cannot read standard input. Ignoring input."
 msgstr "·þÎñÆ÷ÎÞ·¨¶ÁÈë±ê×¼ÊäÈë¡£ºöÂÔÊäÈë¡£"
 
-#: server/sernet.c:921
+#: server/sernet.c:922
 #, c-format
 msgid "Server: bad address: [%s:%d]."
 msgstr "·þÎñÆ÷£º´íÎóµÄµØÖ·£º[%s:%d]¡£"
@@ -5118,102 +5139,102 @@ msgstr "
 msgid "Game saved as %s"
 msgstr "ÓÎÏ·ÒÑ´æΪ %s"
 
-#: server/srv_main.c:960
+#: server/srv_main.c:962
 msgid "The game is already running."
 msgstr "ÓÎÏ·ÒѾ­ÔËÐС£"
 
-#: server/srv_main.c:968
+#: server/srv_main.c:970
 #, c-format
 msgid "%s lost control cmdlevel on game start.  Use voting from now on."
 msgstr "ÓÎÏ·¿ªÊ¼Ê± %s ʧȥÁË¿ØÖÆÃüÁ±ð¡£´ÓÏÖÔÚ¿ªÊ¼Ê¹ÓÃͶƱ¡£"
 
-#: server/srv_main.c:975
+#: server/srv_main.c:977
 msgid "Starting game."
 msgstr "ÕýÔÚÆô¶¯ÓÎÏ·¡£"
 
-#: server/srv_main.c:1032
+#: server/srv_main.c:1039
 #, c-format
 msgid "request for unknown report (type %d)"
 msgstr "δ֪µÄ±¨¸æÇëÇó£¨ÀàÐÍ %d£©"
 
-#: server/srv_main.c:1097
+#: server/srv_main.c:1104
 #, c-format
 msgid "Warning: rejecting old client %s"
 msgstr "¾¯¸æ£º ¾Ü¾ø¾ÉµÄ¿Í»§¶Ë %s "
 
-#: server/srv_main.c:1199
+#: server/srv_main.c:1206
 #, c-format
 msgid "Got a packet of type %d from a dead or observer player"
 msgstr "ÊÕµ½À´×ÔËÀÍö»ò¹Û²ìÕßÍæ¼ÒµÄÀàÐÍΪ %d µÄ±¨ÎÄ"
 
-#: server/srv_main.c:1299
+#: server/srv_main.c:1306
 msgid "Please choose a non-blank name."
 msgstr "ÇëÑ¡ÔñÒ»¸ö·Ç¿ÕµÄÃû×Ö¡£"
 
-#: server/srv_main.c:1315
+#: server/srv_main.c:1322
 msgid "That nation is already in use."
 msgstr "¸ÃÃñ×åÒѾ­±»Ê¹ÓÃÁË¡£"
 
-#: server/srv_main.c:1331
+#: server/srv_main.c:1338
 #, c-format
 msgid "Another player already has the name '%s'.  Please choose another name."
 msgstr "ÆäËüµÄÍæ¼ÒÒѾ­Ê¹ÓÃÁËÃû×Ö¡°%s¡±¡£ÇëÑ¡ÔñÁíÒ»¸öÃû×Ö¡£"
 
-#: server/srv_main.c:1352
+#: server/srv_main.c:1359
 msgid "Please choose a name containing only ASCII characters."
 msgstr "ÇëÑ¡ÔñÒ»¸ö½ö°üº¬ ASCII ×Ö·ûµÄÃû×Ö¡£"
 
-#: server/srv_main.c:1451
+#: server/srv_main.c:1458
 #, c-format
 msgid "%s nation is not available in this scenario."
 msgstr "Ãñ×å %s ÔÚÕâ¸öÇé¾°Öв»ÄÜʹÓá£"
 
-#: server/srv_main.c:1457
+#: server/srv_main.c:1464
 #, c-format
 msgid "%s nation is already in use."
 msgstr "%s Ãñ×åÒѾ­±»Ê¹ÓÃÁË¡£"
 
-#: server/srv_main.c:1475
+#: server/srv_main.c:1482
 #, c-format
 msgid "%s is the %s ruler %s."
 msgstr "%s ³ÉΪ %s µÄͳÖÎÕß %s ¡£"
 
-#: server/srv_main.c:1531
+#: server/srv_main.c:1538
 #, c-format
 msgid "Waiting to start game: %d out of %d players are ready to start."
 msgstr "µÈ´ýÓÎÏ·¿ªÊ¼£º%2$d ¸öÍæ¼ÒÖÐµÄ %1$d ¸öÒѾ­×¼±¸¾ÍÐ÷¡£"
 
-#: server/srv_main.c:1580 server/srv_main.c:1584
+#: server/srv_main.c:1582 server/srv_main.c:1586
 #, c-format
 msgid "%s has been added as %s level AI-controlled player."
 msgstr "%s ÒѾ­×÷Ϊ %s ¼¶±ðµÄ AI Íæ¼Ò¼ÓÈë¡£"
 
-#: server/srv_main.c:1718
+#: server/srv_main.c:1728
 #, c-format
 msgid "Player %d"
 msgstr "Íæ¼Ò %d"
 
-#: server/srv_main.c:1729 server/srv_main.c:1735
+#: server/srv_main.c:1739 server/srv_main.c:1745
 #, c-format
 msgid "%s rules the %s."
 msgstr "%s ͳÖÎ %s¡£"
 
-#: server/srv_main.c:1900
+#: server/srv_main.c:1910
 msgid ""
 "This civserver program has player authentication support, but it's currently "
 "not in use."
 msgstr ""
 
-#: server/srv_main.c:1951
+#: server/srv_main.c:1961
 #, c-format
 msgid "Sending info to metaserver [%s]"
 msgstr "½«ÐÅÏ¢·¢Ë͵½Ôª·þÎñÆ÷ [%s]"
 
-#: server/srv_main.c:1982
+#: server/srv_main.c:1992
 msgid "The game is over..."
 msgstr "ÓÎÏ·½áÊø..."
 
-#: server/srv_main.c:2195
+#: server/srv_main.c:2205
 msgid "Now accepting new client connections."
 msgstr "ÏÖÔÚ½ÓÊÜпͻ§¶ËµÄÁ¬½Ó¡£"
 
@@ -5234,7 +5255,7 @@ msgstr "(Ä£
 
 #. TRANS: unrecognized command
 #. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:412
+#: server/stdinhand.c:368 client/citydlg_common.c:416
 #: client/gui-gtk-2.0/inteldlg.c:367 client/gui-sdl/inteldlg.c:295
 #: client/gui-sdl/inteldlg.c:307 client/gui-win32/inteldlg.c:147
 #: client/gui-xaw/inteldlg.c:265
@@ -5408,7 +5429,7 @@ msgstr "
 msgid "Removed player %s from the game."
 msgstr "´ÓÓÎÏ·ÖÐɾ³ýÍæ¼Ò %s¡£"
 
-#: server/stdinhand.c:1016 server/stdinhand.c:3297 server/stdinhand.c:3410
+#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
 #, c-format
 msgid "Name \"%s\" disallowed for security reasons."
 msgstr "³öÓÚ°²È«µÄÔ­Òò²»ÔÊÐíʹÓÃÃû×Ö¡°%s¡±¡£"
@@ -5481,200 +5502,200 @@ msgid ""
 "Cannot increase command access level to '%s'; you only have '%s' yourself."
 msgstr "ÎÞ·¨½«ÃüÁî·ÃÎʼ¶±ðÔö¼Óµ½¡°%s¡±£»Äú×Ô¼ºÖ»ÓС°%s¡±¡£"
 
-#: server/stdinhand.c:1326 server/stdinhand.c:1374
+#: server/stdinhand.c:1326 server/stdinhand.c:1375
 #, c-format
 msgid "Command access level set to '%s' for connection %s."
 msgstr "½«Á¬½Ó %2$s µÄÃüÁî·ÃÎʼ¶±ðÉèÖÃΪ¡°%1$s¡±¡£"
 
-#: server/stdinhand.c:1330 server/stdinhand.c:1378
+#: server/stdinhand.c:1331 server/stdinhand.c:1380
 #, c-format
 msgid "Command access level could not be set to '%s' for connection %s."
 msgstr "ÎÞ·¨½«Á¬½Ó %2$s µÄÃüÁî·ÃÎʼ¶±ðÉèÖÃΪ¡°%1$s¡±¡£"
 
-#: server/stdinhand.c:1340 server/stdinhand.c:1350 server/stdinhand.c:1367
+#: server/stdinhand.c:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
 #, c-format
 msgid "Command access level set to '%s' for new players."
 msgstr "½«ÐÂÁ¬ÈëÍæ¼ÒµÄÃüÁî·ÃÎʼ¶±ðÉèÖÃΪ¡°%s¡±¡£"
 
-#: server/stdinhand.c:1344 server/stdinhand.c:1355 server/stdinhand.c:1362
+#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
 #, c-format
 msgid "Command access level set to '%s' for first player to grab it."
 msgstr "½«µÚÒ»¸öÇÀµ½µÄÍæ¼ÒµÄÃüÁî·ÃÎʼ¶±ðÉèÖÃΪ¡°%s¡±¡£"
 
-#: server/stdinhand.c:1400
+#: server/stdinhand.c:1402
 msgid "The 'first' command makes no sense from the server command line."
 msgstr "´Ó·þÎñÆ÷ÃüÁîÐз¢³ö¡°first¡±ÃüÁîûÓÐÒâÒå¡£"
 
-#: server/stdinhand.c:1404
+#: server/stdinhand.c:1406
 #, c-format
 msgid "You already have command access level '%s' or better."
 msgstr "ÄúÒѾ­ÓµÓÐÃüÁî·ÃÎʼ¶±ð¡°%s¡±»ò¸ü¸ß¡£"
 
-#: server/stdinhand.c:1409
+#: server/stdinhand.c:1411
 msgid "Someone else already is game organizer."
 msgstr "ÒѾ­ÓÐÈËÊÇÓÎÏ·×éÖ¯ÕßÁË¡£"
 
-#: server/stdinhand.c:1414
+#: server/stdinhand.c:1416
 #, c-format
 msgid "Connection %s has opted to become the game organizer."
 msgstr "Á¬½Ó %s ¾ö¶¨³ÉΪÓÎÏ·×éÖ¯Õß¡£"
 
-#: server/stdinhand.c:1465
+#: server/stdinhand.c:1467
 #, c-format
 msgid "Invalid argument %d."
 msgstr "·Ç·¨²ÎÊý %d¡£"
 
-#: server/stdinhand.c:1472
+#: server/stdinhand.c:1474
 msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
 msgstr "Ó÷¨£ºtimeoutincrease <»ØºÏ> <»ØºÏÔöÁ¿> <Öµ> <valuemult>¡£"
 
-#: server/stdinhand.c:1480
+#: server/stdinhand.c:1482
 #, c-format
 msgid "Dynamic timeout set to %d %d %d %d"
 msgstr "¶¯Ì¬³¬Ê±ÉèÖÃΪ %d %d %d %d"
 
-#: server/stdinhand.c:1540 server/stdinhand.c:1543
+#: server/stdinhand.c:1542 server/stdinhand.c:1545
 msgid "Option:"
 msgstr "Ñ¡Ï"
 
-#: server/stdinhand.c:1553 server/stdinhand.c:3956
+#: server/stdinhand.c:1555 server/stdinhand.c:4031
 msgid "Description:"
 msgstr "ÃèÊö£º"
 
-#: server/stdinhand.c:1558
+#: server/stdinhand.c:1560
 #, c-format
 msgid "Status: %s"
 msgstr "״̬£º%s"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "changeable"
 msgstr "¿É¸Ä±äµÄ"
 
-#: server/stdinhand.c:1559
+#: server/stdinhand.c:1561
 msgid "fixed"
 msgstr "¹Ì¶¨µÄ"
 
-#: server/stdinhand.c:1565
+#: server/stdinhand.c:1567
 #, c-format
 msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
 msgstr "Öµ£º%d£¬×îС£º0£¬Ä¬ÈÏ£º%d£¬×î´ó£º1"
 
-#: server/stdinhand.c:1570
+#: server/stdinhand.c:1572
 #, c-format
 msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
 msgstr "Öµ£º%d£¬×îС£º%d£¬Ä¬ÈÏ£º%d£¬×î´ó£º%d"
 
-#: server/stdinhand.c:1576
+#: server/stdinhand.c:1578
 #, c-format
 msgid "Value: \"%s\", Default: \"%s\""
 msgstr "Öµ£º¡°%s¡±£¬Ä¬ÈÏ£º¡°%s¡±"
 
-#: server/stdinhand.c:1595
+#: server/stdinhand.c:1597
 msgid "Explanations are available for the following server options:"
 msgstr "¿ÉÒÔ»ñµÃÒÔÏ·þÎñÆ÷Ñ¡ÏîµÄ°ïÖúÐÅÏ¢£º"
 
-#: server/stdinhand.c:1640
+#: server/stdinhand.c:1643
 msgid "No explanation for that yet."
 msgstr "ÉÐÎÞ¹ØÓÚËüµÄ½âÊÍ¡£"
 
-#: server/stdinhand.c:1643 server/stdinhand.c:2476
+#: server/stdinhand.c:1646 server/stdinhand.c:2480
 msgid "Ambiguous option name."
 msgstr "ÓÐÆçÒåµÄÑ¡ÏîÃû³Æ¡£"
 
-#: server/stdinhand.c:1663
+#: server/stdinhand.c:1666
 #, c-format
 msgid "Server Operator: %s"
 msgstr "·þÎñÆ÷²Ù×÷Ô±£º%s"
 
-#: server/stdinhand.c:1787 server/stdinhand.c:1814 server/stdinhand.c:1832
+#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
 #, c-format
 msgid "Player '%s' now has AI skill level '%s'."
 msgstr "Íæ¼Ò¡°%s¡±ÏÖÔÚÓµÓÐAI¼¼Äܼ¶±ð¡°%s¡±¡£"
 
-#: server/stdinhand.c:1819
+#: server/stdinhand.c:1822
 #, c-format
 msgid "%s is not controlled by the AI."
 msgstr "%s ²»ÊÇÓÉ AI ¿ØÖƵġ£"
 
-#: server/stdinhand.c:1839
+#: server/stdinhand.c:1842
 #, c-format
 msgid "Default AI skill level set to '%s'."
 msgstr "ĬÈÏAI¼¼Äܼ¶±ðÉèÖÃΪ¡°%s¡±¡£"
 
-#: server/stdinhand.c:1854 server/stdinhand.c:2158
+#: server/stdinhand.c:1857 server/stdinhand.c:2162
 msgid "This command is client only."
 msgstr "¸ÃÃüÁîÖ»ÄÜÔÚ¿Í»§¶ËʹÓá£"
 
-#: server/stdinhand.c:1857
+#: server/stdinhand.c:1860
 msgid "Usage: away"
 msgstr "Ó÷¨£º away"
 
-#: server/stdinhand.c:1862
+#: server/stdinhand.c:1865
 msgid "Only players may use the away command."
 msgstr "Ö»ÓÐÍæ¼Ò¿ÉÒÔʹÓÃÀ뿪ÃüÁî¡£"
 
-#: server/stdinhand.c:1866
+#: server/stdinhand.c:1869
 #, c-format
 msgid "%s set to away mode."
 msgstr "%s ÉèÖÃΪÀ뿪ģʽ¡£"
 
-#: server/stdinhand.c:1874
+#: server/stdinhand.c:1877
 #, c-format
 msgid "%s returned to game."
 msgstr "%s »Øµ½ÁËÓÎÏ·¡£"
 
-#: server/stdinhand.c:1916
+#: server/stdinhand.c:1919
 #, c-format
 msgid "Sorry, you do not have access to view option '%s'."
 msgstr "±§Ç¸£¬ÄúÎÞȨ²é¿´Ñ¡Ïî¡°%s¡±¡£"
 
-#: server/stdinhand.c:1922
+#: server/stdinhand.c:1925
 #, c-format
 msgid "Unknown option '%s'."
 msgstr "δ֪µÄÑ¡Ïî¡°%s¡±¡£"
 
-#: server/stdinhand.c:1947
+#: server/stdinhand.c:1950
 msgid "All options with non-default values"
 msgstr "ËùÓв»ÎªÈ±Ê¡ÖµµÄÑ¡Ïî¡£"
 
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1953
 msgid "All options"
 msgstr "ËùÓÐÑ¡Ïî"
 
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1956
 msgid "Vital options"
 msgstr "±ØÐèÑ¡Ïî"
 
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1959
 msgid "Situational options"
 msgstr "Çé¾°Ïà¹ØµÄÑ¡Ïî"
 
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1962
 msgid "Rarely used options"
 msgstr "ºÜÉÙʹÓõÄÑ¡Ïî"
 
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1965
 msgid "+ means you may change the option"
 msgstr "+ ±íʾÄú¿ÉÒԸıäÑ¡Ïî"
 
-#: server/stdinhand.c:1963
+#: server/stdinhand.c:1966
 msgid "= means the option is on its default value"
 msgstr "= ±íʾѡÏîµÄÖµÊÇËüµÄĬÈÏÖµ"
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 #, c-format
 msgid "%-*s value   (min,max)      "
 msgstr "%-*s Öµ   £¨×îСֵ£¬×î´óÖµ£©      "
 
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1969
 msgid "Option"
 msgstr "Ñ¡Ïî"
 
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1973
 msgid "description"
 msgstr "ÃèÊö"
 
-#: server/stdinhand.c:2038
+#: server/stdinhand.c:2042
 msgid ""
 "Try 'show situational' or 'show rare' to show more options.\n"
 "Try 'show changed' to show settings with non-default values."
@@ -5682,37 +5703,37 @@ msgstr ""
 "ÇëʹÓá°show situational¡±»ò¡°show rare¡±ÒÔÏÔʾ¸ü¶àÑ¡Ïî¡£\n"
 "ÇëʹÓá°show changed¡±ÒÔÏÔʾ¾ßÓзÇȱʡֵµÄÉèÖá£"
 
-#: server/stdinhand.c:2088
+#: server/stdinhand.c:2092
 msgid "Cannot change teams once game has begun."
 msgstr "²»ÄÜÔÚÓÎÏ·¿ªÊ¼ºóÐÞ¸ÄÍŶӡ£"
 
-#: server/stdinhand.c:2098
+#: server/stdinhand.c:2102
 msgid "Undefined argument.  Usage: team <player> <team>."
 msgstr "䶨ÒåµÄ²ÎÊý¡£Ó÷¨£ºteam <Íæ¼Ò> <ÍŶÓ> ¡£"
 
-#: server/stdinhand.c:2118
+#: server/stdinhand.c:2122
 #, c-format
 msgid "No such team %s.  Please give a valid team name or number."
 msgstr "ÍÅ¶Ó %s ²»´æÔÚ¡£Çë¸ø³öÓÐЧµÄÍŶÓÃû×Ö»ò±àºÅ¡£"
 
-#: server/stdinhand.c:2125
+#: server/stdinhand.c:2129
 msgid "Cannot team a barbarian."
 msgstr "²»ÄܺÍÒ°ÈË×é³ÉÍŶӡ£"
 
-#: server/stdinhand.c:2131
+#: server/stdinhand.c:2135
 #, c-format
 msgid "Player %s set to team %s."
 msgstr "%s ¼ÓÈëÍÅ¶Ó %s¡£"
 
-#: server/stdinhand.c:2153
+#: server/stdinhand.c:2157
 msgid "Undefined arguments. Usage: vote yes|no [vote number]."
 msgstr "䶨ÒåµÄ²ÎÊý¡£Ó÷¨£ºvote yes|no [vote number] ¡£"
 
-#: server/stdinhand.c:2161
+#: server/stdinhand.c:2165
 msgid "Observers cannot vote."
 msgstr "ÅÔ¹ÛÕß²»ÄÜͶƱ¡£"
 
-#: server/stdinhand.c:2164
+#: server/stdinhand.c:2168
 msgid ""
 "You can only vote in a running game.  Use 'first' to become the game "
 "organizer if there currently is none."
@@ -5720,39 +5741,39 @@ msgstr ""
 "ÄúÖ»ÄÜÔÚÔËÐÐÖеÄÓÎÏ·ÖÐͶƱ¡£Èç¹ûµ±Ç°Ã»ÓÐÓÎÏ·×éÖ¯ÕßÇëʹÓá°first¡±ÃüÁî³ÉΪÓÎÏ·"
 "×éÖ¯Õß¡£"
 
-#: server/stdinhand.c:2177
+#: server/stdinhand.c:2181
 #, c-format
 msgid "Vote %d \"%s\": %d for, %d against"
 msgstr "ͶƱ %d ¡°%s¡±£º %d Ö§³Ö£¬ %d ·´¶Ô"
 
-#: server/stdinhand.c:2184
+#: server/stdinhand.c:2188
 msgid "There are no votes going on."
 msgstr "µ±Ç°Ã»ÓоÙÐÐͶƱ¡£"
 
-#: server/stdinhand.c:2204
+#: server/stdinhand.c:2208
 msgid "No legal last vote."
 msgstr "ûÓкϷ¨µÄÉÏ´ÎͶƱ¡£"
 
-#: server/stdinhand.c:2209
+#: server/stdinhand.c:2213
 msgid "Value must be integer."
 msgstr "Öµ±ØÐëÊÇÒ»¸öÕûÊý¡£"
 
-#: server/stdinhand.c:2220
+#: server/stdinhand.c:2224
 #, c-format
 msgid "No such vote (%d)."
 msgstr "ûÓÐÕâÑùµÄͶƱ£¨%d£©¡£"
 
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2228
 #, c-format
 msgid "You voted for \"%s\""
 msgstr "ÄúͶƱ֧³Ö¡°%s¡±"
 
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2232
 #, c-format
 msgid "You voted against \"%s\""
 msgstr "ÄúͶƱ·´¶Ô¡°%s¡±"
 
-#: server/stdinhand.c:2255
+#: server/stdinhand.c:2259
 msgid ""
 "Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
 "<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -5760,421 +5781,447 @@ msgstr ""
 "䶨ÒåµÄ²ÎÊý¡£Ó÷¨£ºdebug <diplomacy <Íæ¼Ò> | city <x> <y> | units <x> <y> | "
 "unit <id> | tech <palyer> | timing | info> ¡£"
 
-#: server/stdinhand.c:2261
+#: server/stdinhand.c:2265
 msgid "Can only use this command once game has begun."
 msgstr "Ö»ÄÜÔÚÓÎÏ·¿ªÊ¼ºóʹÓôËÃüÁî¡£"
 
-#: server/stdinhand.c:2290
+#: server/stdinhand.c:2294
 #, c-format
 msgid "%s diplomacy no longer debugged"
 msgstr "²»ÔÙµ÷ÊÔ %s Íâ½»"
 
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2298
 #, c-format
 msgid "%s diplomacy debugged"
 msgstr "µ÷ÊÔ %s Íâ½»"
 
-#: server/stdinhand.c:2313
+#: server/stdinhand.c:2317
 #, c-format
 msgid "%s tech no longer debugged"
 msgstr "²»ÔÙµ÷ÊÔ %s ¿Æ¼¼"
 
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2321
 #, c-format
 msgid "%s tech debugged"
 msgstr "µ÷ÊÔ %s ¿Æ¼¼"
 
-#: server/stdinhand.c:2348 server/stdinhand.c:2378
+#: server/stdinhand.c:2352 server/stdinhand.c:2382
 msgid "Value 2 & 3 must be integer."
 msgstr "µÚ¶þºÍµÚÈý¸öÖµ±ØÐëÊÇÕûÊý¡£"
 
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2356 server/stdinhand.c:2386
 msgid "Bad map coordinates."
 msgstr "´íÎóµÄµØͼ×ø±ê¡£"
 
-#: server/stdinhand.c:2357
+#: server/stdinhand.c:2361
 msgid "No city at this coordinate."
 msgstr "´Ë×ø±êûÓгÇÊС£"
 
-#: server/stdinhand.c:2362
+#: server/stdinhand.c:2366
 #, c-format
 msgid "%s no longer debugged"
 msgstr "²»ÔÙµ÷ÊÔ %s"
 
-#: server/stdinhand.c:2388 server/stdinhand.c:2418
+#: server/stdinhand.c:2392 server/stdinhand.c:2422
 #, fuzzy, c-format
 msgid "%s %s no longer debugged."
 msgstr "²»ÔÙµ÷ÊÔ %s µÄ %s ¡£"
 
-#: server/stdinhand.c:2393 server/stdinhand.c:2423
+#: server/stdinhand.c:2397 server/stdinhand.c:2427
 #, fuzzy, c-format
 msgid "%s %s debugged."
 msgstr "µ÷ÊÔ %s µÄ %s ¡£"
 
-#: server/stdinhand.c:2409
+#: server/stdinhand.c:2413
 msgid "Value 2 must be integer."
 msgstr "µÚ¶þ¸öÖµ±ØÐëÊÇÕûÊý¡£"
 
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2417
 #, c-format
 msgid "Unit %d does not exist."
 msgstr "²¿¶Ó %d ²»´æÔÚ¡£"
 
-#: server/stdinhand.c:2471
+#: server/stdinhand.c:2475
 msgid "Undefined argument.  Usage: set <option> <value>."
 msgstr "䶨ÒåµÄ²ÎÊý¡£Ó÷¨£ºset <Ñ¡Ïî> <Öµ>¡£"
 
-#: server/stdinhand.c:2481
+#: server/stdinhand.c:2485
 msgid "You are not allowed to set this option."
 msgstr "²»ÔÊÐíÄúÉèÖôËÑ¡Ïî¡£"
 
-#: server/stdinhand.c:2486 server/stdinhand.c:3404
+#: server/stdinhand.c:2490 server/stdinhand.c:3463
 msgid "This setting can't be modified after the game has started."
 msgstr "ÔÚÓÎÏ·¿ªÊ¼Ö®ºó²»ÄÜÐ޸ĸÃÉèÖá£"
 
-#: server/stdinhand.c:2498 server/stdinhand.c:2537
+#: server/stdinhand.c:2502 server/stdinhand.c:2543
 msgid "Value must be an integer."
 msgstr "Öµ±ØÐëÊÇÒ»¸öÕûÊý¡£"
 
-#: server/stdinhand.c:2508
+#: server/stdinhand.c:2512
 #, c-format
 msgid "The parameter %s should only contain digits 0-1."
 msgstr ""
 
-#: server/stdinhand.c:2515
+#: server/stdinhand.c:2519
 msgid "Value out of range (minimum: 0, maximum: 1)."
 msgstr "Öµ³¬³ö·¶Î§ (×îС£º0£¬×î´ó£º1)¡£"
 
-#: server/stdinhand.c:2528 server/stdinhand.c:2568
+#: server/stdinhand.c:2534 server/stdinhand.c:2576
 #, c-format
 msgid "Option: %s has been set to %d."
 msgstr "Ñ¡Ï%s Òѱ»ÉèÖÃΪ %d¡£"
 
-#: server/stdinhand.c:2548
+#: server/stdinhand.c:2554
 #, c-format
 msgid "The parameter %s should only contain +- and 0-9."
 msgstr ""
 
-#: server/stdinhand.c:2555
+#: server/stdinhand.c:2561
 #, c-format
 msgid "Value out of range (minimum: %d, maximum: %d)."
 msgstr "Öµ³¬³öÔ¤¶¨·¶Î§ (×îС£º%d£¬×î´ó£º%d)¡£"
 
-#: server/stdinhand.c:2578
+#: server/stdinhand.c:2586
 msgid "String value too long.  Usage: set <option> <value>."
 msgstr "¹ý³¤µÄ×Ö·û´®Öµ¡£Ó÷¨£ºset <Ñ¡Ïî> <Öµ>¡£"
 
-#: server/stdinhand.c:2590
+#: server/stdinhand.c:2600
 #, c-format
 msgid "Option: %s has been set to \"%s\"."
 msgstr "Ñ¡Ï%s Òѱ»ÉèÖÃΪ¡°%s¡±¡£"
 
-#: server/stdinhand.c:2628
+#: server/stdinhand.c:2658
 msgid "Sorry, one can't observe globally in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹ÛÈ«¾Ö¡£"
 
-#: server/stdinhand.c:2631
+#: server/stdinhand.c:2661
 msgid "Sorry, you can't take a global observer. Observe it instead."
 msgstr "±§Ç¸£¬Äú²»ÄÜÌæ´úÈ«¾ÖÅÔ¹ÛÕß¡£ÇëÅÔ¹ÛËû¡£"
 
-#: server/stdinhand.c:2643
+#: server/stdinhand.c:2671
+#, fuzzy
+msgid "You cannot take a new player at this time."
+msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÕæÈËÍæ¼Ò¡£"
+
+#. TRANS: Do not translate "maxplayers".
+#: server/stdinhand.c:2679
+#, c-format
+msgid ""
+"You cannot take a new player because the maximum of %d player has already "
+"been reached (maxplayers setting)."
+msgid_plural ""
+"You cannot take a new player because the maximum of %d players has already "
+"been reached (maxplayers setting)."
+msgstr[0] ""
+
+#: server/stdinhand.c:2691
+msgid "You cannot take a new player because there are no free player slots."
+msgstr ""
+
+#: server/stdinhand.c:2702
 msgid "Sorry, one can't observe barbarians in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹ÛÒ°ÈË¡£"
 
-#: server/stdinhand.c:2646
+#: server/stdinhand.c:2705
 msgid "Sorry, one can't take barbarians in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÒ°ÈË¡£"
 
-#: server/stdinhand.c:2654
+#: server/stdinhand.c:2713
 msgid "Sorry, one can't observe dead players in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹ÛÒÑËÀÈ¥µÄÍæ¼Ò¡£"
 
-#: server/stdinhand.c:2657
+#: server/stdinhand.c:2716
 msgid "Sorry, one can't take dead players in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÒÑËÀÈ¥µÄÍæ¼Ò¡£"
 
-#: server/stdinhand.c:2665
+#: server/stdinhand.c:2724
 msgid "Sorry, one can't observe AI players in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹Û AI Íæ¼Ò¡£"
 
-#: server/stdinhand.c:2668
+#: server/stdinhand.c:2727
 msgid "Sorry, one can't take AI players in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæ AI Íæ¼Ò¡£"
 
-#: server/stdinhand.c:2677
+#: server/stdinhand.c:2736
 msgid "Sorry, one can't observe human players in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹ÛÕæÈËÍæ¼Ò¡£"
 
-#: server/stdinhand.c:2680
+#: server/stdinhand.c:2739
 msgid "Sorry, one can't take human players in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÕæÈËÍæ¼Ò¡£"
 
-#: server/stdinhand.c:2690
+#: server/stdinhand.c:2749
 msgid "Sorry, one can't observe in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹Û¡£"
 
-#: server/stdinhand.c:2695
+#: server/stdinhand.c:2754
 msgid "Sorry, one can't take players in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÍæ¼Ò¡£"
 
-#: server/stdinhand.c:2701
+#: server/stdinhand.c:2760
 msgid "Sorry, one can't take players already connected in this game."
 msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÒѾ­Á¬ÈëµÄÍæ¼Ò¡£"
 
-#: server/stdinhand.c:2732
+#: server/stdinhand.c:2791
 msgid "Usage: observe [connection-name [player-name]]"
 msgstr "Ó÷¨£º observe [Á¬½ÓÃû³Æ [Íæ¼ÒÃû³Æ]]"
 
-#: server/stdinhand.c:2738
+#: server/stdinhand.c:2797
 msgid "Usage: observe [player-name]"
 msgstr "Ó÷¨£º observer [Íæ¼ÒÃû³Æ]"
 
-#: server/stdinhand.c:2788
+#: server/stdinhand.c:2847
 #, c-format
 msgid "%s already controls %s. Using 'observe' would remove %s"
 msgstr "%s ÒѾ­¿ØÖÆ %s ÁË¡£Ê¹Óá°observe¡±½«É¾³ý %s"
 
-#: server/stdinhand.c:2799
+#: server/stdinhand.c:2858
 #, c-format
 msgid "%s is already observing %s."
 msgstr "%s ÒѾ­ÅÔ¹Û %s ÁË¡£"
 
-#: server/stdinhand.c:2804
+#: server/stdinhand.c:2863
 #, c-format
 msgid "%s is already observing."
 msgstr "%s ÒѾ­ÔÚÅÔ¹ÛÁË¡£"
 
-#: server/stdinhand.c:2866
+#: server/stdinhand.c:2925
 #, c-format
 msgid "%s now observes %s"
 msgstr "%s ÏÖÔÚÅÔ¹Û %s"
 
-#: server/stdinhand.c:2870
+#: server/stdinhand.c:2929
 #, c-format
 msgid "%s now observes"
 msgstr "%s ÏÖÔÚÅÔ¹Û"
 
-#: server/stdinhand.c:2910
+#: server/stdinhand.c:2969
 msgid "Usage: take <connection-name> <player-name>"
 msgstr "Ó÷¨£º taken <Á¬½ÓÃû³Æ> <Íæ¼ÒÃû³Æ>"
 
-#: server/stdinhand.c:2915
+#: server/stdinhand.c:2974
 msgid "Usage: take <player-name>"
 msgstr "Ó÷¨£º take <Íæ¼ÒÃû³Æ>"
 
-#: server/stdinhand.c:2921
+#: server/stdinhand.c:2980
 msgid "Usage: take [connection-name] <player-name>"
 msgstr "Ó÷¨£º take [Á¬½ÓÃû³Æ] <Íæ¼ÒÃû³Æ>"
 
-#: server/stdinhand.c:2951
-#, c-format
-msgid "%s already controls %s"
+#: server/stdinhand.c:3010
+#, fuzzy, c-format
+msgid "%s already controls %s."
 msgstr "%s ÒѾ­¿ØÖÆ %s ÁË"
 
-#: server/stdinhand.c:2965
-#, c-format
-msgid "There is no free player slot for %s"
-msgstr ""
+#: server/stdinhand.c:3024
+#, fuzzy, c-format
+msgid "There is no free player slot for %s."
+msgstr "ûÓÐÃûΪ %s µÄÍæ¼Ò»òÁ¬½Ó¡£"
 
-#: server/stdinhand.c:3000
+#: server/stdinhand.c:3059
 #, c-format
 msgid "being detached from %s."
 msgstr "´Ó %s ÍÑÀë ¡£"
 
-#: server/stdinhand.c:3076
-#, c-format
-msgid "%s now controls %s (%s, %s)"
+#: server/stdinhand.c:3135
+#, fuzzy, c-format
+msgid "%s now controls %s (%s, %s)."
 msgstr "%s ÏÖÔÚ¿ØÖÆ %s £¨%s£¬%s£©"
 
-#: server/stdinhand.c:3080 server/stdinhand.c:4185
+#: server/stdinhand.c:3139 server/stdinhand.c:4260
 #: data/nation/barbarian.ruleset:3
 msgid "Barbarian"
 msgstr "Ò°ÈË"
 
-#: server/stdinhand.c:3082 server/stdinhand.c:4187 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-sdl/plrdlg.c:645
+#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-sdl/plrdlg.c:645
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
 msgid "AI"
 msgstr "AI"
 
-#: server/stdinhand.c:3083 server/stdinhand.c:4189
-#: client/gui-gtk-2.0/pages.c:2027 client/gui-gtk-2.0/pages.c:2050
+#: server/stdinhand.c:3142 server/stdinhand.c:4264
+#: client/gui-gtk-2.0/pages.c:2030 client/gui-gtk-2.0/pages.c:2053
 #: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
 msgid "Human"
 msgstr "ÕæÈË"
 
-#: server/stdinhand.c:3085 client/gui-gtk-2.0/pages.c:2026
-#: client/gui-gtk-2.0/pages.c:2049 client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2029
+#: client/gui-gtk-2.0/pages.c:2052 client/gui-win32/connectdlg.c:200
 #: client/gui-win32/connectdlg.c:212
 msgid "Alive"
 msgstr "»îµÄ"
 
-#: server/stdinhand.c:3086 client/gui-gtk-2.0/pages.c:2026
+#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2029
 #: client/gui-win32/connectdlg.c:200
 msgid "Dead"
 msgstr "ËÀµÄ"
 
-#: server/stdinhand.c:3088
+#: server/stdinhand.c:3147
 #, fuzzy, c-format
-msgid "%s failed to attach to any player"
+msgid "%s failed to attach to any player."
 msgstr "%s ûÓи½½Óµ½ÈκÎÍæ¼Ò¡£"
 
-#: server/stdinhand.c:3123
+#: server/stdinhand.c:3182
 msgid "Usage: detach <connection-name>"
 msgstr "Ó÷¨£º detach <Á¬½ÓÃû>"
 
-#: server/stdinhand.c:3143
+#: server/stdinhand.c:3202
 msgid "You can not detach other users."
 msgstr "Äã²»ÄÜʹ±ðµÄÓû§ÍÑÀë¡£"
 
-#: server/stdinhand.c:3152
+#: server/stdinhand.c:3211
 #, c-format
 msgid "%s is not attached to any player."
 msgstr "%s ûÓи½½Óµ½ÈκÎÍæ¼Ò¡£"
 
-#: server/stdinhand.c:3175
+#: server/stdinhand.c:3234
 #, c-format
 msgid "%s detaching from %s"
 msgstr "%s Õý´Ó %s ÍÑÀë"
 
-#: server/stdinhand.c:3181
+#: server/stdinhand.c:3240
 #, c-format
 msgid "%s no longer observing."
 msgstr "%s ²»ÔÙÅÔ¹Û¡£"
 
-#: server/stdinhand.c:3200
+#: server/stdinhand.c:3259
 #, c-format
 msgid "detaching from %s."
 msgstr "Õý´Ó %s ÍÑÀë¡£"
 
-#: server/stdinhand.c:3286
+#: server/stdinhand.c:3345
 msgid "Usage: load <game name>"
 msgstr "Ó÷¨£º load <ÓÎÏ·Ãû>"
 
-#: server/stdinhand.c:3291
+#: server/stdinhand.c:3350
 msgid "Cannot load a game while another is running."
 msgstr "²»ÄÜÔÚÓÎÏ·ÔËÐÐʱÔØÈëÁíÒ»¸öÓÎÏ·¡£"
 
-#: server/stdinhand.c:3313
+#: server/stdinhand.c:3372
 #, c-format
 msgid "Cannot find savegame or scenario with the name \"%s\"."
 msgstr "ÎÞ·¨ÕÒµ½ÃûΪ¡°%s¡±µÄ´æÅÌÎļþ»òÇé¾°¡£"
 
-#: server/stdinhand.c:3330
+#: server/stdinhand.c:3389
 #, c-format
 msgid "Could not load savefile: %s"
 msgstr "ÎÞ·¨ÔØÈë´æÅÌÎļþ£º%s"
 
-#: server/stdinhand.c:3399
+#: server/stdinhand.c:3458
 #, c-format
 msgid "Current ruleset directory is \"%s\""
 msgstr "µ±Ç°¹æÔò¼¯ºÏĿ¼Ϊ¡°%s¡±"
 
-#: server/stdinhand.c:3419
+#: server/stdinhand.c:3478
 #, c-format
 msgid "Ruleset directory \"%s\" not found"
 msgstr "ÕÒ²»µ½¹æÔò¼¯Ä¿Â¼¡°%s¡±"
 
-#: server/stdinhand.c:3425
+#: server/stdinhand.c:3484
 #, c-format
 msgid "Ruleset directory is already \"%s\""
 msgstr "¹æÔò¼¯Ä¿Â¼ÒѾ­ÊÇ¡°%s¡±ÁË"
 
-#: server/stdinhand.c:3429
+#: server/stdinhand.c:3488
 #, c-format
 msgid "Ruleset directory set to \"%s\""
 msgstr "¹æÔò¼¯ºÏĿ¼±»ÉèÖÃΪ¡°%s¡±"
 
-#: server/stdinhand.c:3477
+#: server/stdinhand.c:3536
 msgid "Goodbye."
 msgstr "ÔÙ¼û¡£"
 
-#: server/stdinhand.c:3508
+#: server/stdinhand.c:3567
 msgid "Sorry, you are not allowed to use server commands."
 msgstr "±§Ç¸£¬²»ÔÊÐíÄúʹÓ÷þÎñÆ÷ÃüÁî¡£"
 
-#: server/stdinhand.c:3544
+#: server/stdinhand.c:3603
 #, c-format
 msgid "Warning: '%s' interpreted as '%s', but it is ambiguous.  Try '%shelp'."
 msgstr "¾¯¸æ£º¡°%s¡±±»½âÊÍΪ¡°%s¡±£¬µ«ÓÐÆçÒå¡£ÊÔÓá°%shelp¡±¡£"
 
-#: server/stdinhand.c:3549
+#: server/stdinhand.c:3608
 #, c-format
 msgid "Unknown command.  Try '%shelp'."
 msgstr "δ֪µÄÃüÁî¡£ÊÔÓá°%shelp¡±¡£"
 
-#: server/stdinhand.c:3566
+#: server/stdinhand.c:3625
 msgid "Your new vote canceled your previous vote."
 msgstr "ÄúµÄÐÂͶƱȡÏûÁËÄúÒÔÇ°µÄͶƱ¡£"
 
-#: server/stdinhand.c:3574
+#: server/stdinhand.c:3633
 #, c-format
 msgid "New vote (number %d) by %s: %s."
 msgstr "ÐÂͶƱ£¨±àºÅ %d£©£¬ÓÉ %s£º%s ·¢Æð¡£"
 
-#: server/stdinhand.c:3586
+#: server/stdinhand.c:3645
 #, c-format
 msgid "Your new vote (\"%s\") was not legal or was not recognized."
 msgstr ""
 
-#: server/stdinhand.c:3596
+#: server/stdinhand.c:3655
 msgid "You are not allowed to use this command."
 msgstr "²»ÔÊÐíÄúʹÓøÃÃüÁî¡£"
 
-#: server/stdinhand.c:3621
+#: server/stdinhand.c:3680
 msgid "(server prompt)"
 msgstr "£¨·þÎñÆ÷Ìáʾ£©"
 
-#: server/stdinhand.c:3728
+#: server/stdinhand.c:3787
 msgid "Game ended in a draw."
 msgstr "ÓÎÏ·½áÊøδ·Öʤ¸º"
 
-#: server/stdinhand.c:3732
+#: server/stdinhand.c:3791
 msgid ""
 "Ending the game. The server will restart once all clients have disconnected."
 msgstr "½áÊøÓÎÏ·¡£·þÎñÆ÷½«ÔÚËùÓпͻ§¶Ë¶Ï¿ªÁ¬½ÓºóÁ¢¿ÌÖØÆô¶¯¡£"
 
-#: server/stdinhand.c:3737
+#: server/stdinhand.c:3796
 msgid "Cannot end the game: no game running."
 msgstr "ÎÞ·¨½áÊøÓÎÏ·£ºÓÎÏ·ÉÐδÔËÐС£"
 
-#: server/stdinhand.c:3753
+#: server/stdinhand.c:3812
 #, c-format
 msgid "%s has conceded the game and can no longer win."
 msgstr "%s ÒѾ­ÈÏÊ䣬²»¿ÉÄÜÓ®µÃÓÎÏ·ÁË¡£"
 
-#: server/stdinhand.c:3758
+#: server/stdinhand.c:3817
 msgid "You cannot surrender now."
 msgstr "ÄúÏÖÔÚ²»ÄÜͶ½µ¡£"
 
-#: server/stdinhand.c:3815
-msgid "Not enough players, game will not start."
+#: server/stdinhand.c:3883
+#, fuzzy
+msgid "Not enough human players, game will not start."
 msgstr "Íæ¼ÒÈËÊý²»×㣬²»ÄÜ¿ªÊ¼ÓÎÏ·¡£"
 
-#: server/stdinhand.c:3819
+#: server/stdinhand.c:3888
+#, fuzzy
+msgid "No players, game will not start."
+msgstr "Íæ¼ÒÈËÊý²»×㣬²»ÄÜ¿ªÊ¼ÓÎÏ·¡£"
+
+#: server/stdinhand.c:3892
 #, fuzzy
 msgid "Not enough nations for all players, game will not start."
 msgstr "Íæ¼ÒÈËÊý²»×㣬²»ÄÜ¿ªÊ¼ÓÎÏ·¡£"
 
-#: server/stdinhand.c:3828
+#: server/stdinhand.c:3901
 msgid "All players are ready; starting game."
 msgstr "ËùÓÐÍæ¼Ò¾ÍÐ÷£»Æô¶¯ÓÎÏ·¡£"
 
-#: server/stdinhand.c:3842
+#: server/stdinhand.c:3915
 msgid ""
 "Cannot start the game: the game is waiting for all clients to disconnect."
 msgstr "ÎÞ·¨¿ªÊ¼ÓÎÏ·£ºÓÎÏ·ÕýÔڵȴýËùÓеĿͻ§¶Ë¶Ï¿ªÁ¬½Ó¡£"
 
-#: server/stdinhand.c:3849
+#: server/stdinhand.c:3922
 msgid "Cannot start the game: it is already running."
 msgstr "ÎÞ·¨¿ªÊ¼ÓÎÏ·£ºËüÒѾ­ÔÚÔËÐÐÁË¡£"
 
-#: server/stdinhand.c:3878
+#: server/stdinhand.c:3953
 #, c-format
 msgid "Cutting connection %s."
 msgstr "ÇжÏÁ¬½Ó %s¡£"
 
-#: server/stdinhand.c:3897
+#: server/stdinhand.c:3972
 msgid ""
 "Welcome - this is the introductory help text for the Freeciv server.\n"
 "\n"
@@ -6212,121 +6259,121 @@ msgstr ""
 "  save   -  ±£´æµ±Ç°ÓÎÏ·\n"
 "  quit   -  Í˳ö"
 
-#: server/stdinhand.c:3932 server/stdinhand.c:3935
+#: server/stdinhand.c:4007 server/stdinhand.c:4010
 msgid "Command:"
 msgstr "ÃüÁ"
 
-#: server/stdinhand.c:3939
+#: server/stdinhand.c:4014
 msgid "Synopsis: "
 msgstr "ÌáÒª£º "
 
-#: server/stdinhand.c:3948
+#: server/stdinhand.c:4023
 #, c-format
 msgid "Level: %s"
 msgstr "¼¶±ð£º %s"
 
-#: server/stdinhand.c:3973
+#: server/stdinhand.c:4048
 msgid "The following server commands are available:"
 msgstr "¿ÉÒÔʹÓÃÏÂÁзþÎñÆ÷ÃüÁ"
 
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4123
 #, c-format
 msgid "Help argument '%s' is ambiguous."
 msgstr "°ïÖú²ÎÊý¡°%s¡±ÓÐÆçÒå¡£"
 
-#: server/stdinhand.c:4053
+#: server/stdinhand.c:4128
 #, c-format
 msgid "No match for help argument '%s'."
 msgstr "ûÓÐÆ¥ÅäµÄ°ïÖú²ÎÊý¡°%s¡±¡£"
 
-#: server/stdinhand.c:4119
+#: server/stdinhand.c:4194
 #, c-format
 msgid "Bad list argument: '%s'.  Try '%shelp list'."
 msgstr "´íÎóµÄÁбí²ÎÊý£º¡°%s¡±¡£ÊÔÓá°%shelp list¡±¡£"
 
-#: server/stdinhand.c:4159
+#: server/stdinhand.c:4234
 msgid "List of players:"
 msgstr "Íæ¼ÒÁÐ±í£º"
 
-#: server/stdinhand.c:4164
+#: server/stdinhand.c:4239
 msgid "<no players>"
 msgstr "<ÎÞÍæ¼Ò>"
 
-#: server/stdinhand.c:4181
+#: server/stdinhand.c:4256
 #, c-format
 msgid "user %s, "
 msgstr "Óû§ %s£¬"
 
-#: server/stdinhand.c:4192
+#: server/stdinhand.c:4267
 msgid ", Dead"
 msgstr "£¬ËÀÍö"
 
-#: server/stdinhand.c:4195
+#: server/stdinhand.c:4270
 #, c-format
 msgid ", difficulty level %s"
 msgstr "£¬ÄѶȼ¶±ð %s"
 
 #. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4200 server/stdinhand.c:4204 client/helpdata.c:238
-#: client/helpdata.c:750 client/text.c:185 client/text.c:1159
-#: client/text.c:1197
+#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:242
+#: client/helpdata.c:754 client/text.c:185 client/text.c:1163
+#: client/text.c:1201
 #, c-format
 msgid "?clistmore:, %s"
 msgstr " %s"
 
-#: server/stdinhand.c:4208
+#: server/stdinhand.c:4283
 msgid ", ready"
 msgstr "£¬¾ÍÐ÷"
 
-#: server/stdinhand.c:4210
+#: server/stdinhand.c:4285
 msgid ", not ready"
 msgstr "δ¾ÍÐ÷"
 
-#: server/stdinhand.c:4218
+#: server/stdinhand.c:4293
 #, c-format
 msgid " %d connection:"
 msgid_plural " %d connections:"
 msgstr[0] " %d ¸öÁ¬½Ó£º"
 
-#: server/stdinhand.c:4224
+#: server/stdinhand.c:4299
 #, c-format
 msgid "  %s from %s (command access level %s), bufsize=%dkb"
 msgstr "  %s À´×Ô %s £¨ÃüÁî·ÃÎʼ¶±ð %s £©£¬»º³åÇø´óС £½ %d kb"
 
-#: server/stdinhand.c:4229
+#: server/stdinhand.c:4304
 msgid " (observer mode)"
 msgstr " £¨ÅÔ¹ÛÕßģʽ£©"
 
-#: server/stdinhand.c:4247
+#: server/stdinhand.c:4322
 msgid "List of teams:"
 msgstr "ÍŶÓÁÐ±í£º"
 
 #. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4257
+#: server/stdinhand.c:4332
 #, c-format
 msgid "%2d : '%s' : %d player"
 msgid_plural "%2d : '%s' : %d players"
 msgstr[0] "%2d £º¡°%s¡± £º %d ¸öÍæ¼Ò"
 
-#: server/stdinhand.c:4277
+#: server/stdinhand.c:4352
 #, c-format
 msgid "%2d : '%s' : 1 player : %s"
 msgstr "%2d £º ¡°%s¡± £º 1 ¸öÍæ¼Ò £º %s"
 
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4360
 #, c-format
 msgid "Empty team: %s"
 msgstr "¿ÕÍŶӣº %s "
 
-#: server/stdinhand.c:4296
+#: server/stdinhand.c:4371
 msgid "List of connections to server:"
 msgstr "µ½·þÎñÆ÷µÄÁ¬½ÓÁÐ±í£º"
 
-#: server/stdinhand.c:4300
+#: server/stdinhand.c:4375
 msgid "<no connections>"
 msgstr "<ÎÞÁ¬½Ó>"
 
-#: server/stdinhand.c:4324
+#: server/stdinhand.c:4399
 msgid "List of scenarios available:"
 msgstr "¿ÉÓõÄÇé¾°ÁÐ±í£º"
 
@@ -6394,17 +6441,17 @@ msgstr "È«
 msgid "Technology goal is %s."
 msgstr "¿Æ¼¼Ä¿±êΪ %s¡£"
 
-#: server/techtools.c:698
+#: server/techtools.c:700
 #, fuzzy, c-format
 msgid "You steal %s from the %s."
 msgstr "Äú´Ó %2$s ÖÐÇÔÈ¡ÁË %1$s¡£"
 
-#: server/techtools.c:703
+#: server/techtools.c:705
 #, fuzzy, c-format
 msgid "The %s stole %s from you!"
 msgstr "%s ´ÓÄúÕâÀï͵ȥÁË %s£¡"
 
-#: server/techtools.c:708
+#: server/techtools.c:710
 #, fuzzy, c-format
 msgid "The %s have stolen %s from the %s."
 msgstr "%1$s ´Ó %3$s ÇÔÈ¡ÁË %2$s ¡£"
@@ -6910,20 +6957,20 @@ msgstr "
 msgid "Your %s has invalid orders."
 msgstr "ÄúµÄ %s µÃµ½ÁËÎÞЧµÄÃüÁî¡£"
 
-#: server/generator/mapgen.c:1714
+#: server/generator/mapgen.c:1737
 msgid "High landmass - this may take a few seconds."
 msgstr "´óÐ͵ĽµØ £­Õâ¿ÉÄÜÐèÒª¼¸ÃëÖÓ¡£"
 
-#: server/generator/mapgen.c:1912 server/generator/mapgen.c:1982
+#: server/generator/mapgen.c:1935 server/generator/mapgen.c:2005
 #, c-format
 msgid "Falling back to generator %d."
 msgstr "»Øµ½Éú³ÉÆ÷ %d ¡£"
 
-#: server/generator/mapgen.c:2002
+#: server/generator/mapgen.c:2025
 msgid "Generator 3 didn't place all big islands."
 msgstr "Éú³ÉÆ÷ 3 δÄܳɹ¦·ÅÖÃËùÓеĴóÐ͵ºÓì¡£"
 
-#: server/generator/mapgen.c:2031
+#: server/generator/mapgen.c:2054
 #, c-format
 msgid "Generator 3 left %li landmass unplaced."
 msgstr "Éú³ÉÆ÷3ÁôÏÂÁË %li ½µØδÄÜ·ÅÖá£"
@@ -7012,118 +7059,119 @@ msgstr "
 msgid "Cannot find audio file %s"
 msgstr "ÎÞ·¨ÕÒµ½ÒôЧÎļþ %s"
 
-#: client/citydlg_common.c:214
+#. TRANS: Use longer of "XXX turns" and "never"
+#: client/citydlg_common.c:215
 msgid "?filler:XXX/XXX XXX turns"
 msgstr "?filler:XXX/XXX XXX »ØºÏ"
 
-#: client/citydlg_common.c:229
+#: client/citydlg_common.c:231
 #, c-format
 msgid "%3d gold per turn"
 msgstr "ÿ»ØºÏ %3d »Æ½ð"
 
-#: client/citydlg_common.c:239
+#: client/citydlg_common.c:241
 #, c-format
 msgid "%3d turn"
 msgid_plural "%3d turns"
 msgstr[0] "%3d »ØºÏ"
 
-#: client/citydlg_common.c:243 client/citydlg_common.c:365 client/text.c:572
+#: client/citydlg_common.c:245 client/citydlg_common.c:369 client/text.c:572
 #: client/agents/cma_fec.c:249 client/agents/cma_fec.c:283
-#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:529
-#: client/gui-sdl/cityrep.c:1053 client/gui-sdl/wldlg.c:1352
+#: client/gui-gtk-2.0/citydlg.c:1416 client/gui-sdl/cityrep.c:533
+#: client/gui-sdl/cityrep.c:1058 client/gui-sdl/wldlg.c:1352
 #: client/gui-sdl/wldlg.c:1357 client/gui-win32/citydlg.c:455
 msgid "never"
 msgstr "´Ó²»"
 
-#: client/citydlg_common.c:247
+#: client/citydlg_common.c:249
 #, c-format
 msgid "%3d/%3d:%s"
 msgstr "%3d/%3d:%s"
 
-#: client/citydlg_common.c:249
+#: client/citydlg_common.c:251
 #, c-format
 msgid "%3d/%3d %s"
 msgstr "%3d/%3d %s"
 
-#: client/citydlg_common.c:270
+#: client/citydlg_common.c:272
 #, c-format
 msgid "%s (XX) %d/turn"
 msgstr "%s (XX) %d/»ØºÏ"
 
-#: client/citydlg_common.c:288
+#: client/citydlg_common.c:290
 #, c-format
 msgid "%s (%d) %d turn"
 msgid_plural "%s (%d) %d turns"
 msgstr[0] "%s (%d) %d »ØºÏ"
 
-#: client/citydlg_common.c:330 client/citydlg_common.c:343
+#: client/citydlg_common.c:334 client/citydlg_common.c:347
 #: client/gui-sdl/wldlg.c:1328
 msgid "Obsolete"
 msgstr "ÌÔÌ­"
 
-#: client/citydlg_common.c:332 client/citydlg_common.c:340
+#: client/citydlg_common.c:336 client/citydlg_common.c:344
 #: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
 msgid "Built"
 msgstr "½¨³É"
 
-#: client/citydlg_common.c:334
+#: client/citydlg_common.c:338
 msgid "Great Wonder"
 msgstr "´óÆæ¼£"
 
-#: client/citydlg_common.c:338
+#: client/citydlg_common.c:342
 msgid "Small Wonder"
 msgstr "СÆæ¼£"
 
-#: client/citydlg_common.c:357
+#: client/citydlg_common.c:361
 #, c-format
 msgid "%d/turn"
 msgstr "%d/»ØºÏ"
 
-#: client/citydlg_common.c:388
+#: client/citydlg_common.c:392
 #, c-format
 msgid "%+4d : Citizens\n"
 msgstr "%+4d : ÊÐÃñ\n"
 
-#: client/citydlg_common.c:395
+#: client/citydlg_common.c:399
 #, c-format
 msgid "%+4d : Taxed from trade\n"
 msgstr "%+4d : Taxed from trade\n"
 
-#: client/citydlg_common.c:414
+#: client/citydlg_common.c:418
 #, fuzzy, c-format
 msgid "%+4d : Trade route with %s\n"
 msgstr "»¹Ã»ÓÐÉÌ·´æÔÚ¡£\n"
 
-#: client/citydlg_common.c:423
+#: client/citydlg_common.c:427
 #, fuzzy, c-format
 msgid "%+4d : Building tithes\n"
 msgstr "ÕýÔÚ½¨Ô첿¶Ó"
 
-#: client/citydlg_common.c:446
+#: client/citydlg_common.c:450
 #, c-format
 msgid "%+4d : Bonus from %s (%+d%%)\n"
 msgstr ""
 
-#: client/citydlg_common.c:458
+#: client/citydlg_common.c:462
 #, c-format
 msgid "%+4d : Waste\n"
 msgstr ""
 
-#: client/citydlg_common.c:464
+#: client/citydlg_common.c:468
 #, c-format
 msgid "%+4d : Disorder\n"
 msgstr ""
 
-#: client/citydlg_common.c:470
+#: client/citydlg_common.c:474
 #, c-format
 msgid "%+4d : Used\n"
 msgstr ""
 
-#: client/citydlg_common.c:475
+#: client/citydlg_common.c:479
 msgid "==== : Adds up to\n"
 msgstr ""
 
-#: client/citydlg_common.c:477
+#: client/citydlg_common.c:481
 #, c-format
 msgid "%4d : Total surplus"
 msgstr ""
@@ -7235,8 +7283,8 @@ msgid "Best defending units"
 msgstr "×î¼Ñ·ÀÓù²¿¶Ó"
 
 #: client/cityrepdata.c:474 client/cityrepdata.c:478
-#: client/gui-gtk-2.0/cityrep.c:1220 client/gui-gtk-2.0/cityrep.c:1241
-#: client/gui-gtk-2.0/cityrep.c:1260 client/gui-gtk-2.0/cityrep.c:1279
+#: client/gui-gtk-2.0/cityrep.c:1225 client/gui-gtk-2.0/cityrep.c:1246
+#: client/gui-gtk-2.0/cityrep.c:1265 client/gui-gtk-2.0/cityrep.c:1284
 #: client/gui-gtk-2.0/menu.c:810 client/gui-gtk-2.0/repodlgs.c:960
 #: client/gui-sdl/helpdlg.c:688 client/gui-sdl/mapctrl.c:1605
 #: client/gui-sdl/optiondlg.c:1827 client/gui-sdl/repodlgs.c:356
@@ -7406,8 +7454,8 @@ msgstr "
 msgid "?cma:Governor"
 msgstr "¹ÜÀíÕß"
 
-#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1226
-#: client/gui-gtk-2.0/cityrep.c:1499 client/gui-sdl/citydlg.c:3809
+#: client/cityrepdata.c:523 client/gui-gtk-2.0/cityrep.c:1231
+#: client/gui-gtk-2.0/cityrep.c:1504 client/gui-sdl/citydlg.c:3809
 #: client/gui-sdl/cma_fe.c:858 client/gui-win32/citydlg.c:726
 #: data/Freeciv.in:1459 data/helpdata.txt:820
 msgid "Citizen Governor"
@@ -7665,19 +7713,19 @@ msgid ""
 "%d times"
 msgstr "×Ô¶¯Ã¿¸ô %4$f ÃëÒÔ¡°%3$s¡±Á¬½Ó·þÎñÆ÷¡°%1$s¡±¶Ë¿Ú %2$d  %5$d ´Î"
 
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1289
 msgid "novice"
 msgstr "¼«Ò×"
 
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1286
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1289
 msgid "easy"
 msgstr "ÈÝÒ×"
 
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1290
 msgid "normal"
 msgstr "ÆÕͨ"
 
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1287
+#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1290
 msgid "hard"
 msgstr "À§ÄÑ"
 
@@ -7685,31 +7733,31 @@ msgstr "
 msgid "experimental"
 msgstr "ʵÑéÐÔ"
 
-#: client/connectdlg_common.c:212
+#: client/connectdlg_common.c:213
 msgid "Starting server..."
 msgstr "ÕýÔÚÆô¶¯·þÎñÆ÷¡­¡­"
 
-#: client/connectdlg_common.c:329
+#: client/connectdlg_common.c:332
 msgid "Couldn't start the server."
 msgstr "ÎÞ·¨Æô¶¯·þÎñÆ÷¡£"
 
-#: client/connectdlg_common.c:330 client/connectdlg_common.c:363
+#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
 msgid "You'll have to start one manually. Sorry..."
 msgstr "Äú±ØÐëÊÖ¹¤Æô¶¯Ò»¸öÓÎÏ·¡£±§Ç¸..."
 
-#: client/connectdlg_common.c:361
+#: client/connectdlg_common.c:364
 msgid "Couldn't connect to the server."
 msgstr "²»ÄÜÁ¬½Óµ½·þÎñÆ÷¡£"
 
-#: client/connectdlg_common.c:362
+#: client/connectdlg_common.c:365
 msgid "We probably couldn't start it from here."
 msgstr "»òÐíÎÒÃDz»ÄÜ´ÓÕâÀïÆô¶¯Ö®¡£"
 
-#: client/connectdlg_common.c:467
+#: client/connectdlg_common.c:470
 msgid "We have control of the server (command access level hack)"
 msgstr "»ñµÃ¶Ô·þÎñÆ÷µÄ¿ØÖÆ£¨ÃüÁî·ÃÎʼ¶±ð hack£©¡£"
 
-#: client/connectdlg_common.c:472
+#: client/connectdlg_common.c:475
 msgid "We can't take control of server, attempting to kill it."
 msgstr "²»ÄÜ»ñµÃ¶Ô·þÎñÆ÷µÄ¿ØÖÆ£¬ÕýÔÚ³¢ÊԹرշþÎñÆ÷¡£"
 
@@ -7810,27 +7858,27 @@ msgstr ""
 msgid "Requires a minimum size of %d.\n"
 msgstr ""
 
-#: client/helpdata.c:259
+#: client/helpdata.c:263
 #, c-format
 msgid "Allows %s."
 msgstr "ʹÄÜ %s¡£"
 
-#: client/helpdata.c:262
+#: client/helpdata.c:266
 #, c-format
 msgid "Allows %s (with %s)."
 msgstr "ʹÄÜ %s £¨ÈôÓÐ %s£©¡£"
 
 #. TRANS: preserve single space at beginning
-#: client/helpdata.c:414
+#: client/helpdata.c:418
 msgid " Rivers"
 msgstr " ºÓÁ÷"
 
-#: client/helpdata.c:572
+#: client/helpdata.c:576
 #, c-format
 msgid "Sorry, no help topic for %s.\n"
 msgstr "±§Ç¸£¬Ã»ÓйØÓÚ %s µÄÇóÖúÖ÷Ìâ¡£\n"
 
-#: client/helpdata.c:576
+#: client/helpdata.c:580
 #, c-format
 msgid ""
 "Sorry, no help topic for %s.\n"
@@ -7841,7 +7889,7 @@ msgstr ""
 "±¾Ò³ÃæÊÇ×Ô¶¯²úÉúµÄ¡£\n"
 "\n"
 
-#: client/helpdata.c:666
+#: client/helpdata.c:670
 #, fuzzy
 msgid ""
 "Requires: Nothing\n"
@@ -7850,284 +7898,284 @@ msgstr ""
 "ÐèÒª %s ½¨Öþ¡£\n"
 "\n"
 
-#: client/helpdata.c:671
+#: client/helpdata.c:675
 #, c-format
 msgid "* The discovery of %s will make %s obsolete.\n"
 msgstr "* %sµÄ·¢ÏÖ½«Ê¹%s×÷·Ï¡£\n"
 
-#: client/helpdata.c:690
+#: client/helpdata.c:694
 #, c-format
 msgid "* Allows all players with knowledge of %s to build %s units.\n"
 msgstr "* ÔÊÐíËùÓÐÓµÓÐ %s ֪ʶµÄÍæ¼Ò½¨Ôì %s ²¿¶Ó¡£\n"
 
-#: client/helpdata.c:702
+#: client/helpdata.c:706
 #, c-format
 msgid "* Allows %s (with %s).\n"
 msgstr "* ʹÄÜ %s £¨ÈôÓÐ %s£©¡£\n"
 
-#: client/helpdata.c:706
+#: client/helpdata.c:710
 #, c-format
 msgid "* Allows %s.\n"
 msgstr "* ʹÄÜ %s¡£\n"
 
-#: client/helpdata.c:776
+#: client/helpdata.c:780
 #, fuzzy, c-format
 msgid "* Can only be built if there is %s in the city.\n"
 msgstr "* Ö»ÄÜÔÚ %s Õþ¸®ÏÂÐÞ½¨¡£\n"
 
-#: client/helpdata.c:782
+#: client/helpdata.c:786
 #, c-format
 msgid "* Can only be built with %s as government.\n"
 msgstr "* Ö»ÄÜÔÚ %s Õþ¸®ÏÂÐÞ½¨¡£\n"
 
-#: client/helpdata.c:787
+#: client/helpdata.c:791
 msgid "* May not be built in cities.\n"
 msgstr "* ²»ÄÜÔÚ³ÇÊÐÖÐÐÞ½¨¡£\n"
 
-#: client/helpdata.c:790
+#: client/helpdata.c:794
 msgid "* Never has a home city.\n"
 msgstr "* ´ÓÀ´Ã»ÓлùµØ³ÇÊС£\n"
 
-#: client/helpdata.c:793
+#: client/helpdata.c:797
 msgid "* Losing this unit will lose you the game!\n"
 msgstr "* ʧȥÕâ¸ö²¿¶Ó½«ÊäµôÓÎÏ·£¡\n"
 
-#: client/helpdata.c:797
+#: client/helpdata.c:801
 msgid "* Each player may only have one of this type of unit.\n"
 msgstr "* ÿ¸öÍæ¼ÒÖ»ÄÜÓµÓÐÒ»¸öÕâÖÖÀàÐ͵IJ¿¶Ó¡£\n"
 
-#: client/helpdata.c:801
+#: client/helpdata.c:805
 #, c-format
 msgid "* Requires %d population to build.\n"
 msgstr "* ÐèÒª %d ÈË¿Ú²ÅÄÜÐÞ½¨¡£\n"
 
-#: client/helpdata.c:807
+#: client/helpdata.c:811
 #, c-format
 msgid "* Can carry and refuel %d air unit.\n"
 msgid_plural "* Can carry and refuel %d air units.\n"
 msgstr[0] "* Äܹ»Ð¯´ø²¢Îª %d ¸ö·ÉÐÐÆ÷¼ÓÓÍ¡£\n"
 
-#: client/helpdata.c:812
+#: client/helpdata.c:816
 #, c-format
 msgid "* Can carry and refuel %d missile unit.\n"
 msgid_plural "* Can carry and refuel %d missile units.\n"
 msgstr[0] "* Äܹ»Ð¯´ø²¢Îª %d ¸öµ¼µ¯¡£\n"
 
-#: client/helpdata.c:817
+#: client/helpdata.c:821
 #, c-format
 msgid "* Can carry %d ground unit across water.\n"
 msgid_plural "* Can carry %d ground units across water.\n"
 msgstr[0] "* Äܹ»Ð¯´ø %d ¸öµØÃ沿¶Ó¶ÉË®¡£\n"
 
-#: client/helpdata.c:826
+#: client/helpdata.c:830
 msgid ""
 "* Can establish trade routes (must travel to target city and must be at "
 "least 9 tiles [in Manhattan distance] from this unit's home city).\n"
 msgstr ""
 
-#: client/helpdata.c:832
+#: client/helpdata.c:836
 #, c-format
 msgid "* Can help build wonders (adds %d production).\n"
 msgstr "* Äܹ»°ïÖúÐÞÖþÆæ¼££¨Ôö¼Ó %d ²ú³ö£©¡£\n"
 
-#: client/helpdata.c:836
+#: client/helpdata.c:840
 msgid "* May not be disbanded.\n"
 msgstr "* ²»Äܱ»½âÉ¢¡£\n"
 
-#: client/helpdata.c:838
+#: client/helpdata.c:842
 #, c-format
 msgid "* May be disbanded in a city to recover 50%% of the production cost.\n"
 msgstr "* ¿ÉÒÔÔÚ³ÇÊÐÖнâÉ¢ÒÔÊÕ»Ø 50%% µÄÉú²ú³É±¾¡£\n"
 
-#: client/helpdata.c:842
+#: client/helpdata.c:846
 msgid "* Can build new cities.\n"
 msgstr "* Äܹ»ÐÞÖþгÇÊС£\n"
 
-#: client/helpdata.c:845
+#: client/helpdata.c:849
 #, c-format
 msgid "* Can add on %d population to cities of no more than size %d.\n"
 msgstr ""
 
-#: client/helpdata.c:854
+#: client/helpdata.c:858
 msgid "* Can build roads and railroads.\n"
 msgstr "* Äܹ»ÐÞ½¨¹«Â·ºÍÌú·¡£\n"
 
-#: client/helpdata.c:855
+#: client/helpdata.c:859
 msgid "* Can build mines on tiles.\n"
 msgstr "* Äܹ»ÔÚ·½¸ñÉÏÐÞÖþ¿ó¾®¡£\n"
 
-#: client/helpdata.c:856
+#: client/helpdata.c:860
 msgid "* Can build irrigation on tiles.\n"
 msgstr "* Äܹ»ÔÚ·½¸ñÉÏÐÞ½¨Ë®ÀûÉèÊ©¡£\n"
 
-#: client/helpdata.c:861
+#: client/helpdata.c:865
 msgid "* Can build farmland.\n"
 msgstr "* Äܹ»ÐÞ½¨Å©³¡¡£\n"
 
-#: client/helpdata.c:865
+#: client/helpdata.c:869
 #, c-format
 msgid "* Can build farmland (if %s is known).\n"
 msgstr "* Äܹ»ÐÞ½¨Å©³¡£¨Èç¹ûÕÆÎÕÁË %s )¡£\n"
 
-#: client/helpdata.c:869
+#: client/helpdata.c:873
 #, c-format
 msgid "* Can build farmland (if any of the following are known: %s).\n"
 msgstr "* Äܹ»ÐÞ½¨Å©³¡£¨Èç¹ûÕÆÎÕÁËÏÂÃæÈκÎ֪ʶ£º%s£©¡£\n"
 
-#: client/helpdata.c:877
+#: client/helpdata.c:881
 msgid "* Can build fortresses.\n"
 msgstr "* Äܹ»½¨ÖþÒªÈû¡£\n"
 
-#: client/helpdata.c:881
+#: client/helpdata.c:885
 #, c-format
 msgid "* Can build fortresses (if %s is known).\n"
 msgstr "* Äܹ»½¨ÖþÒªÈû£¨Èç¹ûÕÆÎÕÁË %s £©¡£\n"
 
-#: client/helpdata.c:885
+#: client/helpdata.c:889
 #, c-format
 msgid "* Can build fortresses (if any of the following are known: %s).\n"
 msgstr "* Äܹ»½¨ÖþÒªÈû£¨Èç¹ûÕÆÎÕÁËÏÂÃæÈκÎ֪ʶ£º%s£©¡£\n"
 
-#: client/helpdata.c:891
+#: client/helpdata.c:895
 msgid "* Can clean pollution from tiles.\n"
 msgstr "* Äܹ»´Ó·½¸ñÉÏÇå³ýÎÛȾ¡£\n"
 
-#: client/helpdata.c:892
+#: client/helpdata.c:896
 msgid "* Can clean nuclear fallout from tiles.\n"
 msgstr "* Äܹ»´Ó·½¸ñÉÏÇå³ýºË·øÉä¡£\n"
 
-#: client/helpdata.c:895
+#: client/helpdata.c:899
 msgid "* Can transform tiles.\n"
 msgstr "* Äܹ»¸Ä±ä·½¸ñÀàÐÍ¡£\n"
 
-#: client/helpdata.c:898
+#: client/helpdata.c:902
 msgid "* Can build airbases.\n"
 msgstr "* Äܹ»ÐÞ½¨¿Õ¾ü»ùµØ¡£\n"
 
-#: client/helpdata.c:902
+#: client/helpdata.c:906
 #, c-format
 msgid "* May fortify, granting a 50%% defensive bonus.\n"
 msgstr "* ¿ÉÒÔÉè·À£¬µÃµ½ 50%% µÄ·ÀÓù½±Àø¡£\n"
 
-#: client/helpdata.c:905
+#: client/helpdata.c:909
 msgid "* May pillage to destroy infrastructure from tiles.\n"
 msgstr "* ¿ÉÒÔ½øÐÐÆÆ»µÒԴݻٷ½¸ñÉϵĻù´¡ÉèÊ©¡£\n"
 
-#: client/helpdata.c:909
+#: client/helpdata.c:913
 msgid "* Can perform diplomatic actions, plus special spy abilities.\n"
 msgstr "* Äܹ»½øÐÐÍâ½»»î¶¯£¬²¢¾ßÓÐÌرð¼äµýÄÜÁ¦¡£\n"
 
-#: client/helpdata.c:912
+#: client/helpdata.c:916
 msgid "* Can perform diplomatic actions.\n"
 msgstr "* Äܹ»½øÐÐÍâ½»»î¶¯¡£\n"
 
-#: client/helpdata.c:916
+#: client/helpdata.c:920
 msgid "* Will never lose a diplomat-versus-diplomat fight.\n"
 msgstr "* ´Ó²»Êäµô Íâ½»¶ÔÍâ½» µÄÕ½¶·¡£\n"
 
-#: client/helpdata.c:919
+#: client/helpdata.c:923
 msgid "* May not be bribed.\n"
 msgstr "* ²»Äܱ»»ß¸¡£\n"
 
-#: client/helpdata.c:922
+#: client/helpdata.c:926
 msgid "* Can attack enemy air units.\n"
 msgstr "* Äܹ»¹¥»÷µÐ·½µÄ¿ÕÖв¿¶Ó¡£\n"
 
-#: client/helpdata.c:926
+#: client/helpdata.c:930
 msgid "* Is invisible except when next to an enemy unit or city.\n"
 msgstr "* ÊDz»¿É¼ûµÄ³ý·Ç½ô¿¿µÐ·½²¿¶Ó»ò³ÇÊС£\n"
 
-#: client/helpdata.c:930
+#: client/helpdata.c:934
 msgid "* Can only attack units on ocean squares (no land attacks).\n"
 msgstr "* Ö»Äܹ¥»÷º£Ñ󷽸ñµÄ²¿¶Ó£¨²»Äܹ¥»÷½µØ£©¡£\n"
 
-#: client/helpdata.c:934
+#: client/helpdata.c:938
 msgid ""
 "* Can attack from aboard sea units: against enemy cities and onto land "
 "squares.\n"
 msgstr "* Äܹ»´Ó´¬ÉϵIJ¿¶Ó¹¥»÷£ºÕë¶ÔµÐ·½³ÇÊкͽµØ·½¸ñ¡£\n"
 
-#: client/helpdata.c:939
+#: client/helpdata.c:943
 #, c-format
 msgid "* Can be paradropped from a friendly city (Range: %d).\n"
 msgstr "* Äܹ»´ÓÓѺóÇÊпսµ£¨·¶Î§£º %d£©¡£\n"
 
-#: client/helpdata.c:945
+#: client/helpdata.c:949
 msgid "* Gets double defense against units specified as 'mounted'.\n"
 msgstr "* ¶Ô¡°Æï±ø¡±²¿¶ÓµÄ·ÀÓùÄÜÁ¦·­±¶¡£\n"
 
-#: client/helpdata.c:949
+#: client/helpdata.c:953
 msgid "* Counts as 'mounted' against certain defenders.\n"
 msgstr "* ¶ÔijЩ·ÀÓùÕß¼ÆΪ¡°Æï±ø¡±¡£\n"
 
-#: client/helpdata.c:953
+#: client/helpdata.c:957
 msgid "* A missile unit: gets used up in making an attack.\n"
 msgstr "* µ¼µ¯²¿¶Ó£ºÔÚ½øÐй¥»÷ºóºÄ¾¡¡£\n"
 
-#: client/helpdata.c:956
+#: client/helpdata.c:960
 msgid "* Making an attack ends this unit's turn.\n"
 msgstr "* ½øÐй¥»÷½«½áÊø´Ë²¿¶Ó¡£\n"
 
-#: client/helpdata.c:960
+#: client/helpdata.c:964
 msgid "* This unit's attack causes a nuclear explosion!\n"
 msgstr "* ¸Ã²¿¶ÓµÄ¹¥»÷µ¼Öº˱¬Õ¨£¡\n"
 
-#: client/helpdata.c:964
+#: client/helpdata.c:968
 msgid "* Gets double firepower when attacking cities.\n"
 msgstr "* ¹¥»÷³ÇÊÐʱµÃµ½Ë«±¶»ðÁ¦¡£\n"
 
-#: client/helpdata.c:967
+#: client/helpdata.c:971
 msgid "* Ignores the effects of city walls.\n"
 msgstr "* ºöÂÔ³ÇǽµÄЧ¹û¡£\n"
 
-#: client/helpdata.c:971
+#: client/helpdata.c:975
 #, c-format
 msgid ""
 "* Does bombard attacks (%d per turn).  These attacks will only damage (never "
 "kill) the defender, but have no risk for the attacker.\n"
 msgstr ""
 
-#: client/helpdata.c:978
+#: client/helpdata.c:982
 msgid "* Gets quintuple defense against missiles and aircraft.\n"
 msgstr "* »ñµÃ5±¶µÄ¶Ôµ¼µ¯ºÍ·É»úµÄ·ÀÓùÄÜÁ¦¡£\n"
 
-#: client/helpdata.c:982
+#: client/helpdata.c:986
 msgid "* Ignores terrain effects (treats all squares as roads).\n"
 msgstr "* ºöÂÔµØÐÎЧ¹û£¨°ÑËùÓз½¸ñµ±×÷¹«Â·£©¡£\n"
 
-#: client/helpdata.c:985
+#: client/helpdata.c:989
 msgid "* Ignores zones of control.\n"
 msgstr "* ºöÂÔÇøÓò¿ØÖÆ¡£\n"
 
-#: client/helpdata.c:989
+#: client/helpdata.c:993
 msgid "* A non-military unit (cannot attack; no martial law).\n"
 msgstr "* ·Ç¾üʲ¿¶Ó£¨²»Äܹ¥»÷£»ÎÞ¾üʹÜÖÆ£©¡£\n"
 
-#: client/helpdata.c:993
+#: client/helpdata.c:997
 msgid "* A field unit: one unhappiness applies even when non-aggressive.\n"
 msgstr "* Õ½³¡²¿¶Ó£º¼´Ê¹ÊÇ·ÇÇÖÂÔÐ͵ÄÒ²½«ÒýÆð1µãÓÇÓô¡£\n"
 
-#: client/helpdata.c:996
+#: client/helpdata.c:1000
 msgid "* Will never achieve veteran status.\n"
 msgstr "* ´Ó²»»á´ïµ½ÀÏÁ·×´Ì¬¡£\n"
 
-#: client/helpdata.c:998
+#: client/helpdata.c:1002
 msgid "* May become veteran through training or combat.\n"
 msgstr "* ¿ÉÒÔͨ¹ýѵÁ·»òÕ½¶·´ïµ½ÀÏÁ·¡£\n"
 
-#: client/helpdata.c:1004
+#: client/helpdata.c:1008
 #, c-format
 msgid ""
 "* Must end turn in a city or next to land, or has a 50%% risk of being lost "
 "at sea.\n"
 msgstr "»ØºÏ½áÊøʱ±ØÐëλÓÚ³ÇÊлò¿¿½ü½µØ£¬·ñÔòÓÐ50%%µÄ·çÏÕ»áÔÚº£ÖÐʧ×Ù¡£\n"
 
-#: client/helpdata.c:1008
+#: client/helpdata.c:1012
 #, c-format
 msgid "* The discovery of %s reduces the risk to 25%%.\n"
 msgstr "%sµÄ·¢ÏÖ½«·çÏÕ½µµÍµ½25%% ¡£\n"
 
-#: client/helpdata.c:1013
+#: client/helpdata.c:1017
 #, c-format
 msgid "* %s reduces the risk to 12%%.\n"
 msgstr "* %s½«·çÏÕ½µµÍµ½12%% ¡£\n"
@@ -8136,114 +8184,114 @@ msgstr "* %s
 #. *        last two elements
 #. TRANS: List of possible output types has this between
 #. *        last two elements
-#: client/helpdata.c:1064 client/helpdata.c:1398
+#: client/helpdata.c:1068 client/helpdata.c:1402
 msgid " or "
 msgstr " »ò "
 
-#: client/helpdata.c:1066 client/helpdata.c:1386
+#: client/helpdata.c:1070 client/helpdata.c:1390
 msgid "?or:, "
 msgstr " »ò "
 
-#: client/helpdata.c:1078
+#: client/helpdata.c:1082
 #, c-format
 msgid "* Unit has to be in a city, or on a %s after %d turn.\n"
 msgid_plural "* Unit has to be in a city, or on a %s after %d turns.\n"
 msgstr[0] "* %2$d ¸ö»ØºÏÖ®ºó²¿¶Ó±ØÐëÔÚ³ÇÊÐÖлòÕß%1$sÉÏ¡£\n"
 
-#: client/helpdata.c:1120
+#: client/helpdata.c:1124
 #, c-format
 msgid "If we would now start with %s we would need %d bulbs."
 msgstr "Èç¹ûÏÖÔÚ¿ªÊ¼Ñо¿ %s ÄÇô½«ÐèÒª %d µã¡£"
 
-#: client/helpdata.c:1125
+#: client/helpdata.c:1129
 #, c-format
 msgid ""
 "To reach %s we need to obtain %d other technologies first. The whole project "
 "will require %d bulbs to complete."
 msgstr "ÒªÕÆÎÕ %s ÐèÒªÊ×ÏÈ»ñµÃ %d ÏîÆäËü¿Æ¼¼¡£Õû¸öÏîÄ¿ÐèÒª %d µãÍê³É¡£"
 
-#: client/helpdata.c:1133
+#: client/helpdata.c:1137
 msgid "You cannot research this technology."
 msgstr "Äú²»ÄÜÑо¿ÕâÏî¿Æ¼¼¡£"
 
-#: client/helpdata.c:1137
+#: client/helpdata.c:1141
 msgid " This number may vary depending on what other players will research.\n"
 msgstr " ´ËÊý×Ö¿ÉÄÜÒòÆäËûÍæ¼ÒµÄÑо¿ÄÚÈݶø¸Ä±ä¡£\n"
 
-#: client/helpdata.c:1149
+#: client/helpdata.c:1153
 #, c-format
 msgid "* The first player to research %s gets an immediate advance.\n"
 msgstr "* µÚÒ»¸öÑо¿ %s µÄÍæ¼Ò¿ÉÒÔÁ¢¿Ì»ñµÃÒ»Ïî½øÕ¹¡£\n"
 
-#: client/helpdata.c:1154
+#: client/helpdata.c:1158
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
 msgstr "* ½µµÍÔÚÔ¶ÑóÖÐʧȥ´¬Ö»µÄ»ú»áµ½ 25%% ¡£\n"
 
-#: client/helpdata.c:1157
+#: client/helpdata.c:1161
 #, c-format
 msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
 msgstr "* ½µµÍÔÚÔ¶ÑóÖÐʧȥ´¬Ö»µÄ»ú»áµ½ 12%% ¡£\n"
 
-#: client/helpdata.c:1161
+#: client/helpdata.c:1165
 msgid "* Increases the pollution generated by the population.\n"
 msgstr "* Ôö¼ÓÓÉÈË¿ÚÌ«¶àÔì³ÉµÄÎÛȾ¡£\n"
 
-#: client/helpdata.c:1166
+#: client/helpdata.c:1170
 #, c-format
 msgid "* Allows %s to build roads on river squares.\n"
 msgstr "* ʹ %s Äܹ»ÔÚºÓÁ÷ÉÏÐÞ½¨µÀ·¡£\n"
 
-#: client/helpdata.c:1173
+#: client/helpdata.c:1177
 #, c-format
 msgid "* Allows %s to build fortresses.\n"
 msgstr "* ʹ %s Äܹ»½¨ÖþÒªÈû¡£\n"
 
-#: client/helpdata.c:1181
+#: client/helpdata.c:1185
 #, c-format
 msgid "* Allows %s to build airbases.\n"
 msgstr "* ʹ %s Äܹ»½¨Öþ¿Õ¾ü»ùµØ¡£\n"
 
-#: client/helpdata.c:1190
+#: client/helpdata.c:1194
 #, c-format
 msgid "* Allows %s to upgrade roads to railroads.\n"
 msgstr "* ʹ %s Äܹ»½«¹«Â·Éý¼¶ÎªÌú·¡£\n"
 
-#: client/helpdata.c:1198
+#: client/helpdata.c:1202
 #, c-format
 msgid "* Allows %s to upgrade irrigation to farmland.\n"
 msgstr "* ʹ %s Äܹ»½«Ë®ÀûÉý¼¶ÎªÅ©³¡¡£\n"
 
-#: client/helpdata.c:1232
+#: client/helpdata.c:1236
 msgid "* Pollution cannot be generated on this terrain."
 msgstr "* ÔÚÕâÖÖµØÐÎÉϲ»»á²úÉúÎÛȾ¡£"
 
-#: client/helpdata.c:1237
+#: client/helpdata.c:1241
 msgid "* You cannot build cities on this terrain."
 msgstr "* Äú²»ÄÜÔڴ˵ØÐÎÉϽ¨Ôì³ÇÊС£"
 
-#: client/helpdata.c:1243
+#: client/helpdata.c:1247
 msgid "* The coastline of this terrain is unsafe."
 msgstr "* ÕâÖÖµØÐεĺ£°¶Ïß²»°²È«¡£"
 
-#: client/helpdata.c:1248
+#: client/helpdata.c:1252
 msgid "* This terrain is unsafe for units to travel on."
 msgstr "* ²¿¶ÓÔÚÕâÖÖµØÐÎÉÏ´©Ðв»°²È«¡£"
 
-#: client/helpdata.c:1253
+#: client/helpdata.c:1257
 msgid "* Land units cannot travel on oceanic terrains."
 msgstr "* ½µØ²¿¶Ó²»ÄÜÔÚº£ÑóµØÐÎÉÏ´©ÐС£"
 
-#: client/helpdata.c:1303
+#: client/helpdata.c:1307
 msgid "Features:\n"
 msgstr ""
 
 #. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1409 client/helpdata.c:1410
+#: client/helpdata.c:1413 client/helpdata.c:1414
 msgid "?outputlist: Nothing "
 msgstr ""
 
-#: client/helpdata.c:1417
+#: client/helpdata.c:1421
 #, c-format
 msgid ""
 "* Military units away from home and field units will cause %d citizen to "
@@ -8253,7 +8301,7 @@ msgid_plural ""
 "become unhappy.\n"
 msgstr[0] ""
 
-#: client/helpdata.c:1427
+#: client/helpdata.c:1431
 #, c-format
 msgid ""
 "* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8261,48 +8309,48 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1435
+#: client/helpdata.c:1439
 #, c-format
 msgid "* You pay %d times normal %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1440
+#: client/helpdata.c:1444
 #, c-format
 msgid "* You pay %d times normal upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1445
+#: client/helpdata.c:1449
 #, c-format
 msgid "* You pay no %s upkeep for your units.\n"
 msgstr ""
 
-#: client/helpdata.c:1449
+#: client/helpdata.c:1453
 msgid "* You pay no upkeep for your units.\n"
 msgstr ""
 
 #. TRANS: %s is the output type, like 'shield' or 'gold'.
 #. * There is currently no way to control the
 #. * singular/plural version of these.
-#: client/helpdata.c:1458
+#: client/helpdata.c:1462
 #, c-format
 msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
 msgstr ""
 
 #. TRANS: Amount is subtracted from upkeep cost
 #. * for each upkeep type.
-#: client/helpdata.c:1466
+#: client/helpdata.c:1470
 #, c-format
 msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
 msgstr ""
 
-#: client/helpdata.c:1473
+#: client/helpdata.c:1477
 #, c-format
 msgid "* Chance of civil war is %d%% if you lose your capital.\n"
 msgstr "* ʧȥÊ׶¼Ê±·¢ÉúÄÚÕ½µÄ»ú»áÊÇ %d%%¡£\n"
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1480
+#: client/helpdata.c:1484
 #, c-format
 msgid ""
 "* The first unhappy citizen in each city due to civilization size will "
@@ -8310,23 +8358,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1487
+#: client/helpdata.c:1491
 #, c-format
 msgid ""
 "* After the first unhappy citizen due to city size, for each %d additional "
 "cities, another unhappy citizen will appear.\n"
 msgstr ""
 
-#: client/helpdata.c:1495
+#: client/helpdata.c:1499
 #, c-format
 msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
 msgstr ""
 
-#: client/helpdata.c:1500
+#: client/helpdata.c:1504
 msgid "Has unlimited science/gold/luxuries rates.\n"
 msgstr ""
 
-#: client/helpdata.c:1505
+#: client/helpdata.c:1509
 #, c-format
 msgid ""
 "* Your units may impose martial law. Each military unit inside a city will "
@@ -8336,67 +8384,67 @@ msgid_plural ""
 "force %d unhappy citizens to become content.\n"
 msgstr[0] ""
 
-#: client/helpdata.c:1517
+#: client/helpdata.c:1521
 #, c-format
 msgid "* A maximum of %d unit in each city can enforce martial law.\n"
 msgid_plural "* A maximum of %d units in each city can enforce martial law.\n"
 msgstr[0] ""
 
 #. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1528
+#: client/helpdata.c:1532
 #, c-format
 msgid ""
 "* You may grow your cities by means of celebrations.  Your cities must be at "
 "least size %d before they can grow in this manner.\n"
 msgstr ""
 
-#: client/helpdata.c:1534
+#: client/helpdata.c:1538
 msgid "* Your units cannot be bribed.\n"
 msgstr "* ÄúµÄ²¿¶Ó²»Äܱ»»ß¸¡£\n"
 
-#: client/helpdata.c:1537
+#: client/helpdata.c:1541
 msgid "* Your cities cannot be incited.\n"
 msgstr "* ÄúµÄ³ÇÊв»Äܱ»É¿¶¯¡£\n"
 
-#: client/helpdata.c:1541
+#: client/helpdata.c:1545
 msgid ""
 "* Government will fall into anarchy if any city is in disorder for more than "
 "two turns in a row.\n"
 msgstr ""
 
-#: client/helpdata.c:1547
+#: client/helpdata.c:1551
 msgid "* Has a senate that may prevent declaration of war.\n"
 msgstr "* ÓµÓÐÒ»¸ö¿ÉÄÜ»á×èÖ¹ÐûÕ½µÄÒé»á¡£\n"
 
-#: client/helpdata.c:1551
+#: client/helpdata.c:1555
 msgid "* Allows partisans when cities are taken by the enemy.\n"
 msgstr ""
 
-#: client/helpdata.c:1555
+#: client/helpdata.c:1559
 msgid ""
 "* Buildings that normally confer bonuses against unhappiness will instead "
 "give gold.\n"
 msgstr ""
 
-#: client/helpdata.c:1559
+#: client/helpdata.c:1563
 msgid "* Pays no upkeep for fanatics.\n"
 msgstr ""
 
-#: client/helpdata.c:1562
+#: client/helpdata.c:1566
 msgid "* Has no unhappy citizens.\n"
 msgstr "* ûÓÐÓÇÓôµÄÊÐÃñ¡£\n"
 
-#: client/helpdata.c:1572 client/helpdata.c:1576 client/helpdata.c:1580
+#: client/helpdata.c:1576 client/helpdata.c:1580 client/helpdata.c:1584
 #, c-format
 msgid "* Veteran %s units.\n"
 msgstr "* ÀÏÁ· %s ²¿¶Ó.\n"
 
-#: client/helpdata.c:1583
+#: client/helpdata.c:1587
 msgid "* Veteran units.\n"
 msgstr "* ÀÏÁ·²¿¶Ó¡£\n"
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1589
+#: client/helpdata.c:1593
 #, c-format
 msgid ""
 "* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8404,7 +8452,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1598
+#: client/helpdata.c:1602
 #, c-format
 msgid ""
 "* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8412,72 +8460,72 @@ msgid ""
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1606
+#: client/helpdata.c:1610
 #, c-format
 msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
 msgstr ""
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1615
+#: client/helpdata.c:1619
 #, fuzzy, c-format
 msgid "* %s production is increased %d%%.\n"
 msgstr "* %s ²ú³ö½«ÓÐÑÏÖØËðºÄ¡£\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1623
+#: client/helpdata.c:1627
 #, c-format
 msgid "* %s production will suffer massive waste.\n"
 msgstr "* %s ²ú³ö½«ÓÐÑÏÖØËðºÄ¡£\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1628
+#: client/helpdata.c:1632
 #, c-format
 msgid "* %s production will suffer some waste.\n"
 msgstr "* %s ²ú³ö½«ÓÐÒ»¶¨ËðºÄ¡£\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1633
+#: client/helpdata.c:1637
 #, c-format
 msgid "* %s production will suffer a small amount of waste.\n"
 msgstr "* %s ²ú³ö½«ÓÐÉÙÁ¿ËðºÄ¡£\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1641
+#: client/helpdata.c:1645
 #, c-format
 msgid "* %s waste will increase quickly with distance from capital.\n"
 msgstr "* %s ËðºÄ½«Ëæ×ÅÓëÊ׶¼¾àÀëµÄÔö´ó¶øѸËÙÔö¼Ó¡£\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1647
+#: client/helpdata.c:1651
 #, c-format
 msgid "* %s waste will increase with distance from capital.\n"
 msgstr "* %s ËðºÄ½«Ëæ×ÅÓëÊ׶¼¾àÀëµÄÔö´ó¶øÔö¼Ó¡£\n"
 
 #. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1653
+#: client/helpdata.c:1657
 #, c-format
 msgid "* %s waste will increase slowly with distance from capital.\n"
 msgstr "* %s ËðºÄ½«Ëæ×ÅÓëÊ׶¼¾àÀëµÄÔö´ó¶ø»ºÂýÔö¼Ó¡£\n"
 
-#: client/helpdata.c:1670
+#: client/helpdata.c:1674
 #, c-format
 msgid "* Allows you to build %s.\n"
 msgstr "* ʹÄúÄܹ»ÐÞ½¨ %s ¡£\n"
 
 #. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1697
+#: client/helpdata.c:1701
 #, c-format
 msgid "%s%d %s"
 msgstr "%s%d %s"
 
-#: client/helpdata.c:1698 client/helpdata.c:1706 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1702 client/helpdata.c:1710 client/gui-sdl/mapview.c:810
 #: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
 #, fuzzy
 msgid "?blistmore:, "
 msgstr "?blistmore: "
 
 #. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1705
+#: client/helpdata.c:1709
 #, c-format
 msgid "%s%d unhappy"
 msgstr "%s%d ÓÇÓô"
@@ -8873,16 +8921,16 @@ msgstr "
 msgid "Start of turn %d"
 msgstr "»ØºÏ %d ¿ªÊ¼"
 
-#: client/packhand.c:1598
+#: client/packhand.c:1590
 #, c-format
 msgid "AI Mode is now %s."
 msgstr "µ±Ç°µÄ AI ģʽΪ %s¡£"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "ON"
 msgstr "¿ª"
 
-#: client/packhand.c:1599
+#: client/packhand.c:1591
 msgid "OFF"
 msgstr "¹Ø"
 
@@ -8913,13 +8961,13 @@ msgstr "
 msgid "Username"
 msgstr "̞"
 
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:650
-#: client/gui-gtk-2.0/pages.c:2082
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
+#: client/gui-gtk-2.0/pages.c:2085
 msgid "Flag"
 msgstr "¹úÆì"
 
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:654
-#: client/gui-gtk-2.0/pages.c:1533 client/gui-gtk-2.0/pages.c:2084
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
+#: client/gui-gtk-2.0/pages.c:1536 client/gui-gtk-2.0/pages.c:2087
 #: client/gui-sdl/repodlgs.c:2063 client/gui-win32/connectdlg.c:988
 #: client/gui-win32/dialogs.c:542 client/gui-win32/plrdlg.c:335
 msgid "Nation"
@@ -8933,7 +8981,7 @@ msgstr "
 msgid "Score"
 msgstr "·ÖÊý"
 
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1539
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1542
 msgid "Team"
 msgstr "ÍŶÓ"
 
@@ -8966,36 +9014,36 @@ msgstr "
 msgid "Ping"
 msgstr "PingÖµ"
 
-#: client/repodlgs_common.c:371
+#: client/repodlgs_common.c:375
 msgid "You cannot sell improvements."
 msgstr "Äú²»ÄÜÂô³ö½¨Öþ¡£"
 
-#: client/repodlgs_common.c:387
+#: client/repodlgs_common.c:391
 #, c-format
 msgid "Sold %d %s for %d gold."
 msgstr "ÒÔ %3$d »Æ½ðÂô³ö %1$d %2$s"
 
-#: client/repodlgs_common.c:392
+#: client/repodlgs_common.c:396
 #, c-format
 msgid "No %s could be sold."
 msgstr "ûÓÐ %s Äܱ»³öÊÛ¡£"
 
 #. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:411
+#: client/repodlgs_common.c:415
 msgid "You cannot disband units."
 msgstr "Äú²»ÄܽâÉ¢²¿¶Ó¡£"
 
-#: client/repodlgs_common.c:416
+#: client/repodlgs_common.c:420
 #, c-format
 msgid "%s cannot be disbanded."
 msgstr "%s ²»Äܱ»½âÉ¢¡£"
 
-#: client/repodlgs_common.c:437
+#: client/repodlgs_common.c:441
 #, c-format
 msgid "Disbanded %d %s."
 msgstr "ÒѽâÉ¢ %d %s ¡£"
 
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:445
 #, c-format
 msgid "No %s could be disbanded."
 msgstr "ûÓÐ %s Äܱ»½âÉ¢¡£"
@@ -9293,118 +9341,123 @@ msgstr "
 msgid "Tax: %d Lux: %d Sci: %d"
 msgstr "Ë°£º%d Ó飺%d ÑУº%d"
 
-#: client/text.c:606
+#: client/text.c:607
+#, fuzzy
+msgid "Moving: Nobody"
+msgstr "Òƶ¯ÖУº%s"
+
+#: client/text.c:609
 #, c-format
 msgid "Moving: %s"
 msgstr "Òƶ¯ÖУº%s"
 
-#: client/text.c:609
+#: client/text.c:613
 msgid "(Click for more info)"
 msgstr "£¨µã»÷ÒԲ鿴¸ü¶àÐÅÏ¢£©"
 
-#: client/text.c:625
+#: client/text.c:629
 #, c-format
 msgid "%s People"
 msgstr "%s ÈË¿Ú"
 
-#: client/text.c:629
+#: client/text.c:633
 #, c-format
 msgid "Turn: %d"
 msgstr "»ØºÏ£º%d"
 
-#: client/text.c:631 client/gui-win32/inteldlg.c:111
+#: client/text.c:635 client/gui-win32/inteldlg.c:111
 #: client/gui-xaw/inteldlg.c:208
 #, c-format
 msgid "Gold: %d"
 msgstr "»Æ½ð£º%d"
 
-#: client/text.c:632
+#: client/text.c:636
 #, c-format
 msgid "Net Income: %d"
 msgstr "¾»ÊÕÈ룺%d"
 
 #. TRANS: Gold, luxury, and science rates are in percentage values.
-#: client/text.c:635
+#: client/text.c:639
 #, c-format
 msgid "Tax rates: Gold:%d%% Luxury:%d%% Science:%d%%"
 msgstr "Ë°ÂÊ£º»Æ½ð£º%d%% ÓéÀÖ£º%d%% ¿ÆÑУº%d%%"
 
-#: client/text.c:639
+#: client/text.c:643
 #, c-format
 msgid "Researching %s: %s"
 msgstr "ÕýÔÚÑо¿ %s£º%s"
 
-#: client/text.c:646
+#: client/text.c:650
 #, c-format
 msgid "Global warming chance: %d%% (%+d%%/turn)"
 msgstr "È«Çò±äů¼¸ÂÊ£º%d%% £¨%+d%%/»ØºÏ£©"
 
-#: client/text.c:649
+#: client/text.c:653
 #, c-format
 msgid "Nuclear winter chance: %d%% (%+d%%/turn)"
 msgstr "ºË¶¬Ì켸ÂÊ£º%d%% £¨%+d%%/»ØºÏ£©"
 
-#: client/text.c:654 client/gui-win32/inteldlg.c:104
+#: client/text.c:658 client/gui-win32/inteldlg.c:104
 #: client/gui-xaw/inteldlg.c:200
 #, c-format
 msgid "Government: %s"
 msgstr "Õþ¸®£º%s"
 
-#: client/text.c:678
+#: client/text.c:682
 #, c-format
 msgid "%d unit"
 msgid_plural "%d units"
 msgstr[0] "%d ²¿¶Ó"
 
 #. TRANS: Impossible to reach goto target tile
-#: client/text.c:711 client/gui-sdl/mapview.c:566
+#: client/text.c:715 client/gui-sdl/mapview.c:566
 msgid "?goto:Unreachable"
 msgstr ""
 
-#: client/text.c:713 client/gui-sdl/mapview.c:568
+#: client/text.c:717 client/gui-sdl/mapview.c:568
 #, c-format
 msgid "Turns to target: %d"
 msgstr "¾àÀëÄ¿±ê»ØºÏÊý£º%d"
 
-#: client/text.c:715 client/gui-sdl/mapview.c:570
+#: client/text.c:719 client/gui-sdl/mapview.c:570
 #, c-format
 msgid "Turns to target: %d to %d"
 msgstr "¾àÀëÄ¿±ê»ØºÏÊý£º%d µ½ %d"
 
-#: client/text.c:721 client/gui-sdl/mapview.c:576
+#: client/text.c:725 client/gui-sdl/mapview.c:576
 #, c-format
 msgid "%d unit selected"
 msgid_plural "%d units selected"
 msgstr[0] "Ñ¡ÖÐ %d ²¿¶Ó"
 
-#: client/text.c:726 client/gui-sdl/mapview.c:581
+#: client/text.c:730 client/gui-sdl/mapview.c:581
 msgid "No units selected."
 msgstr "δѡÖв¿¶Ó¡£"
 
-#: client/text.c:800 client/gui-sdl/mapview.c:654
+#: client/text.c:804 client/gui-sdl/mapview.c:654
 #, c-format
 msgid "Others: %d civil; %d military"
 msgstr "ÆäËû£º%d °ÙÐÕ£»%d ¾üÊÂ"
 
-#: client/text.c:802 client/gui-sdl/mapview.c:656
+#: client/text.c:806 client/gui-sdl/mapview.c:656
 #, c-format
 msgid "Others: %d civilian"
 msgstr "ÆäËû£º%d °ÙÐÕ"
 
-#: client/text.c:804 client/gui-sdl/mapview.c:658
+#: client/text.c:808 client/gui-sdl/mapview.c:658
 #, c-format
 msgid "Others: %d military"
 msgstr ""
 
-#: client/text.c:835
+#: client/text.c:839
 msgid "No units to upgrade!"
 msgstr "ûÓпÉÒÔÉý¼¶µÄ²¿¶Ó¡£"
 
-#: client/text.c:860
+#: client/text.c:864
 msgid "None of these units may be upgraded."
 msgstr "ÕâЩ²¿¶Ó¶¼²»ÄÜÉý¼¶¡£"
 
-#: client/text.c:866
+#: client/text.c:870
 #, c-format
 msgid ""
 "Upgrade %d unit for %d gold?\n"
@@ -9416,211 +9469,211 @@ msgstr[0] ""
 "»¨·Ñ %2$d »Æ½ðÉý¼¶ %1$d ²¿¶Ó£¿\n"
 "¹ú¿âÏÖÓÐ %3$d »Æ½ð¡£"
 
-#: client/text.c:887
+#: client/text.c:891
 msgid "Shows your progress in researching the current technology."
 msgstr "ÏÔʾÄúµ±Ç°¿Æ¼¼µÄÑо¿½ø¶È¡£"
 
-#: client/text.c:893
+#: client/text.c:897
 msgid "no research target."
 msgstr "ûÓÐÑо¿Ä¿±ê¡£"
 
 #. TRANS: <tech>: <amount>/<total bulbs>
-#: client/text.c:896
+#: client/text.c:900
 #, c-format
 msgid "%s: %d/%d."
 msgstr ""
 
-#: client/text.c:916
+#: client/text.c:920
 msgid "Shows the progress of global warming:"
 msgstr "ÏÔʾȫÇò±äůµÄ·¢Õ¹³Ì¶È£º"
 
-#: client/text.c:917
+#: client/text.c:921
 #, c-format
 msgid "Pollution rate: %d%%"
 msgstr "ÎÛȾÂÊ£º%d%%"
 
-#: client/text.c:919
+#: client/text.c:923
 #, c-format
 msgid "Chance of catastrophic warming each turn: %d%%"
 msgstr "ÿ»ØºÏÔÖÄÑÐÔ±äůµÄ¼¸ÂÊ£º%d%%"
 
-#: client/text.c:935
+#: client/text.c:939
 msgid "Shows the progress of nuclear winter:"
 msgstr "ÏÔʾºË¶¬ÌìµÄ·¢Õ¹³Ì¶È£º"
 
-#: client/text.c:936
+#: client/text.c:940
 #, c-format
 msgid "Fallout rate: %d%%"
 msgstr "·øÉäÂÊ£º%d%%"
 
-#: client/text.c:938
+#: client/text.c:942
 #, c-format
 msgid "Chance of catastrophic winter each turn: %d%%"
 msgstr "ÿ»ØºÏÔÖÄÑÐÔ¶¬ÌìµÄ¼¸ÂÊ£º%d%%"
 
-#: client/text.c:953
+#: client/text.c:957
 msgid "Shows your current government:"
 msgstr "ÏÔʾÄúµ±Ç°µÄÕþ¸®£º"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:977
+#: client/text.c:981
 #, c-format
 msgid "Population:      %5d"
 msgstr "ÈË¿Ú£º         %5d"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:980
+#: client/text.c:984
 #, c-format
 msgid "Support:         %5d %%"
 msgstr "Ö§³Ö£º         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:984
+#: client/text.c:988
 #, c-format
 msgid "Energy:          %5d %%"
 msgstr "ÄÜÔ´£º         %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:988
+#: client/text.c:992
 #, c-format
 msgid "Mass:            %5d ton"
 msgid_plural "Mass:            %5d tons"
 msgstr[0] "Îï×Ê£º         %5d ¶Ö"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:994
+#: client/text.c:998
 #, c-format
 msgid "Travel time:     %5.1f years"
 msgstr "ÂÃÐÐʱ¼ä£º    %5.1f Äê"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:998
+#: client/text.c:1002
 msgid "Travel time:        N/A     "
 msgstr "ÂÃÐÐʱ¼ä£º       ÎÞ    "
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1002
+#: client/text.c:1006
 #, c-format
 msgid "Success prob.:   %5d %%"
 msgstr "´æ»î¸ÅÂÊ£º     %5d %%"
 
 #. TRANS: spaceship text; should have constant width.
-#: client/text.c:1006
+#: client/text.c:1010
 #, c-format
 msgid "Year of arrival: %8s"
 msgstr "µ½´ïÄê´ú£º     %8s"
 
-#: client/text.c:1026
+#: client/text.c:1030
 msgid "?timeout:off"
 msgstr "³¬Ê±¹Ø±Õ"
 
-#: client/text.c:1050
+#: client/text.c:1054
 #, c-format
 msgid "?seconds:%02ds"
 msgstr "?seconds:%02d Ãë"
 
-#: client/text.c:1052
+#: client/text.c:1056
 #, c-format
 msgid "?mins/secs:%02dm %02ds"
 msgstr "?mins/secs:%02d ·Ö %02d Ãë"
 
-#: client/text.c:1054
+#: client/text.c:1058
 #, c-format
 msgid "?hrs/mns:%02dh %02dm"
 msgstr "?hrs/mns:%02d Сʱ %02d ·Ö"
 
-#: client/text.c:1056
+#: client/text.c:1060
 #, c-format
 msgid "?dys/hrs:%02dd %02dh"
 msgstr "?dys/hrs:%02d Ìì %02d Сʱ"
 
-#: client/text.c:1059
+#: client/text.c:1063
 msgid "?duration:overflow"
 msgstr "?duration:Òç³ö"
 
-#: client/text.c:1080
+#: client/text.c:1084
 #, c-format
 msgid "%6d.%02d ms"
 msgstr "%6d.%02d ms"
 
 #. TRANS: "Republic of the Poles"
-#: client/text.c:1123
+#: client/text.c:1127
 #, c-format
 msgid "%s of the %s"
 msgstr "%2$s µÄ %1$s"
 
 #. TRANS: "Observer: 1985"
-#: client/text.c:1133
+#: client/text.c:1137
 #, c-format
 msgid "Observer: %s"
 msgstr "ÅÔ¹ÛÕߣº%s"
 
-#: client/text.c:1151
+#: client/text.c:1155
 msgid "Buildings: "
 msgstr "½¨Öþ£º"
 
-#: client/text.c:1168 client/text.c:1207
+#: client/text.c:1172 client/text.c:1211
 msgid "None. "
 msgstr "ÎÞ¡£ "
 
-#: client/text.c:1170 client/text.c:1209
+#: client/text.c:1174 client/text.c:1213
 msgid "?clistend:."
 msgstr "?blistend:"
 
-#: client/text.c:1188
+#: client/text.c:1192
 msgid "Wonders: "
 msgstr "Ææ¼££º"
 
-#: client/text.c:1243
+#: client/text.c:1247
 #, c-format
 msgid "Cities: %d total, %d over threshold of %d cities."
 msgstr "³ÇÊУº×ܹ² %1$d ¸ö£¬³ÇÊиöÊýãÐÖµ %3$d £¬³¬³ö%2$d ¸ö¡£"
 
 #. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1247
+#: client/text.c:1251
 #, fuzzy, c-format
 msgid "%d content before penalty."
 msgid_plural "%d content before penalty."
 msgstr[0] "ÔÚÓµÓÐ %d ¸öÂú×ãÊÐÃñÖ®ºó"
 
 #. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1253
+#: client/text.c:1257
 #, fuzzy, c-format
 msgid "%d additional unhappy citizen."
 msgid_plural "%d additional unhappy citizens."
 msgstr[0] "½«³öÏÖ¶îÍâ %d ¸öÓÇÓôÊÐÃñ¡£"
 
 #. TRANS: Martial law opening parenthesis
-#: client/text.c:1275
+#: client/text.c:1279
 msgid "Martial law in effect ("
 msgstr "¾üʹÜÖÆÖУ¨"
 
 #. TRANS: no [unit] maximum
-#: client/text.c:1280
+#: client/text.c:1284
 msgid "no maximum, "
 msgstr "ÎÞ²¿¶ÓÊýÉÏÏÞ£¬"
 
-#: client/text.c:1283
+#: client/text.c:1287
 #, c-format
 msgid "%d unit maximum, "
 msgid_plural "%d units maximum, "
 msgstr[0] "×î¶à %d ¸ö²¿¶Ó£¬"
 
 #. TRANS: Martial law closing parenthesis
-#: client/text.c:1290
+#: client/text.c:1294
 #, c-format
 msgid "%d per unit). "
 msgstr "ÿ¸ö²¿¶Ó %d £©¡£"
 
-#: client/text.c:1294
+#: client/text.c:1298
 msgid "Military units in the field may cause unhappiness. "
 msgstr "¾üʲ¿¶ÓÔÚÕâÀï¿ÉÄÜÒýÆðÓÇÓô¡£"
 
-#: client/text.c:1297
+#: client/text.c:1301
 msgid "Military units have no happiness effect. "
 msgstr "¾üʲ¿¶Ó¶Ô»¶ÀÖûÓÐÓ°Ïì¡£"
 
-#: client/text.c:1312
+#: client/text.c:1316
 #, c-format
 msgid "Luxury: %d total."
 msgstr "ÓéÀÖ£º×ܹ² %d ¡£"
@@ -9661,12 +9714,12 @@ msgid ""
 "have a look."
 msgstr ""
 
-#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:552
-#: client/gui-gtk-2.0/cityrep.c:577 client/gui-sdl/citydlg.c:2009
+#: client/agents/cma_fec.c:218 client/gui-gtk-2.0/cityrep.c:553
+#: client/gui-gtk-2.0/cityrep.c:578 client/gui-sdl/citydlg.c:2009
 msgid "none"
 msgstr "ÎÞ"
 
-#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:598
+#: client/agents/cma_fec.c:234 client/gui-gtk-2.0/cityrep.c:599
 msgid "custom"
 msgstr "¶¨ÖÆ"
 
@@ -9720,11 +9773,13 @@ msgid "Ooops..."
 msgstr "°¥Ó´¡­"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:86 client/gui-win32/dialogs.c:1364
+#: client/gui-xaw/diplomat_dialog.c:110
 msgid "This unit cannot be bribed!"
 msgstr "´Ë²¿¶Ó²»Äܱ»»ß¸£¡"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:93
 #: client/gui-sdl/diplomat_dialog.c:1395 client/gui-win32/dialogs.c:1368
+#: client/gui-xaw/diplomat_dialog.c:114
 #, c-format
 msgid ""
 "Bribe unit for %d gold?\n"
@@ -9741,6 +9796,7 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:101
 #: client/gui-sdl/diplomat_dialog.c:1442 client/gui-win32/dialogs.c:1376
+#: client/gui-xaw/diplomat_dialog.c:123
 #, c-format
 msgid ""
 "Bribing the unit costs %d gold.\n"
@@ -9781,6 +9837,7 @@ msgstr "
 #: client/gui-gtk-2.0/diplomat_dialog.c:441
 #: client/gui-sdl/diplomat_dialog.c:332 client/gui-sdl/diplomat_dialog.c:930
 #: client/gui-win32/dialogs.c:1193 client/gui-win32/dialogs.c:1404
+#: client/gui-xaw/diplomat_dialog.c:408 client/gui-xaw/diplomat_dialog.c:494
 msgid "At Spy's Discretion"
 msgstr "Óɼäµý´¦Àí"
 
@@ -9805,12 +9862,13 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:431
 #: client/gui-sdl/diplomat_dialog.c:874 client/gui-sdl/optiondlg.c:1583
-#: client/gui-win32/dialogs.c:1393
+#: client/gui-win32/dialogs.c:1393 client/gui-xaw/diplomat_dialog.c:483
 msgid "City Production"
 msgstr "³ÇÊÐÉú²ú"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:542
 #: client/gui-sdl/diplomat_dialog.c:1167 client/gui-win32/dialogs.c:1548
+#: client/gui-xaw/diplomat_dialog.c:639
 #, c-format
 msgid "You can't incite a revolt in %s."
 msgstr "Äú²»ÄÜÔÚ %s É¿¶¯ÆðÒå¡£"
@@ -9822,6 +9880,7 @@ msgstr "
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:550
 #: client/gui-sdl/diplomat_dialog.c:1187 client/gui-win32/dialogs.c:1554
+#: client/gui-xaw/diplomat_dialog.c:645
 #, c-format
 msgid ""
 "Incite a revolt for %d gold?\n"
@@ -9838,6 +9897,7 @@ msgstr "É¿
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:558
 #: client/gui-sdl/diplomat_dialog.c:1236 client/gui-win32/dialogs.c:1562
+#: client/gui-xaw/diplomat_dialog.c:655
 #, c-format
 msgid ""
 "Inciting a revolt costs %d gold.\n"
@@ -9847,6 +9907,7 @@ msgstr ""
 "¹ú¿â½öÓÐ %d »Æ½ð¡£"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:621 client/gui-win32/dialogs.c:1601
+#: client/gui-xaw/diplomat_dialog.c:715
 #, c-format
 msgid ""
 "Your %s has arrived at %s.\n"
@@ -9916,11 +9977,13 @@ msgid "Subvert Enemy Unit"
 msgstr "µß¸²µÐ·½²¿¶Ó"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:694 client/gui-win32/dialogs.c:1661
+#: client/gui-xaw/diplomat_dialog.c:777
 #, fuzzy
 msgid "The diplomat is waiting for your command"
 msgstr "±ÝÏ£¬Íâ½»¹ÙÕýÔڵȺòÃüÁî"
 
 #: client/gui-gtk-2.0/diplomat_dialog.c:695 client/gui-win32/dialogs.c:1662
+#: client/gui-xaw/diplomat_dialog.c:778
 #, fuzzy
 msgid "The spy is waiting for your command"
 msgstr "±ÝÏ£¬¼äµýÕýÔڵȺòÃüÁî"
@@ -10021,7 +10084,7 @@ msgstr "
 msgid "_Overview"
 msgstr "³ÇÊиſö(_O)"
 
-#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/citydlg.c:670 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1086 client/gui-win32/wldlg.c:801
 #: client/gui-win32/wldlg.c:807
 msgid "Info"
@@ -10046,11 +10109,11 @@ msgid "%d/%d %d turns"
 msgstr "%d/%d %d »ØºÏ"
 
 #: client/gui-gtk-2.0/citydlg.c:830 client/gui-gtk-2.0/citydlg.c:927
-#: client/gui-gtk-2.0/cityrep.c:820
+#: client/gui-gtk-2.0/cityrep.c:821
 msgid "_Buy"
 msgstr "¹ºÂò(_B)"
 
-#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:691
+#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:692
 #, fuzzy
 msgid "_Production"
 msgstr "Éú²ú(_P)"
@@ -10170,7 +10233,7 @@ msgstr "
 msgid "Present units %d"
 msgstr "ÏÖÓеIJ¿¶Ó£º%d"
 
-#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:812
+#: client/gui-gtk-2.0/citydlg.c:1981 client/gui-gtk-2.0/cityrep.c:813
 msgid "Cen_ter"
 msgstr "ÖÐÐÄ(_T)"
 
@@ -10261,32 +10324,32 @@ msgstr "
 msgid "What should we rename the city to?"
 msgstr "°Ñ³ÇÊÐÃû³Æ¸ÄΪʲô£¿"
 
-#: client/gui-gtk-2.0/cityrep.c:698
+#: client/gui-gtk-2.0/cityrep.c:699
 msgid "Chan_ge"
 msgstr "¸Ä±ä(_G)"
 
-#: client/gui-gtk-2.0/cityrep.c:702
+#: client/gui-gtk-2.0/cityrep.c:703
 msgid "Add _First"
 msgstr "¼ÓÈ빤×÷ÁбíÊ׸ö(_F)"
 
-#: client/gui-gtk-2.0/cityrep.c:706
+#: client/gui-gtk-2.0/cityrep.c:707
 msgid "Add _Next"
 msgstr "¼ÓÈ빤×÷Áбíϸö(_N)"
 
-#: client/gui-gtk-2.0/cityrep.c:710
+#: client/gui-gtk-2.0/cityrep.c:711
 msgid "Add _Last"
 msgstr "¼ÓÈ빤×÷ÁбíÄ©¸ö(_L)"
 
-#: client/gui-gtk-2.0/cityrep.c:714
+#: client/gui-gtk-2.0/cityrep.c:715
 msgid "_Select"
 msgstr "Ñ¡Ôñ(_S)"
 
-#: client/gui-gtk-2.0/cityrep.c:718 client/gui-gtk-2.0/plrdlg.c:490
+#: client/gui-gtk-2.0/cityrep.c:719 client/gui-gtk-2.0/plrdlg.c:490
 #, fuzzy
 msgid "_Display"
 msgstr "ÏÔʾ(_D)"
 
-#: client/gui-gtk-2.0/cityrep.c:799 client/gui-gtk-2.0/menu.c:808
+#: client/gui-gtk-2.0/cityrep.c:800 client/gui-gtk-2.0/menu.c:808
 #: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
 #: client/gui-win32/diplodlg.c:611 client/gui-win32/diplodlg.c:663
 #: client/gui-win32/menu.c:350 client/gui-xaw/cityrep.c:228
@@ -10296,13 +10359,13 @@ msgstr "
 msgid "Cities"
 msgstr "³ÇÊÐ"
 
-#: client/gui-gtk-2.0/cityrep.c:816
+#: client/gui-gtk-2.0/cityrep.c:817
 #, fuzzy
 msgid "_Inspect"
 msgstr "µ¯³ö(_I)"
 
-#: client/gui-gtk-2.0/cityrep.c:1222 client/gui-gtk-2.0/cityrep.c:1243
-#: client/gui-gtk-2.0/cityrep.c:1262 client/gui-gtk-2.0/cityrep.c:1281
+#: client/gui-gtk-2.0/cityrep.c:1227 client/gui-gtk-2.0/cityrep.c:1248
+#: client/gui-gtk-2.0/cityrep.c:1267 client/gui-gtk-2.0/cityrep.c:1286
 #: client/gui-gtk-2.0/menu.c:792 client/gui-gtk-2.0/menu.c:794
 #: client/gui-gtk-2.0/menu.c:796 client/gui-gtk-2.0/menu.c:798
 #: client/gui-gtk-2.0/menu.c:800 client/gui-gtk-2.0/menu.c:802
@@ -10311,85 +10374,90 @@ msgstr "
 msgid "Improvements"
 msgstr "½¨Öþ"
 
-#: client/gui-gtk-2.0/cityrep.c:1224 client/gui-gtk-2.0/cityrep.c:1245
-#: client/gui-gtk-2.0/cityrep.c:1264 client/gui-gtk-2.0/cityrep.c:1283
+#: client/gui-gtk-2.0/cityrep.c:1229 client/gui-gtk-2.0/cityrep.c:1250
+#: client/gui-gtk-2.0/cityrep.c:1269 client/gui-gtk-2.0/cityrep.c:1288
 #: client/gui-xaw/menu.c:247
 msgid "Wonders"
 msgstr "Ææ¼£"
 
-#: client/gui-gtk-2.0/cityrep.c:1395 client/gui-win32/cityrep.c:439
+#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:439
 #: client/gui-win32/gotodlg.c:169 data/Freeciv.in:1138
 msgid "All Cities"
 msgstr "ËùÓгÇÊÐ"
 
-#: client/gui-gtk-2.0/cityrep.c:1400 client/gui-win32/cityrep.c:440
+#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:440
 msgid "No Cities"
 msgstr "Çå³ýÑ¡Ôñ"
 
-#: client/gui-gtk-2.0/cityrep.c:1405 client/gui-win32/cityrep.c:441
+#: client/gui-gtk-2.0/cityrep.c:1410 client/gui-win32/cityrep.c:441
 msgid "Invert Selection"
 msgstr "·´×ªÑ¡Ôñ"
 
-#: client/gui-gtk-2.0/cityrep.c:1415
+#: client/gui-gtk-2.0/cityrep.c:1420
 msgid "Building Units"
 msgstr "ÕýÔÚ½¨Ô첿¶Ó"
 
-#: client/gui-gtk-2.0/cityrep.c:1421
+#: client/gui-gtk-2.0/cityrep.c:1426
 msgid "Building Improvements"
 msgstr "ÕýÔÚ½¨Ô콨Öþ"
 
-#: client/gui-gtk-2.0/cityrep.c:1427
+#: client/gui-gtk-2.0/cityrep.c:1432
 msgid "Building Wonders"
 msgstr "ÕýÔÚ½¨ÔìÆæ¼£"
 
-#: client/gui-gtk-2.0/cityrep.c:1439
+#: client/gui-gtk-2.0/cityrep.c:1444
 msgid "Building Unit"
 msgstr "ÕýÔÚ½¨Ô첿¶Ó"
 
-#: client/gui-gtk-2.0/cityrep.c:1443
+#: client/gui-gtk-2.0/cityrep.c:1448
 msgid "Building Improvement"
 msgstr "ÕýÔÚ½¨Ô콨Öþ"
 
-#: client/gui-gtk-2.0/cityrep.c:1447
+#: client/gui-gtk-2.0/cityrep.c:1452
 msgid "Building Wonder"
 msgstr "ÕýÔÚ½¨ÔìÆæ¼£"
 
-#: client/gui-gtk-2.0/cityrep.c:1455 client/gui-win32/cityrep.c:443
+#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:443
 msgid "Coastal Cities"
 msgstr "Ñغ£³ÇÊÐ"
 
-#: client/gui-gtk-2.0/cityrep.c:1460 client/gui-win32/cityrep.c:444
+#: client/gui-gtk-2.0/cityrep.c:1465 client/gui-win32/cityrep.c:444
 msgid "Same Island"
 msgstr "ÔÚͬһµºÓì"
 
-#: client/gui-gtk-2.0/cityrep.c:1470 client/gui-win32/cityrep.c:447
+#: client/gui-gtk-2.0/cityrep.c:1475 client/gui-win32/cityrep.c:447
 msgid "Supported Units"
 msgstr "Ö§³Ö²¿¶Ó"
 
-#: client/gui-gtk-2.0/cityrep.c:1473 client/gui-win32/cityrep.c:454
+#: client/gui-gtk-2.0/cityrep.c:1478 client/gui-win32/cityrep.c:454
 msgid "Units Present"
 msgstr "ÏÖÓв¿¶Ó"
 
-#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-win32/cityrep.c:469
+#: client/gui-gtk-2.0/cityrep.c:1482 client/gui-win32/cityrep.c:469
 msgid "Improvements in City"
 msgstr "³ÇÊÐÓµÓн¨Öþ"
 
-#: client/gui-gtk-2.0/cityrep.c:1481
+#: client/gui-gtk-2.0/cityrep.c:1486
 msgid "Wonders in City"
 msgstr "³ÇÊÐÓµÓÐÆæ¼£"
 
-#: client/gui-gtk-2.0/cityrep.c:1490
+#: client/gui-gtk-2.0/cityrep.c:1495
 msgid "Available Units"
 msgstr "¿ÉÓò¿¶Ó"
 
-#: client/gui-gtk-2.0/cityrep.c:1493
+#: client/gui-gtk-2.0/cityrep.c:1498
 msgid "Available Improvements"
 msgstr "¿ÉÓý¨Öþ"
 
-#: client/gui-gtk-2.0/cityrep.c:1496
+#: client/gui-gtk-2.0/cityrep.c:1501
 msgid "Available Wonders"
 msgstr "¿ÉÓÃÆæ¼£"
 
+#: client/gui-gtk-2.0/cityrep.c:1625
+#, fuzzy, c-format
+msgid "Total Buy Cost: %d"
+msgstr "³É±¾×ܼƣº"
+
 #: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
 #, fuzzy
 msgid ""
@@ -10458,128 +10526,128 @@ msgstr "
 msgid "Remove this preset?"
 msgstr "ɾ³ý´ËÔ¤É裿"
 
-#: client/gui-gtk-2.0/dialogs.c:195 client/gui-gtk-2.0/messagewin.c:186
+#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:186
 #, fuzzy
 msgid "Goto _Location"
 msgstr "Ç°ÍùµØµã(_L)"
 
-#: client/gui-gtk-2.0/dialogs.c:200 client/gui-gtk-2.0/messagewin.c:190
+#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:190
 #, fuzzy
 msgid "Inspect _City"
 msgstr "µ¯³ö³ÇÊжԻ°¿ò(_C)"
 
-#: client/gui-gtk-2.0/dialogs.c:256 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
 #: client/gui-win32/dialogs.c:976 client/gui-xaw/dialogs.c:513
 msgid "You say you wanna revolution?"
 msgstr "ÄúÏë½øÐиïÃü£¿"
 
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
 #: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
 msgid "Revolution!"
 msgstr "¸ïÃü£¡"
 
-#: client/gui-gtk-2.0/dialogs.c:310 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
 #: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
 msgid "What To Pillage"
 msgstr "ÂÓ¶áʲô"
 
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
 #: data/Freeciv.in:2502
 msgid "Select what to pillage:"
 msgstr "ÇëÑ¡ÔñÂÓ¶áʲô£º"
 
-#: client/gui-gtk-2.0/dialogs.c:505
+#: client/gui-gtk-2.0/dialogs.c:506
 msgid "Unit"
 msgstr "²¿¶Ó"
 
-#: client/gui-gtk-2.0/dialogs.c:506 client/gui-gtk-2.0/pages.c:1507
-#: client/gui-gtk-2.0/pages.c:2080 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:1510
+#: client/gui-gtk-2.0/pages.c:2083 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/connectdlg.c:983 client/gui-win32/plrdlg.c:335
 #: manual/civmanual.c:302 data/Freeciv.in:80
 msgid "Name"
 msgstr "Ãû³Æ"
 
-#: client/gui-gtk-2.0/dialogs.c:518 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
 msgid "Unit selection"
 msgstr "²¿¶ÓÑ¡Ôñ"
 
-#: client/gui-gtk-2.0/dialogs.c:581
+#: client/gui-gtk-2.0/dialogs.c:582
 msgid "_Ready all"
 msgstr "È«²¿¾ÍÐ÷(_R)"
 
-#: client/gui-gtk-2.0/dialogs.c:589
+#: client/gui-gtk-2.0/dialogs.c:590
 msgid "_Sentry idle"
 msgstr "¿ÕÏв¿¶Ó·ÅÉÚ(_S)"
 
-#: client/gui-gtk-2.0/dialogs.c:717
+#: client/gui-gtk-2.0/dialogs.c:719
 #, fuzzy
 msgid "Nation _Groups:"
 msgstr "Ãñ×å(_G)£º"
 
-#: client/gui-gtk-2.0/dialogs.c:762 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
 msgid "What Nation Will You Be?"
 msgstr "ÄúÏë³ÉΪÄǸöÃñ×壿"
 
-#: client/gui-gtk-2.0/dialogs.c:764 client/gui-sdl/chatline.c:842
+#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
 #: client/gui-win32/connectdlg.c:1036 data/Freeciv.in:3371
 #, fuzzy
 msgid "Pick Nation"
 msgstr "¾¯²ì¾Ö"
 
-#: client/gui-gtk-2.0/dialogs.c:772
+#: client/gui-gtk-2.0/dialogs.c:774
 #, fuzzy
 msgid "_Random Nation"
 msgstr "Ëæ»úÃñ×å (_R)"
 
-#: client/gui-gtk-2.0/dialogs.c:784 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
 msgid "Select a nation"
 msgstr "ÇëÑ¡ÔñÃñ×å"
 
-#: client/gui-gtk-2.0/dialogs.c:802
+#: client/gui-gtk-2.0/dialogs.c:804
 msgid "_Properties"
 msgstr "ÊôÐÔ(_P)"
 
-#: client/gui-gtk-2.0/dialogs.c:822
+#: client/gui-gtk-2.0/dialogs.c:824
 msgid "_Leader:"
 msgstr "Áìµ¼Õß(_L)£º"
 
-#: client/gui-gtk-2.0/dialogs.c:829
+#: client/gui-gtk-2.0/dialogs.c:831
 msgid "_Female"
 msgstr "Å®(_F)"
 
-#: client/gui-gtk-2.0/dialogs.c:834
+#: client/gui-gtk-2.0/dialogs.c:836
 msgid "_Male"
 msgstr "ÄÐ(_M)"
 
-#: client/gui-gtk-2.0/dialogs.c:861
+#: client/gui-gtk-2.0/dialogs.c:863
 #, fuzzy
 msgid "City _Styles:"
 msgstr "³ÇÊзç¸ñ(_S)£º"
 
-#: client/gui-gtk-2.0/dialogs.c:900
+#: client/gui-gtk-2.0/dialogs.c:902
 #, fuzzy
 msgid "_Description"
 msgstr "ÀúÊ·(_D)"
 
-#: client/gui-gtk-2.0/dialogs.c:1242 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
 msgid "You must select your sex."
 msgstr "Äú±ØÐëÑ¡ÔñÄúµÄÐÔ±ð¡£"
 
-#: client/gui-gtk-2.0/dialogs.c:1247 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
 msgid "You must select your city style."
 msgstr "Äú±ØÐëÑ¡ÔñÄúµÄ³ÇÊзç¸ñ¡£"
 
-#: client/gui-gtk-2.0/dialogs.c:1256 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
 #: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
 msgid "You must type a legal name."
 msgstr "Äú±ØÐëÊäÈëÒ»¸öºÏ·¨µÄÃû×Ö¡£"
 
-#: client/gui-gtk-2.0/dialogs.c:1299 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
 #: data/Freeciv.in:2484
 msgid "Upgrade Unit!"
 msgstr "Éý¼¶²¿¶Ó£¡"
 
-#: client/gui-gtk-2.0/dialogs.c:1308 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
 #: client/gui-sdl/dialogs.c:423 client/gui-sdl/repodlgs.c:192
 #: client/gui-win32/citydlg.c:1447 client/gui-win32/repodlgs.c:577
 #: data/Freeciv.in:2473
@@ -10826,62 +10894,68 @@ msgstr ""
 msgid "Not _ready"
 msgstr "δ¾ÍÐ÷(_r)"
 
-#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1602
+#: client/gui-gtk-2.0/gui_main.c:1502 client/gui-gtk-2.0/pages.c:1605
 msgid "_Ready"
 msgstr "¾ÍÐ÷(_R)"
 
 #: client/gui-gtk-2.0/gui_main.c:1506 client/gui-gtk-2.0/gui_main.c:1512
-#: client/gui-gtk-2.0/pages.c:2129
+#: client/gui-gtk-2.0/pages.c:2132
 msgid "_Start"
 msgstr "¿ªÊ¼(_S)"
 
-#: client/gui-gtk-2.0/gui_main.c:1516 client/gui-gtk-2.0/pages.c:1592
+#: client/gui-gtk-2.0/gui_main.c:1520
+#, fuzzy
+msgid "_Take Player"
+msgstr "È¡´ú´ËÍæ¼Ò"
+
+#: client/gui-gtk-2.0/gui_main.c:1523 client/gui-gtk-2.0/pages.c:1595
 msgid "Pick _Nation"
 msgstr "Ñ¡ÔñÃñ×壨_N£©"
 
-#: client/gui-gtk-2.0/gui_main.c:1522 client/gui-gtk-2.0/pages.c:1597
+#: client/gui-gtk-2.0/gui_main.c:1530 client/gui-gtk-2.0/pages.c:1600
 msgid "_Observe"
 msgstr "ÅÔ¹Û(_O)"
 
-#: client/gui-gtk-2.0/gui_main.c:1524
+#: client/gui-gtk-2.0/gui_main.c:1532
 #, fuzzy
 msgid "Do not _observe"
 msgstr "ÏÖÔÚÅÔ¹Û(_O)"
 
-#: client/gui-gtk-2.0/gui_main.c:1546
+#: client/gui-gtk-2.0/gui_main.c:1554 client/gui-xaw/pages.c:211
 msgid "<AI>"
 msgstr "<AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1549
+#: client/gui-gtk-2.0/gui_main.c:1557
 msgid "<Novice AI>"
 msgstr "<¼«Ò× AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1552
+#: client/gui-gtk-2.0/gui_main.c:1560
 msgid "<Easy AI>"
 msgstr "<ÈÝÒ× AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1555
+#: client/gui-gtk-2.0/gui_main.c:1563
 msgid "<Normal AI>"
 msgstr "<ÆÕͨ AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1558
+#: client/gui-gtk-2.0/gui_main.c:1566
 msgid "<Hard AI>"
 msgstr "<À§ÄÑ AI>"
 
-#: client/gui-gtk-2.0/gui_main.c:1568 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1576 client/gui-win32/dialogs.c:594
+#: client/gui-xaw/pages.c:217
 msgid "Random"
 msgstr "Ëæ»ú"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 msgid "Observer"
 msgstr "ÅÔ¹ÛÕß"
 
-#: client/gui-gtk-2.0/gui_main.c:1634
+#: client/gui-gtk-2.0/gui_main.c:1642
 #, fuzzy
 msgid "Detached"
 msgstr "ËÀµÄ"
 
-#: client/gui-gtk-2.0/gui_main.c:1891
+#: client/gui-gtk-2.0/gui_main.c:1899
 msgid "Are you sure you want to quit?"
 msgstr "È·ÈÏÏëÍ˳ö£¿"
 
@@ -11796,219 +11870,219 @@ msgstr "
 msgid "Connect to Gaming _Zone"
 msgstr "Á¬½Óµ½ÍøÂçÓÎÏ·"
 
-#: client/gui-gtk-2.0/pages.c:612 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:614 client/gui-win32/connectdlg.c:300
 #: client/gui-xaw/connectdlg.c:326
 msgid "Passwords don't match, enter password."
 msgstr "¿ÚÁî²»ÕýÈ·£¬ÇåÊäÈë¿ÚÁî¡£"
 
-#: client/gui-gtk-2.0/pages.c:702 client/gui-win32/connectdlg.c:914
+#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:914
 msgid "Server Name"
 msgstr "·þÎñÆ÷Ãû³Æ"
 
-#: client/gui-gtk-2.0/pages.c:703 client/gui-sdl/mapview.c:814
+#: client/gui-gtk-2.0/pages.c:705 client/gui-sdl/mapview.c:814
 #: client/gui-win32/connectdlg.c:914 data/Freeciv.in:96
 msgid "Port"
 msgstr "¶Ë¿Ú"
 
-#: client/gui-gtk-2.0/pages.c:704 client/gui-win32/connectdlg.c:915
+#: client/gui-gtk-2.0/pages.c:706 client/gui-win32/connectdlg.c:915
 msgid "Version"
 msgstr "°æ±¾"
 
-#: client/gui-gtk-2.0/pages.c:705 client/gui-gtk-2.0/pages.c:2086
+#: client/gui-gtk-2.0/pages.c:707 client/gui-gtk-2.0/pages.c:2089
 #: client/gui-win32/connectdlg.c:915 client/gui-win32/connectdlg.c:993
 msgid "Status"
 msgstr "״̬"
 
-#: client/gui-gtk-2.0/pages.c:706 client/gui-sdl/connectdlg.c:317
+#: client/gui-gtk-2.0/pages.c:708 client/gui-sdl/connectdlg.c:317
 #: client/gui-sdl/plrdlg.c:330 client/gui-win32/connectdlg.c:915
 msgid "Players"
 msgstr "Íæ¼Ò"
 
-#: client/gui-gtk-2.0/pages.c:707 client/gui-win32/connectdlg.c:916
+#: client/gui-gtk-2.0/pages.c:709 client/gui-win32/connectdlg.c:916
 msgid "Comment"
 msgstr "˵Ã÷"
 
-#: client/gui-gtk-2.0/pages.c:745
+#: client/gui-gtk-2.0/pages.c:747
 msgid "Local _Area Network"
 msgstr "¾ÖÓòÍø(_A)"
 
-#: client/gui-gtk-2.0/pages.c:781
+#: client/gui-gtk-2.0/pages.c:783
 msgid "Internet _Metaserver"
 msgstr "»¥ÁªÍøÔª·þÎñÆ÷(_M)"
 
-#: client/gui-gtk-2.0/pages.c:815
+#: client/gui-gtk-2.0/pages.c:817
 msgid "_Host:"
 msgstr "Ö÷»ú(_H)£º"
 
-#: client/gui-gtk-2.0/pages.c:832
+#: client/gui-gtk-2.0/pages.c:834
 msgid "_Port:"
 msgstr "¶Ë¿Ú(_P)£º"
 
-#: client/gui-gtk-2.0/pages.c:849
+#: client/gui-gtk-2.0/pages.c:851
 msgid "_Login:"
 msgstr "µÇ¼(_L)£º"
 
-#: client/gui-gtk-2.0/pages.c:867
+#: client/gui-gtk-2.0/pages.c:869
 msgid "Pass_word:"
 msgstr "¿ÚÁî(_W)£º"
 
-#: client/gui-gtk-2.0/pages.c:885
+#: client/gui-gtk-2.0/pages.c:887
 msgid "Conf_irm Password:"
 msgstr "È·ÈÏ¿ÚÁî(_I)£º"
 
-#: client/gui-gtk-2.0/pages.c:910
+#: client/gui-gtk-2.0/pages.c:912
 msgid "C_onnect"
 msgstr "Á¬½Ó(_O)"
 
-#: client/gui-gtk-2.0/pages.c:1140
+#: client/gui-gtk-2.0/pages.c:1142
 #, fuzzy, c-format
 msgid "Connection name: %s"
 msgstr "ÕýÔÚÁ¬½ÓÖÐ"
 
-#: client/gui-gtk-2.0/pages.c:1143
+#: client/gui-gtk-2.0/pages.c:1145
 #, c-format
 msgid "Player name: %s"
 msgstr "Íæ¼ÒÃû×Ö£º%s"
 
-#: client/gui-gtk-2.0/pages.c:1148
+#: client/gui-gtk-2.0/pages.c:1150
 #, c-format
 msgid "Host: %s"
 msgstr "Ö÷»ú£º%s"
 
-#: client/gui-gtk-2.0/pages.c:1155
+#: client/gui-gtk-2.0/pages.c:1158
 msgid "Player/conn info"
 msgstr "Íæ¼Ò/Á¬½ÓÐÅÏ¢"
 
-#: client/gui-gtk-2.0/pages.c:1182
+#: client/gui-gtk-2.0/pages.c:1185
 #, c-format
 msgid "%s info"
 msgstr "%s ÐÅÏ¢"
 
-#: client/gui-gtk-2.0/pages.c:1193
+#: client/gui-gtk-2.0/pages.c:1196
 msgid "Toggle player ready"
 msgstr "Çл»¾ÍÐ÷״̬"
 
-#: client/gui-gtk-2.0/pages.c:1201
+#: client/gui-gtk-2.0/pages.c:1204
 msgid "Pick nation"
 msgstr "Ñ¡ÔñÃñ×å"
 
-#: client/gui-gtk-2.0/pages.c:1211
+#: client/gui-gtk-2.0/pages.c:1214
 msgid "Observe this player"
 msgstr "ÅÔ¹Û´ËÍæ¼Ò"
 
-#: client/gui-gtk-2.0/pages.c:1218
+#: client/gui-gtk-2.0/pages.c:1221
 msgid "Take this player"
 msgstr "È¡´ú´ËÍæ¼Ò"
 
-#: client/gui-gtk-2.0/pages.c:1235
+#: client/gui-gtk-2.0/pages.c:1238
 msgid "Cut connection"
 msgstr "ÇжÏÁ¬½Ó"
 
-#: client/gui-gtk-2.0/pages.c:1245
+#: client/gui-gtk-2.0/pages.c:1248
 msgid "Aitoggle player"
 msgstr "Çл»Íæ¼ÒÊÇ·ñΪ AI"
 
-#: client/gui-gtk-2.0/pages.c:1254
+#: client/gui-gtk-2.0/pages.c:1257
 msgid "Remove player"
 msgstr "ɾ³ýÍæ¼Ò"
 
-#: client/gui-gtk-2.0/pages.c:1265
+#: client/gui-gtk-2.0/pages.c:1268
 msgid "Give info access"
 msgstr "¸øÓè info ·ÃÎʼ¶±ð"
 
-#: client/gui-gtk-2.0/pages.c:1273
+#: client/gui-gtk-2.0/pages.c:1276
 msgid "Give ctrl access"
 msgstr "¸øÓè ctrl ·ÃÎʼ¶±ð"
 
 #. TRANS: e.g., "Put on Team 5"
-#: client/gui-gtk-2.0/pages.c:1335
+#: client/gui-gtk-2.0/pages.c:1338
 #, fuzzy, c-format
 msgid "Put on %s"
 msgstr "ÈË¿Ú£º%s"
 
-#: client/gui-gtk-2.0/pages.c:1439
+#: client/gui-gtk-2.0/pages.c:1442
 #, fuzzy
 msgid "Number of _Players (including AI):"
 msgstr "Íæ¼ÒÊýÄ¿£¨°üÀ¨AI£©(_P)£º"
 
-#: client/gui-gtk-2.0/pages.c:1462
+#: client/gui-gtk-2.0/pages.c:1465
 #, fuzzy
 msgid "AI Skill _Level:"
 msgstr "AI¼¼Äܼ¶±ð(_L)£º"
 
-#: client/gui-gtk-2.0/pages.c:1478
+#: client/gui-gtk-2.0/pages.c:1481
 #, fuzzy
 msgid "Ruleset _Version:"
 msgstr "¹æÔò¼¯£¨(_V)£º"
 
-#: client/gui-gtk-2.0/pages.c:1486 client/gui-gtk-2.0/pages.c:2118
+#: client/gui-gtk-2.0/pages.c:1489 client/gui-gtk-2.0/pages.c:2121
 msgid "_More Game Options..."
 msgstr "¸ü¶àÓÎÏ·Ñ¡Ïî(_M)..."
 
-#: client/gui-gtk-2.0/pages.c:1511
+#: client/gui-gtk-2.0/pages.c:1514
 #, fuzzy
 msgid "Record"
 msgstr "±¨¸æ"
 
-#: client/gui-gtk-2.0/pages.c:1516
+#: client/gui-gtk-2.0/pages.c:1519
 #, fuzzy
 msgid "Rating"
 msgstr "ɳ»Ê»Êºó"
 
-#: client/gui-gtk-2.0/pages.c:1522
+#: client/gui-gtk-2.0/pages.c:1525
 msgid "Ready"
 msgstr "¾ÍÐ÷"
 
-#: client/gui-gtk-2.0/pages.c:1529 data/default/units.ruleset:1864
+#: client/gui-gtk-2.0/pages.c:1532 data/default/units.ruleset:1864
 #: data/nation/slovakian.ruleset:26
 msgid "Leader"
 msgstr "Áìµ¼Õß"
 
-#: client/gui-gtk-2.0/pages.c:1657 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1660 client/gui-sdl/chatline.c:185
 msgid "Choose Saved Game to Load"
 msgstr "ÇëÑ¡ÔñÒªÔØÈëµÄ´æÅÌÓÎÏ·Îļþ"
 
-#: client/gui-gtk-2.0/pages.c:1749
+#: client/gui-gtk-2.0/pages.c:1752
 msgid "Choose Saved Game to _Load:"
 msgstr "ÇëÑ¡ÔñÒªÔØÈëµÄ´æÅÌÓÎÏ·Îļþ(_L)£º"
 
-#: client/gui-gtk-2.0/pages.c:1769 client/gui-gtk-2.0/pages.c:1962
-#: client/gui-gtk-2.0/pages.c:2372
+#: client/gui-gtk-2.0/pages.c:1772 client/gui-gtk-2.0/pages.c:1965
+#: client/gui-gtk-2.0/pages.c:2375
 msgid "_Browse..."
 msgstr "ä¯ÀÀ(_B)..."
 
-#: client/gui-gtk-2.0/pages.c:1836
+#: client/gui-gtk-2.0/pages.c:1839
 msgid "Choose a Scenario"
 msgstr "ÇëÑ¡Ôñ¾çÇé"
 
-#: client/gui-gtk-2.0/pages.c:1923
+#: client/gui-gtk-2.0/pages.c:1926
 msgid "Choose a _Scenario:"
 msgstr "ÇëÑ¡Ôñ¾çÇé(_S)£º"
 
-#: client/gui-gtk-2.0/pages.c:2088 client/gui-gtk-2.0/repodlgs.c:634
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1083
+#: client/gui-gtk-2.0/pages.c:2091 client/gui-gtk-2.0/repodlgs.c:634
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1083
 #: client/gui-win32/connectdlg.c:998 client/gui-win32/wldlg.c:800
 #: client/gui-win32/wldlg.c:806
 msgid "Type"
 msgstr "ÀàÐÍ"
 
-#: client/gui-gtk-2.0/pages.c:2098
+#: client/gui-gtk-2.0/pages.c:2101
 msgid "Choose a _nation to play:"
 msgstr "ÇëÑ¡ÔñÄúÒªÍæµÄÃñ×壺"
 
-#: client/gui-gtk-2.0/pages.c:2284 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2287 client/gui-win32/menu.c:581
 msgid "Select Location to Save"
 msgstr "Ñ¡ÔñÒª±£´æµ½µÄλÖÃ"
 
-#: client/gui-gtk-2.0/pages.c:2369 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2372 client/gui-sdl/optiondlg.c:2273
 msgid "Save Game"
 msgstr "±£´æÓÎÏ·"
 
-#: client/gui-gtk-2.0/pages.c:2410
+#: client/gui-gtk-2.0/pages.c:2413
 msgid "Saved _Games:"
 msgstr "´æÅÌÓÎÏ·(_G)£º"
 
-#: client/gui-gtk-2.0/pages.c:2437
+#: client/gui-gtk-2.0/pages.c:2440
 msgid "Save _Filename:"
 msgstr "´æÅÌÎļþÃû(_F)£º"
 
@@ -12044,7 +12118,7 @@ msgstr "
 msgid "Count"
 msgstr "¼ÆÊý"
 
-#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1034
+#: client/gui-gtk-2.0/repodlgs.c:637 client/gui-gtk-2.0/wldlg.c:1035
 #: client/gui-win32/citydlg.c:1090 client/gui-win32/repodlgs.c:466
 #: client/gui-win32/wldlg.c:802 client/gui-win32/wldlg.c:808
 #: manual/civmanual.c:302
@@ -12288,28 +12362,28 @@ msgstr "
 msgid "Edit Global _Worklists"
 msgstr "Ìí¼Ó¹²Óù¤×÷Áбí(_W)"
 
-#: client/gui-gtk-2.0/wldlg.c:1034 client/gui-win32/citydlg.c:1092
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/citydlg.c:1092
 #: client/gui-win32/wldlg.c:809
 msgid "Turns"
 msgstr "»ØºÏ"
 
-#: client/gui-gtk-2.0/wldlg.c:1150
+#: client/gui-gtk-2.0/wldlg.c:1151
 msgid "Source _Tasks:"
 msgstr "ÈÎÎñÀ´Ô´(_T)£º"
 
-#: client/gui-gtk-2.0/wldlg.c:1155
+#: client/gui-gtk-2.0/wldlg.c:1156
 msgid "Show _Future Targets"
 msgstr "ÏÔʾδÀ´Ä¿±ê(_F)"
 
-#: client/gui-gtk-2.0/wldlg.c:1242
+#: client/gui-gtk-2.0/wldlg.c:1243
 msgid "Target _Worklist:"
 msgstr "Ä¿±ê¹¤×÷Áбí(_W)"
 
-#: client/gui-gtk-2.0/wldlg.c:1260
+#: client/gui-gtk-2.0/wldlg.c:1261
 msgid "_Add Global Worklist"
 msgstr "Ìí¼Ó¹²Óù¤×÷Áбí(_A)"
 
-#: client/gui-gtk-2.0/wldlg.c:1276
+#: client/gui-gtk-2.0/wldlg.c:1277
 msgid "Chan_ge Production"
 msgstr "¸Ä±ä²úÆ·(_G)"
 
@@ -12613,8 +12687,8 @@ msgid "City shrinks: %d %s"
 msgstr "³ÇÊУº%s(%s)"
 
 #: client/gui-sdl/citydlg.c:2977 client/gui-sdl/citydlg.c:2981
-#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:532
-#: client/gui-sdl/cityrep.c:1056 client/gui-sdl/menu.c:802
+#: client/gui-sdl/citydlg.c:3301 client/gui-sdl/cityrep.c:536
+#: client/gui-sdl/cityrep.c:1061 client/gui-sdl/menu.c:802
 #: client/gui-sdl/menu.c:806 client/gui-sdl/menu.c:1041
 #: client/gui-sdl/menu.c:1047 client/gui-sdl/menu.c:1090
 #: client/gui-sdl/menu.c:1096 client/gui-sdl/menu.c:1102
@@ -12729,12 +12803,12 @@ msgstr "
 msgid "Maintenance Report"
 msgstr "¿Æѧ±¨¸æ"
 
-#: client/gui-sdl/cityrep.c:514 client/gui-sdl/cityrep.c:1035
+#: client/gui-sdl/cityrep.c:518 client/gui-sdl/cityrep.c:1040
 #, fuzzy
 msgid "worklist"
 msgstr "£¨¹¤×÷ÁÐ±í£©"
 
-#: client/gui-sdl/cityrep.c:518
+#: client/gui-sdl/cityrep.c:522
 #, fuzzy
 msgid ""
 "\n"
@@ -13173,21 +13247,21 @@ msgstr ""
 msgid "  -t,  --theme THEME\tUse GUI theme THEME\n"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:659
+#: client/gui-sdl/gui_main.c:665
 #, c-format
 msgid "Making screenshot fc_%05d.bmp"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:792
+#: client/gui-sdl/gui_main.c:798
 #, c-format
 msgid "Using Video Output: %s"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:845
+#: client/gui-sdl/gui_main.c:851
 msgid "Initializing Client"
 msgstr ""
 
-#: client/gui-sdl/gui_main.c:856
+#: client/gui-sdl/gui_main.c:862
 msgid "Waiting for the beginning of the game"
 msgstr ""
 
@@ -14491,7 +14565,7 @@ msgstr "
 msgid "Unit Selection"
 msgstr "²¿¶ÓÑ¡Ôñ"
 
-#: client/gui-win32/dialogs.c:1198
+#: client/gui-win32/dialogs.c:1198 client/gui-xaw/diplomat_dialog.c:395
 msgid "NONE"
 msgstr "ÎÞ"
 
diff --git a/scripts/setup_auth_server.sh b/scripts/setup_auth_server.sh
index 7d052b2..6e7da2e 100755
--- a/scripts/setup_auth_server.sh
+++ b/scripts/setup_auth_server.sh
@@ -415,7 +415,7 @@ fi
 
 echo "Now we create the Freeciv tables."
 
-# We have embedded table creatino SQL to this script.
+# We have embedded table creation SQL to this script.
 # Maybe we should read it from separate file in the future.
 (echo \
  "CREATE TABLE $TABLE_AUTH ( \
@@ -432,7 +432,7 @@ echo "Now we create the Freeciv tables."
    UNIQUE KEY name (name) \
  ) TYPE=MyISAM;"
  echo \
- "CREATE TABLE loginlog ( \
+ "CREATE TABLE $TABLE_LOGINLOG ( \
    id int(11) NOT NULL auto_increment, \
    name varchar(32) default NULL, \
    logintime int(11) default NULL, \
diff --git a/server/Makefile.in b/server/Makefile.in
index 9942d51..aeb4c10 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/server/auth.c b/server/auth.c
index 154140f..68969a0 100644
--- a/server/auth.c
+++ b/server/auth.c
@@ -41,6 +41,7 @@
 
 /* where our mysql database is located and how to get to it */
 #define DEFAULT_AUTH_HOST     "localhost"
+#define DEFAULT_AUTH_PORT     "3306"
 #define DEFAULT_AUTH_USER     "anonymous"
 #define DEFAULT_AUTH_PASSWORD ""
 
@@ -92,18 +93,6 @@
  * many seconds to reply to the client */
 static const int auth_fail_wait[] = { 1, 1, 2, 3 };
 
-static bool is_good_password(const char *password, char *msg);
-
-static bool authdb_check_password(struct connection *pconn,
-                           const char *password, int len);
-static enum authdb_status auth_db_load(struct connection *pconn);
-static bool auth_db_save(struct connection *pconn);
-
-#ifdef HAVE_AUTH
-static char *alloc_escaped_string(MYSQL *mysql, const char *orig);
-static void free_escaped_string(char *str);
-#endif /* HAVE_AUTH */
-
 /**************************************************
  The auth db statuses are:
 
@@ -118,6 +107,18 @@ enum authdb_status {
   AUTH_DB_NOT_FOUND
 };
 
+static bool is_good_password(const char *password, char *msg);
+
+static bool authdb_check_password(struct connection *pconn,
+                           const char *password, int len);
+static enum authdb_status auth_db_load(struct connection *pconn);
+static bool auth_db_save(struct connection *pconn);
+
+#ifdef HAVE_AUTH
+static char *alloc_escaped_string(MYSQL *mysql, const char *orig);
+static void free_escaped_string(char *str);
+#endif /* HAVE_AUTH */
+
 #ifdef HAVE_AUTH
 
 enum auth_option_source {
@@ -134,6 +135,7 @@ struct auth_option {
 
 static struct authentication_conf {
   struct auth_option host;
+  struct auth_option port;
   struct auth_option user;
   struct auth_option password;
   struct auth_option database;
@@ -197,7 +199,7 @@ static void print_auth_option(int loglevel, enum show_source_type show_source,
 
   if (buffer[0] != '\0') {
     /* There is line to print */
-    freelog(loglevel, buffer);
+    freelog(loglevel, "%s", buffer);
   }
 }
 
@@ -208,6 +210,7 @@ static void print_auth_config(int loglevel, enum show_source_type show_source,
                               bool show_value)
 {
   print_auth_option(loglevel, show_source, show_value, &auth_config.host);
+  print_auth_option(loglevel, show_source, show_value, &auth_config.port);
   print_auth_option(loglevel, show_source, show_value, &auth_config.user);
   print_auth_option(loglevel, show_source, FALSE, &auth_config.password);
   print_auth_option(loglevel, show_source, show_value, &auth_config.database);
@@ -218,9 +221,22 @@ static void print_auth_config(int loglevel, enum show_source_type show_source,
 /**************************************************************************
   Set one auth option.
 **************************************************************************/
-static void set_auth_option(struct auth_option *target, const char *value,
+static bool set_auth_option(struct auth_option *target, const char *value,
                             enum auth_option_source source)
 {
+  if (value != NULL
+      && !strcmp(target->name, "port")) {
+    /* Port value must be all numeric. */
+    int i;
+
+    for (i = 0; value[i] != '\0'; i++) {
+      if (value[i] < '0' || value[i] > '9') {
+        freelog(LOG_ERROR, _("Illegal value for auth port: \"%s\""), value);
+        return FALSE;
+      }
+    }
+  }
+
   if (value == NULL) {
     if (target->value != NULL) {
       free(target->value);
@@ -231,6 +247,8 @@ static void set_auth_option(struct auth_option *target, const char *value,
     memcpy(target->value, value, strlen(value) + 1);
   }
   target->source = source;
+
+  return TRUE;
 }
 
 /**************************************************************************
@@ -240,11 +258,8 @@ static void load_auth_option(struct section_file *file,
                              struct auth_option *target)
 {
   const char *value;
-  char option[512];
-
-  my_snprintf(option, sizeof(option), "auth.%s", target->name);
 
-  value = secfile_lookup_str_default(file, "", option);
+  value = secfile_lookup_str_default(file, "", "auth.%s", target->name);
   if (value[0] != '\0') {
     /* We really loaded something from file */
     set_auth_option(target, value, AOS_FILE);
@@ -273,6 +288,7 @@ static bool load_auth_config(const char *filename)
   }
 
   load_auth_option(&file, &auth_config.host);
+  load_auth_option(&file, &auth_config.port);
   load_auth_option(&file, &auth_config.user);
   load_auth_option(&file, &auth_config.password);
   load_auth_option(&file, &auth_config.database);
@@ -297,6 +313,7 @@ bool auth_init(const char *conf_file)
   if (first_init) {
     /* Run just once when program starts */
     auth_config.host.value        = NULL;
+    auth_config.port.value        = NULL;
     auth_config.user.value        = NULL;
     auth_config.password.value    = NULL;
     auth_config.database.value    = NULL;
@@ -304,6 +321,7 @@ bool auth_init(const char *conf_file)
     auth_config.login_table.value = NULL;
 
     auth_config.host.name         = "host";
+    auth_config.port.name         = "port";
     auth_config.user.name         = "user";
     auth_config.password.name     = "password";
     auth_config.database.name     = "database";
@@ -314,6 +332,7 @@ bool auth_init(const char *conf_file)
   }
 
   set_auth_option(&auth_config.host, DEFAULT_AUTH_HOST, AOS_DEFAULT);
+  set_auth_option(&auth_config.port, DEFAULT_AUTH_PORT, AOS_DEFAULT);
   set_auth_option(&auth_config.user, DEFAULT_AUTH_USER, AOS_DEFAULT);
   set_auth_option(&auth_config.password, DEFAULT_AUTH_PASSWORD, AOS_DEFAULT);
   set_auth_option(&auth_config.database, DEFAULT_AUTH_DATABASE, AOS_DEFAULT);
@@ -347,6 +366,7 @@ void auth_free(void)
 {
 #ifdef HAVE_AUTH
   set_auth_option(&auth_config.host, NULL, AOS_DEFAULT);
+  set_auth_option(&auth_config.port, NULL, AOS_DEFAULT);
   set_auth_option(&auth_config.user, NULL, AOS_DEFAULT);
   set_auth_option(&auth_config.password, NULL, AOS_DEFAULT);
   set_auth_option(&auth_config.database, NULL, AOS_DEFAULT);
@@ -662,7 +682,7 @@ static bool authdb_check_password(struct connection *pconn,
   bool ok = FALSE;
   char buffer[512] = "";
   const int bufsize = sizeof(buffer);
-  char checksum[DIGEST_HEX_BYTES];
+  char checksum[DIGEST_HEX_BYTES + 1];
   MYSQL *sock, mysql;
 
   /* do the password checking right here */
@@ -677,7 +697,8 @@ static bool authdb_check_password(struct connection *pconn,
   /* attempt to connect to the server */
   if ((sock = mysql_real_connect(&mysql, auth_config.host.value,
                                  auth_config.user.value, auth_config.password.value, 
-                                 auth_config.database.value, 0, NULL, 0))) {
+                                 auth_config.database.value,
+                                 atoi(auth_config.port.value), NULL, 0))) {
     char *name_buffer = alloc_escaped_string(&mysql, pconn->username);
     int str_result;
 
@@ -729,7 +750,8 @@ static enum authdb_status auth_db_load(struct connection *pconn)
                                   auth_config.user.value,
                                   auth_config.password.value,
                                   auth_config.database.value,
-                                  0, NULL, 0))) {
+                                  atoi(auth_config.port.value),
+                                  NULL, 0))) {
     freelog(LOG_ERROR, "Can't connect to server! (%s)", mysql_error(&mysql));
     return AUTH_DB_ERROR;
   }
@@ -846,7 +868,8 @@ static bool auth_db_save(struct connection *pconn)
   if (!(sock = mysql_real_connect(&mysql, auth_config.host.value,
                                   auth_config.user.value, auth_config.password.value,
                                   auth_config.database.value,
-                                  0, NULL, 0))) {
+                                  atoi(auth_config.port.value),
+                                  NULL, 0))) {
     freelog(LOG_ERROR, "Can't connect to server! (%s)", mysql_error(&mysql));
     return FALSE;
   }
diff --git a/server/barbarian.c b/server/barbarian.c
index c0aa4ca..ad78ee3 100644
--- a/server/barbarian.c
+++ b/server/barbarian.c
@@ -165,7 +165,7 @@ static struct player *create_barbarian_player(bool land)
     barbarians->ai.barbarian_type = SEA_BARBARIAN;
   }
   set_ai_level_directer(barbarians, game.info.skill_level);
-  init_tech(barbarians);
+  init_tech(barbarians, TRUE);
   give_initial_techs(barbarians);
 
   /* Ensure that we are at war with everyone else */
diff --git a/server/cityhand.c b/server/cityhand.c
index 3bdf3c6..7405105 100644
--- a/server/cityhand.c
+++ b/server/cityhand.c
@@ -384,7 +384,7 @@ void handle_city_rename(struct player *pplayer, int city_id, char *name)
   }
 
   if (!is_allowed_city_name(pplayer, name, message, sizeof(message))) {
-    notify_player(pplayer, pcity->tile, E_BAD_COMMAND,
+    notify_player(pplayer, pcity->tile, E_BAD_COMMAND, "%s",
 		  message);
     return;
   }
diff --git a/server/citytools.c b/server/citytools.c
index 9843fc4..abbfd9e 100644
--- a/server/citytools.c
+++ b/server/citytools.c
@@ -185,7 +185,7 @@ static int evaluate_city_name_priority(struct tile *ptile,
   terrain_type_iterate(pterrain) {
     /* Now we do the same for every available terrain. */
     goodness
-      = is_terrain_near_tile(ptile, pterrain)
+      = is_terrain_near_tile(ptile, pterrain, TRUE)
       ? nc->terrain[pterrain->index]
       : -nc->terrain[pterrain->index];
     if (goodness > 0) {
@@ -2165,7 +2165,7 @@ void sync_cities(void)
 }
 
 /**************************************************************************
-...
+  Check worker maps of all the cities of the player.
 **************************************************************************/
 void check_city_workers(struct player *pplayer)
 {
diff --git a/server/cityturn.c b/server/cityturn.c
index 9d8ad66..e59a5cc 100644
--- a/server/cityturn.c
+++ b/server/cityturn.c
@@ -372,9 +372,9 @@ void update_city_activities(struct player *pplayer)
   int gold;
   gold=pplayer->economic.gold;
   pplayer->bulbs_last_turn = 0;
-  city_list_iterate(pplayer->cities, pcity)
+  city_list_iterate_safe(pplayer->cities, pcity)
      update_city_activity(pplayer, pcity);
-  city_list_iterate_end;
+  city_list_iterate_safe_end;
   pplayer->ai.prev_gold = gold;
   /* This test include the cost of the units because pay_for_units is called
    * in update_city_activity */
diff --git a/server/commands.c b/server/commands.c
index 79e957d..7542fb3 100644
--- a/server/commands.c
+++ b/server/commands.c
@@ -115,8 +115,7 @@ const struct command commands[] = {
       "to the latest command.  You can only suggest one vote at a time.  "
       "The vote will pass immediately if more than half of the players "
       "vote for it, or fail immediately if at least half of the players "
-      "vote against it.  If one full turn elapses the vote may pass in any "
-      "case if nobody votes against it.")
+      "vote against it.")
   },
   {"debug",	ALLOW_CTRL,
    N_("debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> "
diff --git a/server/connecthand.c b/server/connecthand.c
index 94ce9d5..910a096 100644
--- a/server/connecthand.c
+++ b/server/connecthand.c
@@ -343,15 +343,15 @@ void lost_connection_to_client(struct connection *pconn)
   notify_conn(game.est_connections, NULL, E_CONNECTION,
 	      _("Lost connection: %s."), desc);
 
+  unattach_connection_from_player(pconn);
+  send_conn_info_remove(pconn->self, game.est_connections);
+  notify_if_first_access_level_is_available();
+
   if (!pplayer) {
     delayed_disconnect--;
     return;
   }
 
-  unattach_connection_from_player(pconn);
-  send_conn_info_remove(pconn->self, game.est_connections);
-  notify_if_first_access_level_is_available();
-
   if (game.info.is_new_game
       && !pplayer->is_connected /* eg multiple controllers */
       && !pplayer->ai.control    /* eg created AI player */
diff --git a/server/gamehand.c b/server/gamehand.c
index 1b0ed5f..781c723 100644
--- a/server/gamehand.c
+++ b/server/gamehand.c
@@ -33,6 +33,7 @@
 #include "support.h"
 
 #include "connecthand.h"
+#include "ggzserver.h"
 #include "maphand.h"
 #include "plrhand.h"
 #include "unittools.h"
@@ -512,14 +513,16 @@ void handle_single_want_hack_req(struct connection *pc,
   char *token = NULL;
   bool you_have_hack = FALSE;
 
-  if (section_file_load_nodup(&file, get_challenge_fullname(pc))) {
-    token = secfile_lookup_str_default(&file, NULL, "challenge.token");
-    you_have_hack = (token && strcmp(token, packet->token) == 0);
-    section_file_free(&file);
-  }
+  if (!with_ggz) {
+    if (section_file_load_nodup(&file, get_challenge_fullname(pc))) {
+      token = secfile_lookup_str_default(&file, NULL, "challenge.token");
+      you_have_hack = (token && strcmp(token, packet->token) == 0);
+      section_file_free(&file);
+    }
 
-  if (!token) {
-    freelog(LOG_DEBUG, "Failed to read authentication token");
+    if (!token) {
+      freelog(LOG_DEBUG, "Failed to read authentication token");
+    }
   }
 
   if (you_have_hack) {
diff --git a/server/generator/Makefile.in b/server/generator/Makefile.in
index 1f7f0a0..7df97ee 100644
--- a/server/generator/Makefile.in
+++ b/server/generator/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/server/generator/mapgen.c b/server/generator/mapgen.c
index 517bf70..8980468 100644
--- a/server/generator/mapgen.c
+++ b/server/generator/mapgen.c
@@ -376,9 +376,7 @@ static bool ok_for_separate_poles(struct tile *ptile)
     return TRUE;
   }
   adjc_iterate(ptile, tile1) {
-    if (tile1->terrain != T_UNKNOWN
-	&& !is_ocean(tile_get_terrain(tile1))
-        && tile_get_continent(tile1) != 0) {
+    if (tile_get_continent(tile1) > 0) {
       return FALSE;
     }
   } adjc_iterate_end;
@@ -1015,10 +1013,32 @@ static void make_rivers(void)
 **************************************************************************/
 static void make_land(void)
 {
+  struct terrain *land_fill = NULL;
   
   if (HAS_POLES) {
     normalize_hmap_poles();
   }
+
+  /* Pick a non-ocean terrain just once and fill all land tiles with "
+   * that terrain. We must set some terrain (and not T_UNKNOWN) so that "
+   * continent number assignment works. */
+  terrain_type_iterate(pterrain) {
+    if (!is_ocean(pterrain)) {
+      land_fill = pterrain;
+      break;
+    }
+  } terrain_type_iterate_end;
+  if (land_fill == NULL) {
+    freelog(LOG_FATAL, "No land terrain type could be found for the "
+            "purpose of temporarily filling in land tiles during map "
+            "generation. This could be an error in freeciv, or a "
+            "mistake in the terrain.ruleset file. Please make sure "
+            "there is at least one land terrain type in the ruleset, "
+            "or use a different map generator. If this error persists, "
+            "please report it at: %s", BUG_URL);
+    assert(land_fill != NULL);
+  }
+
   hmap_shore_level = (hmap_max_level * (100 - map.landpercent)) / 100;
   ini_hmap_low_level();
   whole_map_iterate(ptile) {
@@ -1027,6 +1047,9 @@ static void make_land(void)
       int depth = (hmap_shore_level - hmap(ptile)) * 100 / hmap_shore_level;
 
       tile_set_terrain(ptile, pick_ocean(depth));
+    } else {
+      /* See note above for 'land_fill'. */
+      tile_set_terrain(ptile, land_fill);
     }
   } whole_map_iterate_end;
   if (HAS_POLES) {
@@ -1446,11 +1469,11 @@ static void fill_island(int coast, long int *bucket,
       /* the first condition helps make terrain more contiguous,
 	 the second lets it avoid the coast: */
       if ( ( i*3>k*2 
-	     || is_terrain_near_tile(ptile, warm0) 
-	     || is_terrain_near_tile(ptile, warm1) 
+	     || is_terrain_near_tile(ptile, warm0, FALSE) 
+	     || is_terrain_near_tile(ptile, warm1, FALSE)
 	     || myrand(100)<50 
-	     || is_terrain_near_tile(ptile, cold0) 
-	     || is_terrain_near_tile(ptile, cold1) 
+	     || is_terrain_near_tile(ptile, cold0, FALSE)
+	     || is_terrain_near_tile(ptile, cold1, FALSE)
 	     )
 	   &&( !is_cardinally_adj_to_ocean(ptile) || myrand(100) < coast )) {
 	if (map_colatitude(ptile) < COLD_LEVEL) {
diff --git a/server/generator/startpos.c b/server/generator/startpos.c
index ad1e62f..16eef05 100644
--- a/server/generator/startpos.c
+++ b/server/generator/startpos.c
@@ -199,7 +199,7 @@ bool create_start_positions(enum start_mode mode)
   int k, sum;
   struct start_filter_data data;
   int tile_value_aux[MAP_INDEX_SIZE], tile_value[MAP_INDEX_SIZE];
-  int min_goodies_per_player = 2000;
+  int min_goodies_per_player = 1500;
   int total_goodies = 0;
   /* this is factor is used to maximize land used in extreme little maps */
   float efactor =  game.info.nplayers / map.size / 4; 
@@ -375,7 +375,7 @@ bool create_start_positions(enum start_mode mode)
       data.count++;
 
     } else {
-      data.min_value *= 0.9;
+      data.min_value *= 0.95;
       if (data.min_value <= 10) {
 	freelog(LOG_ERROR,
 	        _("The server appears to have gotten into an infinite loop "
diff --git a/server/ggzserver.c b/server/ggzserver.c
index 6e63880..340aa38 100644
--- a/server/ggzserver.c
+++ b/server/ggzserver.c
@@ -17,6 +17,8 @@
 
 #ifdef GGZ_SERVER
 
+#include <unistd.h>
+
 #include <ggzdmod.h>
 
 #include "fciconv.h"
@@ -31,6 +33,8 @@
 #include "ggzserver.h"
 #include "score.h"
 #include "sernet.h"
+#include "srv_main.h"
+#include "stdinhand.h"
 
 bool with_ggz = FALSE;
 
@@ -73,7 +77,7 @@ static struct player *get_player_for_seat(int seat_num)
     return NULL;
   case GGZ_SEAT_PLAYER:
   case GGZ_SEAT_BOT:
-  default: /* Works for GGZ_SEAT_ABANDONED. */
+  case GGZ_SEAT_ABANDONED:
     break;
   }
 
@@ -93,16 +97,52 @@ static struct player *get_player_for_seat(int seat_num)
 static void handle_ggz_state_event(GGZdMod * ggz, GGZdModEvent event,
 				   const void *data)
 {
-#if 0
   const GGZdModState *old_state = data;
   GGZdModState new_state = ggzdmod_get_state(ggz);
 
-  /* Currently no handling is done. */
-#endif
+  freelog(LOG_DEBUG, "ggz changed state to %d.", new_state);
+
+  if (*old_state == GGZDMOD_STATE_CREATED) {
+    const char *savegame = ggzdmod_get_savedgame(ggz);
+
+    /* If a savegame is given, load it. */
+    freelog(LOG_DEBUG, "Instructed to load \"%s\".", savegame);
+    if (savegame) {
+      if (!load_command(NULL, savegame, FALSE)) {
+	/* no error handling? */
+	server_quit();
+      }
+    }
+
+    /* If we loaded a game that'll include the serverid.  If not we
+     * generate one here. */
+    if (strlen(srvarg.serverid) == 0) {
+      strcpy(srvarg.serverid, "ggz-civ-XXXXXX");
+      if (!mkdtemp(srvarg.serverid)) {
+	freelog(LOG_ERROR,
+		_("Unable to make temporary directory for GGZ game.\n"));
+	server_quit();
+      }
+    }
+
+    /* Change into the server directory */
+    if (chdir(srvarg.serverid) < 0) {
+      freelog(LOG_ERROR,
+	      _("Unable to change into temporary server "
+		"directory %s.\n"), srvarg.serverid);
+      server_quit();
+    }
+    freelog(LOG_DEBUG, "Changed into directory %s.", srvarg.serverid);
+  }
 }
 
 /****************************************************************************
   Handles a seat-change event as reported by the GGZ server.
+
+  This typically happens when a human player joins or leaves the game.
+  This function links the GGZ seat player (which is just a seat number) to
+  the correct player.  In the case of a join event we also get the socket
+  for the player's connection, which is treated just like a new connection.
 ****************************************************************************/
 static void handle_ggz_seat_event(GGZdMod *ggz, GGZdModEvent event,
 				  const void *data)
@@ -142,12 +182,12 @@ static void handle_ggz_seat_event(GGZdMod *ggz, GGZdModEvent event,
     } players_iterate_end;
 
     if (leaving) {
-      printf("%s is leaving.\n", old_seat->name);
+      freelog(LOG_DEBUG, "%s is leaving.", old_seat->name);
       leaving->sock = -1;
       lost_connection_to_client(leaving);
       close_connection(leaving);
     } else {
-      printf("Couldn't match player %s.\n", old_seat->name);
+      freelog(LOG_ERROR, "Couldn't match player %s.", old_seat->name);
     }
   }
 }
@@ -173,6 +213,19 @@ static void handle_ggz_spectator_seat_event(GGZdMod *ggz, GGZdModEvent event,
 }
 
 /****************************************************************************
+  Handles a ggzdmod error.  This simply exits the server with an error
+  message.
+****************************************************************************/
+static void handle_ggz_error(GGZdMod * ggz, GGZdModEvent event,
+			     const void *data)
+{
+  const char *err = data;
+
+  freelog(LOG_ERROR, "Error in ggz: %s", err);
+  server_quit();
+}
+
+/****************************************************************************
   Connect to the GGZ server, if GGZ is being used.
 ****************************************************************************/
 void ggz_initialize(void)
@@ -199,6 +252,12 @@ void ggz_initialize(void)
 			&handle_ggz_seat_event);
     ggzdmod_set_handler(ggzdmod, GGZDMOD_EVENT_SPECTATOR_JOIN,
 			&handle_ggz_spectator_seat_event);
+    ggzdmod_set_handler(ggzdmod, GGZDMOD_EVENT_SPECTATOR_LEAVE,
+			&handle_ggz_spectator_seat_event);
+    ggzdmod_set_handler(ggzdmod, GGZDMOD_EVENT_SPECTATOR_SEAT,
+			&handle_ggz_spectator_seat_event);
+    ggzdmod_set_handler(ggzdmod, GGZDMOD_EVENT_ERROR,
+    			&handle_ggz_error);
     if (ggzdmod_connect(ggzdmod) < 0) {
       exit(EXIT_FAILURE);
     }
@@ -332,4 +391,27 @@ void ggz_report_victory(void)
   num_victors = 0; /* In case there's another game. */
 }
 
+/****************************************************************************
+  Reports a savegame file to the GGZ server.  GGZ will allow
+  reloading from a file later by providing the savegame at launch time
+  (in the STATE event when leaving the CREATED state).
+****************************************************************************/
+void ggz_game_saved(const char *filename)
+{
+  char full_filename[strlen(filename) + strlen(srvarg.serverid) + 2];
+
+  if (!path_is_absolute(filename)) {
+    snprintf(full_filename, sizeof(full_filename), "%s/%s",
+	     srvarg.serverid, filename);
+  } else {
+    sz_strlcpy(full_filename, filename);
+  }
+  freelog(LOG_DEBUG, "Reporting filename %s => %s to ggz.",
+	  filename, full_filename);
+
+  if (with_ggz) {
+    ggzdmod_report_savegame(ggzdmod, full_filename);
+  }
+}
+
 #endif
diff --git a/server/ggzserver.h b/server/ggzserver.h
index 5236cb0..461aa9d 100644
--- a/server/ggzserver.h
+++ b/server/ggzserver.h
@@ -28,12 +28,15 @@ int get_ggz_socket(void);
 void ggz_report_victor(const struct player *winner);
 void ggz_report_victory(void);
 
+void ggz_game_saved(const char *filename);
+
 #else
 
 #  define with_ggz FALSE
 #  define ggz_initialize() (void)0
 #  define ggz_report_victor(pplayer) (void)0
 #  define ggz_report_victory() (void)0
+#  define ggz_game_saved(filename) (void)0
 
 #endif
 
diff --git a/server/gotohand.c b/server/gotohand.c
index d630be6..c74bbee 100644
--- a/server/gotohand.c
+++ b/server/gotohand.c
@@ -118,6 +118,21 @@ static void init_queue(void)
 }
 
 /**************************************************************************
+  Free mapqueue arrays
+**************************************************************************/
+void free_mapqueue(void)
+{
+  int i;
+
+  for (i = 0; i < MAXARRAYS; i++) {
+    if (mappos_arrays[i] != NULL) {
+      free(mappos_arrays[i]);
+      mappos_arrays[i] = NULL;
+    }
+  }
+}
+
+/**************************************************************************
 ...
 **************************************************************************/
 static struct mappos_array *get_empty_array(void)
diff --git a/server/gotohand.h b/server/gotohand.h
index 576ec77..afd8a2d 100644
--- a/server/gotohand.h
+++ b/server/gotohand.h
@@ -29,6 +29,8 @@ enum goto_result {
   GR_FAILED              /* failed for some other reason, has moves */
 };
 
+void free_mapqueue(void);
+
 bool is_dist_finite(int dist);
 enum goto_result do_unit_goto(struct unit *punit,
 			      enum goto_move_restriction restriction,
diff --git a/server/maphand.c b/server/maphand.c
index 59a97d5..6058d30 100644
--- a/server/maphand.c
+++ b/server/maphand.c
@@ -207,9 +207,8 @@ Used only in global_warming() and nuclear_winter() below.
 **************************************************************************/
 static bool is_terrain_ecologically_wet(struct tile *ptile)
 {
-  return (tile_has_special(ptile, S_RIVER)
-	  || is_ocean_near_tile(ptile)
-	  || is_special_near_tile(ptile, S_RIVER));
+  return (is_ocean_near_tile(ptile)
+	  || is_special_near_tile(ptile, S_RIVER, TRUE));
 }
 
 /**************************************************************************
@@ -1250,6 +1249,9 @@ void give_shared_vision(struct player *pfrom, struct player *pto)
 	  } vision_layer_iterate_end;
 	} whole_map_iterate_end;
 
+        /* Refresh cities in case new tiles were revealed from their area. */
+        check_city_workers(pplayer2);
+
 	/* squares that are not seen, but which pfrom may have more recent
 	   knowledge of */
 	give_map_from_player_to_player(pplayer, pplayer2);
diff --git a/server/plrhand.c b/server/plrhand.c
index 46b1f39..1dd6184 100644
--- a/server/plrhand.c
+++ b/server/plrhand.c
@@ -258,7 +258,7 @@ static void finish_revolution(struct player *pplayer)
       = 100 - pplayer->economic.science - pplayer->economic.tax;
   }
 
-  check_player_government_rates(pplayer);
+  check_player_max_rates(pplayer);
   global_city_refresh(pplayer);
   send_player_info(pplayer, pplayer);
 }
@@ -337,7 +337,7 @@ void handle_player_change_government(struct player *pplayer, int government)
 		     _("Revolution: returning to anarchy."));
   }
 
-  check_player_government_rates(pplayer);
+  check_player_max_rates(pplayer);
   global_city_refresh(pplayer);
   send_player_info(pplayer, pplayer);
 
@@ -414,25 +414,22 @@ The following checks that government rates are acceptable for the present
 form of government. Has to be called when switching governments or when
 toggling from AI to human.
 **************************************************************************/
-void check_player_government_rates(struct player *pplayer)
+void check_player_max_rates(struct player *pplayer)
 {
   struct player_economic old_econ = pplayer->economic;
-  bool changed = FALSE;
-  player_limit_to_government_rates(pplayer);
-  if (pplayer->economic.tax != old_econ.tax) {
-    changed = TRUE;
+
+  pplayer->economic = player_limit_to_max_rates(pplayer);
+  if (old_econ.tax > pplayer->economic.tax) {
     notify_player(pplayer, NULL, E_NEW_GOVERNMENT,
 		  _("Tax rate exceeded the max rate for %s; adjusted."), 
 		  government_name_for_player(pplayer));
   }
-  if (pplayer->economic.science != old_econ.science) {
-    changed = TRUE;
+  if (old_econ.science > pplayer->economic.science) {
     notify_player(pplayer, NULL, E_NEW_GOVERNMENT,
 		  _("Science rate exceeded the max rate for %s; adjusted."), 
 		  government_name_for_player(pplayer));
   }
-  if (pplayer->economic.luxury != old_econ.luxury) {
-    changed = TRUE;
+  if (old_econ.luxury > pplayer->economic.luxury) {
     notify_player(pplayer, NULL, E_NEW_GOVERNMENT,
 		  _("Luxury rate exceeded the max rate for %s; adjusted."), 
 		  government_name_for_player(pplayer));
@@ -865,11 +862,6 @@ static void package_player_common(struct player *plr,
     packet->small_wonders[i] = plr->small_wonders[i];
   }
   packet->science_cost = plr->ai.science_cost;
-
-  packet->gold = plr->economic.gold;
-  packet->government = government_of_player(plr)
-                       ? government_of_player(plr)->index
-                       : -1;
 }
 
 /**************************************************************************
@@ -890,6 +882,7 @@ static void package_player_info(struct player *plr,
   enum plr_info_level info_level;
   enum plr_info_level highest_team_level;
   struct player_research* research = get_player_research(plr);
+  struct government *pgov = NULL;
 
   if (receiver) {
     info_level = player_info_level(plr, receiver);
@@ -916,6 +909,15 @@ static void package_player_info(struct player *plr,
     packet->score = 0;
   }
 
+  if (info_level >= INFO_MEETING) {
+    packet->gold = plr->economic.gold;
+    pgov = government_of_player(plr);
+  } else {
+    packet->gold = 0;
+    pgov = game.government_when_anarchy;
+  }
+  packet->government = pgov ? pgov->index : -1;
+   
   /* Send diplomatic status of the player to everyone they are in
    * contact with. */
   if (info_level >= INFO_EMBASSY
@@ -1118,6 +1120,8 @@ void server_remove_player(struct player *pplayer)
   team_remove_player(pplayer);
   game_remove_player(pplayer);
   game_renumber_players(player_number(pplayer));
+
+  aifill(game.info.aifill);
 }
 
 /**************************************************************************
@@ -1548,7 +1552,7 @@ static struct player *split_player(struct player *pplayer)
     } players_iterate_end;
   }
 
-  player_limit_to_government_rates(pplayer);
+  pplayer->economic = player_limit_to_max_rates(pplayer);
 
   /* copy the maps */
 
diff --git a/server/plrhand.h b/server/plrhand.h
index 089f600..a5e6380 100644
--- a/server/plrhand.h
+++ b/server/plrhand.h
@@ -39,7 +39,7 @@ struct nation_type *pick_a_nation(struct nation_type **choices,
                                   bool ignore_conflicts,
 				  bool only_available);
 
-void check_player_government_rates(struct player *pplayer);
+void check_player_max_rates(struct player *pplayer);
 void make_contact(struct player *pplayer1, struct player *pplayer2,
 		  struct tile *ptile);
 void maybe_make_contact(struct tile *ptile, struct player *pplayer);
diff --git a/server/report.c b/server/report.c
index 6834cb0..7bb265e 100644
--- a/server/report.c
+++ b/server/report.c
@@ -663,7 +663,9 @@ static void dem_line_item(char *outptr, size_t out_size,
   Other settings callback functions are in settings.c, but this one uses
   static values from this file so it's done separately.
 *************************************************************************/
-bool is_valid_demography(const char *demography, const char **error_string)
+bool is_valid_demography(const char *demography,
+                         struct connection *caller,
+                         const char **error_string)
 {
   int len = strlen(demography), i;
 
diff --git a/server/report.h b/server/report.h
index 4dc515f..7a94fd2 100644
--- a/server/report.h
+++ b/server/report.h
@@ -24,7 +24,9 @@ void page_conn(struct conn_list *dest, const char *caption, const char *headline
 void make_history_report(void);
 void report_wonders_of_the_world(struct conn_list *dest);
 void report_top_five_cities(struct conn_list *dest);
-bool is_valid_demography(const char *demography, const char **error_message);
+bool is_valid_demography(const char *demography,
+                         struct connection *caller,
+                         const char **error_message);
 void report_demographics(struct connection *pconn);
 void report_final_scores(void);
 
diff --git a/server/ruleset.c b/server/ruleset.c
index 67d6b43..d614b9a 100644
--- a/server/ruleset.c
+++ b/server/ruleset.c
@@ -1398,6 +1398,14 @@ static void load_ruleset_buildings(struct section_file *file)
 	       secfile_lookup_str_default(file, "-", "%s.sound_alt",
 					  sec[i]));
     b->helptext = lookup_helptext(file, sec[i]);
+
+    b->allows_units = FALSE;
+    unit_type_iterate(ut) {
+      if (ut->impr_requirement == i) {
+        b->allows_units = TRUE;
+        break;
+      }
+    } unit_type_iterate_end;
   }
 
   /* Some more consistency checking: */
diff --git a/server/savegame.c b/server/savegame.c
index 66a2bda..711c22f 100644
--- a/server/savegame.c
+++ b/server/savegame.c
@@ -1921,7 +1921,7 @@ static void player_load(struct player *plr, int plrno,
    * reassign nations to players who don't have them. */
 
   /* Add techs from game and nation, but ignore game.info.tech. */
-  init_tech(plr);
+  init_tech(plr, FALSE);
   /* We used to call give_initial_techs here, but that shouldn't be
    * necessary.  The savegame should already mark those techs as known.
    * give_initial_techs will crash if the nation is unset. */
@@ -2153,8 +2153,6 @@ static void player_load(struct player *plr, int plrno,
 				   "player%d.revolution_finishes", plrno);
   }
 
-  update_research(plr);
-
   for (i = 0; i < game.info.nplayers; i++) {
     plr->diplstates[i].type = 
       secfile_lookup_int_default(file, DS_WAR,
@@ -3613,6 +3611,8 @@ void game_load(struct section_file *file)
     sz_strlcpy(srvarg.metaserver_addr,
 	       secfile_lookup_str_default(file, DEFAULT_META_SERVER_ADDR,
 					  "game.metaserver"));
+    sz_strlcpy(srvarg.serverid,
+	       secfile_lookup_str_default(file, "", "game.serverid"));
 
     game.info.gold          = secfile_lookup_int(file, "game.gold");
     game.info.tech          = secfile_lookup_int(file, "game.tech");
@@ -3965,10 +3965,8 @@ void game_load(struct section_file *file)
     rstate.j = secfile_lookup_int(file,"random.index_J");
     rstate.k = secfile_lookup_int(file,"random.index_K");
     rstate.x = secfile_lookup_int(file,"random.index_X");
-    for(i=0;i<8;i++) {
-      char name[20];
-      my_snprintf(name, sizeof(name), "random.table%d",i);
-      string=secfile_lookup_str(file,name);
+    for(i = 0; i < 8; i++) {
+      string = secfile_lookup_str(file, "random.table%d",i);
       sscanf(string,"%8x %8x %8x %8x %8x %8x %8x", &rstate.v[7*i],
 	     &rstate.v[7*i+1], &rstate.v[7*i+2], &rstate.v[7*i+3],
 	     &rstate.v[7*i+4], &rstate.v[7*i+5], &rstate.v[7*i+6]);
@@ -4036,6 +4034,13 @@ void game_load(struct section_file *file)
 		  technology_order_size);
     } players_iterate_end;
 
+    /* In case of tech_leakage, we can update research only after all
+     * the players have been loaded */
+    players_iterate(pplayer) {
+      /* Mark the reachable techs */
+      update_research(pplayer);
+    } players_iterate_end;
+
     /* Some players may have invalid nations in the ruleset.  Once all 
      * players are loaded, pick one of the remaining nations for them.
      */
@@ -4236,7 +4241,8 @@ void game_save(struct section_file *file, const char *save_reason)
     secfile_insert_str(file, user_message, "game.metamessage");
   }
   secfile_insert_str(file, meta_addr_port(), "game.metaserver");
-  
+  secfile_insert_str(file, srvarg.serverid, "game.serverid");
+
   sz_strlcpy(options, SAVEFILE_OPTIONS);
   if (game.info.is_new_game) {
     if (map.num_start_positions>0) {
@@ -4422,15 +4428,14 @@ void game_save(struct section_file *file, const char *save_reason)
     secfile_insert_int(file, rstate.x, "random.index_X");
 
     for (i = 0; i < 8; i++) {
-      char name[20], vec[100];
+      char vec[100];
 
-      my_snprintf(name, sizeof(name), "random.table%d", i);
       my_snprintf(vec, sizeof(vec),
 		  "%8x %8x %8x %8x %8x %8x %8x", rstate.v[7 * i],
 		  rstate.v[7 * i + 1], rstate.v[7 * i + 2],
 		  rstate.v[7 * i + 3], rstate.v[7 * i + 4],
 		  rstate.v[7 * i + 5], rstate.v[7 * i + 6]);
-      secfile_insert_str(file, vec, name);
+      secfile_insert_str(file, vec, "random.table%d", i);
     }
   } else {
     secfile_insert_int(file, 0, "game.save_random");
diff --git a/server/scripting/Makefile.in b/server/scripting/Makefile.in
index 22f8fb3..22212fe 100644
--- a/server/scripting/Makefile.in
+++ b/server/scripting/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/server/scripting/script.c b/server/scripting/script.c
index 0ef1f74..5302249 100644
--- a/server/scripting/script.c
+++ b/server/scripting/script.c
@@ -104,7 +104,7 @@ static int script_report(lua_State *L, int status, const char *code)
       }
     }
 
-    freelog(LOG_ERROR, str.str);
+    freelog(LOG_ERROR, "%s", str.str);
 
     astr_free(&str);
 
@@ -288,7 +288,7 @@ static void script_vars_load(struct section_file *file)
     const char *vars;
     const char *section = "script.vars";
 
-    vars = secfile_lookup_str_default(file, "", section);
+    vars = secfile_lookup_str_default(file, "", "%s", section);
     script_dostring(state, vars, section);
   }
 }
@@ -344,7 +344,7 @@ static void script_code_load(struct section_file *file)
     const char *code;
     const char *section = "script.code";
 
-    code = secfile_lookup_str_default(file, "", section);
+    code = secfile_lookup_str_default(file, "", "%s", section);
     script_code = mystrdup(code);
     script_dostring(state, script_code, section);
   }
diff --git a/server/sernet.c b/server/sernet.c
index 887ea13..81d6493 100644
--- a/server/sernet.c
+++ b/server/sernet.c
@@ -490,7 +490,7 @@ enum server_events server_sniff_all_input(void)
 	  if (time(NULL) > last_noplayers + srvarg.quitidle) {
 	    save_game_auto("Lost all connections");
 	    set_meta_message_string("restarting for lack of players");
-	    freelog(LOG_NORMAL, get_meta_message_string());
+	    freelog(LOG_NORMAL, "%s", get_meta_message_string());
 	    (void) send_server_info_to_metaserver(META_INFO);
 
             set_server_state(S_S_OVER);
@@ -516,7 +516,7 @@ enum server_events server_sniff_all_input(void)
 		      "restarting in %d seconds for lack of players",
 		      srvarg.quitidle);
           set_meta_message_string((const char *)buf);
-	  freelog(LOG_NORMAL, get_meta_message_string());
+	  freelog(LOG_NORMAL, "%s", get_meta_message_string());
 	  (void) send_server_info_to_metaserver(META_INFO);
 	}
       } else {
@@ -711,7 +711,8 @@ enum server_events server_sniff_all_input(void)
       if (didget >= 1) {
         buffer[didget-1] = '\0'; /* overwrite newline character */
         didget--;
-        freelog(LOG_DEBUG, "Got line: \"%s\" (%ld, %ld)", buffer, didget, len);
+        freelog(LOG_DEBUG, "Got line: \"%s\" (%ld, %ld)", buffer,
+                (long int) didget, (long int) len);
       }
 #else  /* HAVE_GETLINE */
       buffer = malloc(BUF_SIZE + 1);
@@ -1014,6 +1015,9 @@ static void start_processing_request(struct connection *pconn,
 **************************************************************************/
 static void finish_processing_request(struct connection *pconn)
 {
+  if (!pconn || !pconn->used) {
+    return;
+  }
   assert(pconn->server.currently_processed_request_id);
   freelog(LOG_DEBUG, "finish processing packet %d from connection %d",
 	  pconn->server.currently_processed_request_id, pconn->id);
@@ -1132,7 +1136,11 @@ static void get_lanserver_announcement(void)
 ********************************************************************/
 static void send_lanserver_response(void)
 {
+#ifndef HAVE_WINSOCK
   unsigned char buffer[MAX_LEN_PACKET];
+#else  /* HAVE_WINSOCK */
+  char buffer[MAX_LEN_PACKET];
+#endif /* HAVE_WINSOCK */
   char hostname[512];
   char port[256];
   char version[256];
diff --git a/server/settings.c b/server/settings.c
index dd70bd3..f13b13b 100644
--- a/server/settings.c
+++ b/server/settings.c
@@ -46,32 +46,13 @@ const char *sset_level_names[] = {N_("None"),
 				  N_("Changed")};
 const int OLEVELS_NUM = ARRAY_SIZE(sset_level_names);
 
-
-/**************************************************************************
-  A callback invoked when autotoggle is set.
-**************************************************************************/
-static bool autotoggle_callback(bool value, const char **reject_message)
-{
-  reject_message = NULL;
-  if (!value) {
-    return TRUE;
-  }
-
-  players_iterate(pplayer) {
-    if (!pplayer->ai.control && !pplayer->is_connected) {
-      toggle_ai_player_direct(NULL, pplayer);
-      send_player_info_c(pplayer, game.est_connections);
-    }
-  } players_iterate_end;
-
-  return TRUE;
-}
-
 /*************************************************************************
   Verify that a given allowtake string is valid.  See
   game.allow_take.
 *************************************************************************/
-static bool allowtake_callback(const char *value, const char **error_string)
+static bool allowtake_callback(const char *value,
+                               struct connection *caller,
+                               const char **error_string)
 {
   int len = strlen(value), i;
   bool havecharacter_state = FALSE;
@@ -113,7 +94,9 @@ static bool allowtake_callback(const char *value, const char **error_string)
   Verify that a given startunits string is valid.  See
   game.info.start_units.
 *************************************************************************/
-static bool startunits_callback(const char *value, const char **error_string)
+static bool startunits_callback(const char *value,
+                                struct connection *caller,
+                                const char **error_string)
 {
   int len = strlen(value), i;
   bool have_founder = FALSE;
@@ -152,7 +135,8 @@ static bool startunits_callback(const char *value, const char **error_string)
 /*************************************************************************
   Verify that a given endyear is valid.
 *************************************************************************/
-static bool endyear_callback(int value, const char **error_string)
+static bool endyear_callback(int value, struct connection *caller,
+                             const char **error_string)
 {
   if (value < game.info.year) {
     /* Tried to set endyear earlier than current year */
@@ -165,7 +149,8 @@ static bool endyear_callback(int value, const char **error_string)
 /*************************************************************************
   Verify that a given maxplayers string is valid.
 *************************************************************************/
-static bool maxplayers_callback(int value, const char **error_string)
+static bool maxplayers_callback(int value, struct connection *caller,
+                                const char **error_string)
 {
 #ifdef GGZ_SERVER
   if (with_ggz) {
@@ -182,17 +167,23 @@ static bool maxplayers_callback(int value, const char **error_string)
     return FALSE;
   }
 
-  error_string = NULL;
+  *error_string = NULL;
   return TRUE;
 }
 
 /*************************************************************************
-  Create/remove players when aifill is set.
+  Disallow low timeout values for non-hack connections.
 *************************************************************************/
-static bool aifill_callback(int value, const char **error_string)
+static bool timeout_callback(int value, struct connection *caller,
+                             const char **error_string)
 {
-  aifill(value);
-  error_string = NULL;
+  if (caller && caller->access_level < ALLOW_HACK && value < 30) {
+    *error_string = _("You are not allowed to set timeout values less "
+                      "than 30 seconds.");
+    return FALSE;
+  }
+
+  *error_string = NULL;
   return TRUE;
 }
 
@@ -417,7 +408,7 @@ struct settings_s settings[] = {
           SSET_TO_CLIENT,
 	  N_("Minimum number of players"),
 	  N_("There must be at least this many players (connected "
-	     "human players or AI players) before the game can start."),
+	     "human players) before the game can start."),
 	  NULL,
 	  GAME_MIN_MIN_PLAYERS, GAME_MAX_MIN_PLAYERS, GAME_DEFAULT_MIN_PLAYERS)
 
@@ -435,7 +426,7 @@ struct settings_s settings[] = {
 	  N_("Total number of players (including AI players)"),
 	  N_("If set to a positive value, then AI players will be "
 	     "automatically created or removed to keep the total "
-	     "number of players at this amount."), aifill_callback,
+	     "number of players at this amount."), NULL,
 	  GAME_MIN_AIFILL, GAME_MAX_AIFILL, GAME_DEFAULT_AIFILL)
 
   /* Game initialization parameters (only affect the first start of the game,
@@ -870,7 +861,7 @@ struct settings_s settings[] = {
 	   N_("Whether AI-status toggles with connection"),
 	   N_("If this is set to 1, AI status is turned off when a player "
 	      "connects, and on when a player disconnects."),
-	   autotoggle_callback, GAME_DEFAULT_AUTO_AI_TOGGLE)
+	   NULL, GAME_DEFAULT_AUTO_AI_TOGGLE)
 
   GEN_INT("endyear", game.info.end_year,
 	  SSET_META, SSET_SOCIOLOGY, SSET_VITAL, SSET_TO_CLIENT,
@@ -885,10 +876,12 @@ struct settings_s settings[] = {
 	  N_("If all players have not hit \"Turn Done\" before this "
 	     "time is up, then the turn ends automatically. Zero "
 	     "means there is no timeout. In servers compiled with "
-	     "debugging, a timeout "
-	     "of -1 sets the autogame test mode. Use this with the command "
-	     "\"timeoutincrease\" to have a dynamic timer."), NULL, 
-	   GAME_MIN_TIMEOUT, GAME_MAX_TIMEOUT, GAME_DEFAULT_TIMEOUT)
+             "debugging, a timeout of -1 sets the autogame test mode. "
+             "Only connections with hack level access may set the "
+             "timeout to lower than 30 seconds. Use this with the "
+             "command \"timeoutincrease\" to have a dynamic timer."),
+          timeout_callback,
+          GAME_MIN_TIMEOUT, GAME_MAX_TIMEOUT, GAME_DEFAULT_TIMEOUT)
 
   GEN_INT("timeaddenemymove", game.timeoutaddenemymove,
 	  SSET_META, SSET_INTERNAL, SSET_VITAL, SSET_TO_CLIENT,
diff --git a/server/settings.h b/server/settings.h
index 5a84f3b..9efc629 100644
--- a/server/settings.h
+++ b/server/settings.h
@@ -53,6 +53,14 @@ enum sset_level {
 extern const char *sset_level_names[];
 extern const int OLEVELS_NUM;
 
+typedef bool (*bool_validate_func_t)(bool value, struct connection *pconn,
+                                     const char **reject_message);
+typedef bool (*int_validate_func_t)(int value, struct connection *pconn,
+                                    const char **reject_message);
+typedef bool (*string_validate_func_t)(const char * value,
+                                       struct connection *pconn,
+                                       const char **reject_message);
+
 struct settings_s {
   const char *name;
   enum sset_class sclass;
@@ -84,18 +92,18 @@ struct settings_s {
   /*** bool part ***/
   bool *bool_value;
   bool bool_default_value;
-  bool (*bool_validate)(bool value, const char **reject_message);
+  bool_validate_func_t bool_validate;
 
   /*** int part ***/
   int *int_value;
   int int_default_value;
-  bool (*int_validate)(int value, const char **reject_message);
+  int_validate_func_t int_validate;
   int int_min_value, int_max_value;
 
   /*** string part ***/
   char *string_value;
   const char *string_default_value;
-  bool (*string_validate)(const char * value, const char **reject_message);
+  string_validate_func_t string_validate;
   size_t string_value_size;	/* max size we can write into string_value */
 };
 
diff --git a/server/srv_main.c b/server/srv_main.c
index 98b6029..b386a40 100644
--- a/server/srv_main.c
+++ b/server/srv_main.c
@@ -934,6 +934,8 @@ void save_game(char *orig_filename, const char *save_reason)
   freelog(LOG_VERBOSE, "Save time: %g seconds (%g apparent)",
 	  read_timer_seconds_free(timer_cpu),
 	  read_timer_seconds_free(timer_user));
+
+  ggz_game_saved(filename);
 }
 
 /**************************************************************************
@@ -987,12 +989,17 @@ void server_quit(void)
   set_server_state(S_S_OVER);
   server_game_free();
   diplhand_free();
+
+  /* Free all the warmap arrays */
+  free_mapqueue();
+
 #ifdef HAVE_AUTH
   if (srvarg.auth_enabled) {
     /* If auth has been initialized */
     auth_free();
   }
 #endif /* HAVE_AUTH */
+
   stdinhand_free();
   close_connections_and_socket();
   exit(EXIT_SUCCESS);
@@ -1549,11 +1556,6 @@ void aifill(int amount)
     return;
   }
 
-  if (amount == 0) {
-    /* Special case for value 0: do nothing. */
-    return;
-  }
-
   amount = MIN(amount, game.info.max_players);
 
   /* Limit to nations provided by ruleset */
@@ -1591,14 +1593,22 @@ void aifill(int amount)
     send_player_info(pplayer, NULL);
   }
 
-  remove = game.info.nplayers - 1;
-  while (game.info.nplayers > amount && remove >= 0) {
-    struct player *pplayer = player_by_number(remove);
-
-    if (!pplayer->is_connected && !pplayer->was_created) {
-      server_remove_player(pplayer);
+  while (game.info.nplayers > amount) {
+    struct player *pplayer_rem = NULL;
+    remove = game.info.nplayers - 1;
+    while (remove >= 0) {
+      struct player *pplayer = player_by_number(remove);
+      if (!pplayer->is_connected && !pplayer->was_created) {
+        pplayer_rem = pplayer;
+        break;
+      }
+      remove--;
+    }
+    if (pplayer_rem) {
+      server_remove_player(pplayer_rem);
+    } else {
+      break;
     }
-    remove--;
   }
 }
 
@@ -2064,8 +2074,8 @@ static void srv_ready(void)
 
     players_iterate(pplayer) {
       player_map_allocate(pplayer);
-      init_tech(pplayer);
-      player_limit_to_government_rates(pplayer);
+      init_tech(pplayer, TRUE);
+      pplayer->economic = player_limit_to_max_rates(pplayer);
       pplayer->economic.gold = game.info.gold;
     } players_iterate_end;
 
diff --git a/server/stdinhand.c b/server/stdinhand.c
index fb2247d..7c10456 100644
--- a/server/stdinhand.c
+++ b/server/stdinhand.c
@@ -802,9 +802,9 @@ void toggle_ai_player_direct(struct connection *caller, struct player *pplayer)
 	      _("%s is now under human control."),
 	      player_name(pplayer));
 
-    /* because the hard AI `cheats' with government rates but humans shouldn't */
+    /* because the AI `cheats' with government rates but humans shouldn't */
     if (!game.info.is_new_game) {
-      check_player_government_rates(pplayer);
+      check_player_max_rates(pplayer);
     }
     /* Remove hidden dialogs from clients. This way the player can initiate
      * new meeting */
@@ -1325,6 +1325,7 @@ static bool cmdlevel_command(struct connection *caller, char *str, bool check)
 	cmd_reply(CMD_CMDLEVEL, caller, C_OK,
 		  _("Command access level set to '%s' for connection %s."),
 		  cmdlevel_name(level), pconn->username);
+        send_conn_info(pconn->self, NULL);
       } else {
 	cmd_reply(CMD_CMDLEVEL, caller, C_FAIL,
 		  _("Command access level could not be set to '%s' for "
@@ -1373,6 +1374,7 @@ static bool cmdlevel_command(struct connection *caller, char *str, bool check)
       cmd_reply(CMD_CMDLEVEL, caller, C_OK,
 		_("Command access level set to '%s' for connection %s."),
 		cmdlevel_name(level), ptarget->username);
+      send_conn_info(ptarget->self, NULL);
     } else {
       cmd_reply(CMD_CMDLEVEL, caller, C_FAIL,
 		_("Command access level could not be set to '%s'"
@@ -1605,13 +1607,14 @@ static void show_help_option_list(struct connection *caller,
       if (may_view_option(caller, i)) {
 	cat_snprintf(buf, sizeof(buf), "%-19s", settings[i].name);
 	if ((++j % 4) == 0) {
-	  cmd_reply(help_cmd, caller, C_COMMENT, buf);
+	  cmd_reply(help_cmd, caller, C_COMMENT, "%s", buf);
 	  buf[0] = '\0';
 	}
       }
     }
-    if (buf[0] != '\0')
-      cmd_reply(help_cmd, caller, C_COMMENT, buf);
+    if (buf[0] != '\0') {
+      cmd_reply(help_cmd, caller, C_COMMENT, "%s", buf);
+    }
   }
   cmd_reply(help_cmd, caller, C_COMMENT, horiz_line);
 }
@@ -1934,7 +1937,7 @@ static bool show_command(struct connection *caller, char *str, bool check)
    cmd = -1;  /* to indicate that no comannd was specified */
   }
 
-#define cmd_reply_show(string)  cmd_reply(CMD_SHOW, caller, C_COMMENT, string)
+#define cmd_reply_show(string)  cmd_reply(CMD_SHOW, caller, C_COMMENT, "%s", string)
 
 #define OPTION_NAME_SPACE 13
   /* under 16, so it fits into 80 cols more easily - rp */
@@ -1964,8 +1967,9 @@ static bool show_command(struct connection *caller, char *str, bool check)
   cmd_reply_show(horiz_line);
   len1 = my_snprintf(buf, sizeof(buf),
 	_("%-*s value   (min,max)      "), OPTION_NAME_SPACE, _("Option"));
-  if (len1 == -1)
+  if (len1 == -1) {
     len1 = sizeof(buf) -1;
+  }
   sz_strlcat(buf, _("description"));
   cmd_reply_show(buf);
   cmd_reply_show(horiz_line);
@@ -2231,7 +2235,7 @@ static bool vote_command(struct connection *caller, char *str,
     }
     check_vote(vote);
   } else {
-    cmd_reply(CMD_VOTE, caller, C_SYNTAX, usage);
+    cmd_reply(CMD_VOTE, caller, C_SYNTAX, "%s", usage);
     goto cleanup;
   }
 
@@ -2277,7 +2281,7 @@ static bool debug_command(struct connection *caller, char *str,
     enum m_pre_result match_result;
 
     if (ntokens != 2) {
-      cmd_reply(CMD_DEBUG, caller, C_SYNTAX, usage);
+      cmd_reply(CMD_DEBUG, caller, C_SYNTAX, "%s", usage);
       goto cleanup;
     }
     pplayer = find_player_by_name_prefix(arg[1], &match_result);
@@ -2300,7 +2304,7 @@ static bool debug_command(struct connection *caller, char *str,
     enum m_pre_result match_result;
 
     if (ntokens != 2) {
-      cmd_reply(CMD_DEBUG, caller, C_SYNTAX, usage);
+      cmd_reply(CMD_DEBUG, caller, C_SYNTAX, "%s", usage);
       goto cleanup;
     }
     pplayer = find_player_by_name_prefix(arg[1], &match_result);
@@ -2341,7 +2345,7 @@ static bool debug_command(struct connection *caller, char *str,
     struct city *pcity;
 
     if (ntokens != 3) {
-      cmd_reply(CMD_DEBUG, caller, C_SYNTAX, usage);
+      cmd_reply(CMD_DEBUG, caller, C_SYNTAX, "%s", usage);
       goto cleanup;
     }
     if (sscanf(arg[1], "%d", &x) != 1 || sscanf(arg[2], "%d", &y) != 1) {
@@ -2371,7 +2375,7 @@ static bool debug_command(struct connection *caller, char *str,
     struct tile *ptile;
 
     if (ntokens != 3) {
-      cmd_reply(CMD_DEBUG, caller, C_SYNTAX, usage);
+      cmd_reply(CMD_DEBUG, caller, C_SYNTAX, "%s", usage);
       goto cleanup;
     }
     if (sscanf(arg[1], "%d", &x) != 1 || sscanf(arg[2], "%d", &y) != 1) {
@@ -2402,7 +2406,7 @@ static bool debug_command(struct connection *caller, char *str,
     struct unit *punit;
 
     if (ntokens != 2) {
-      cmd_reply(CMD_DEBUG, caller, C_SYNTAX, usage);
+      cmd_reply(CMD_DEBUG, caller, C_SYNTAX, "%s", usage);
       goto cleanup;
     }
     if (sscanf(arg[1], "%d", &id) != 1) {
@@ -2425,7 +2429,7 @@ static bool debug_command(struct connection *caller, char *str,
                unit_name_translation(punit));
     }
   } else {
-    cmd_reply(CMD_DEBUG, caller, C_SYNTAX, usage);
+    cmd_reply(CMD_DEBUG, caller, C_SYNTAX, "%s", usage);
   }
   cleanup:
   for (i = 0; i < ntokens; i++) {
@@ -2518,11 +2522,13 @@ static bool set_command(struct connection *caller, char *str, bool check)
       const char *reject_message = NULL;
       bool b_val = (val != 0);
 
-      if (settings[cmd].bool_validate
-	  && !settings[cmd].bool_validate(b_val, &reject_message)) {
-	cmd_reply(CMD_SET, caller, C_SYNTAX, reject_message);
+      if (op->bool_validate != NULL
+          && !op->bool_validate(b_val, caller, &reject_message)) {
+        cmd_reply(CMD_SET, caller, C_SYNTAX, "%s", reject_message);
         return FALSE;
-      } else if (!check) {
+      }
+
+      if (!check) {
 	*(op->bool_value) = b_val;
 	my_snprintf(buffer, sizeof(buffer),
 		    _("Option: %s has been set to %d."), op->name,
@@ -2558,11 +2564,13 @@ static bool set_command(struct connection *caller, char *str, bool check)
     } else {
       const char *reject_message = NULL;
 
-      if (settings[cmd].int_validate
-	  && !settings[cmd].int_validate(val, &reject_message)) {
-	cmd_reply(CMD_SET, caller, C_SYNTAX, reject_message);
+      if (op->int_validate != NULL
+          && !op->int_validate(val, caller, &reject_message)) {
+        cmd_reply(CMD_SET, caller, C_SYNTAX, "%s", reject_message);
         return FALSE;
-      } else if (!check) {
+      }
+
+      if (!check) {
 	*(op->int_value) = val;
 	my_snprintf(buffer, sizeof(buffer),
 		    _("Option: %s has been set to %d."), op->name,
@@ -2580,11 +2588,13 @@ static bool set_command(struct connection *caller, char *str, bool check)
     } else {
       const char *reject_message = NULL;
 
-      if (settings[cmd].string_validate
-	  && !settings[cmd].string_validate(arg, &reject_message)) {
-	cmd_reply(CMD_SET, caller, C_SYNTAX, reject_message);
+      if (op->string_validate != NULL
+          && !op->string_validate(arg, caller, &reject_message)) {
+        cmd_reply(CMD_SET, caller, C_SYNTAX, "%s", reject_message);
         return FALSE;
-      } else if (!check) {
+      }
+
+      if (!check) {
 	strcpy(op->string_value, arg);
 	my_snprintf(buffer, sizeof(buffer),
 		    _("Option: %s has been set to \"%s\"."), op->name,
@@ -2600,6 +2610,23 @@ static bool set_command(struct connection *caller, char *str, bool check)
   }
 
   if (!check && do_update) {
+
+    /* Handle immediate side-effects of special setting changes. */
+    /* FIXME: Redesign setting data structures so that this can
+     * be done in a less brittle way. */
+    if (op->int_value == &game.info.aifill) {
+      aifill(*op->int_value);
+    } else if (op->bool_value == &game.info.auto_ai_toggle) {
+      if (*op->bool_value) {
+        players_iterate(pplayer) {
+          if (!pplayer->ai.control && !pplayer->is_connected) {
+            toggle_ai_player_direct(NULL, pplayer);
+            send_player_info_c(pplayer, game.est_connections);
+          }
+        } players_iterate_end;
+      }
+    }
+
     send_server_setting(NULL, cmd);
     /* 
      * send any modified game parameters to the clients -- if sent
@@ -2614,7 +2641,10 @@ static bool set_command(struct connection *caller, char *str, bool check)
 }
 
 /**************************************************************************
- check game.allow_take for permission to take or observe a player
+  Check game.allow_take for permission to take or observe a player.
+
+  NB: If this function returns FALSE, then callers expect that 'msg' will
+  be filled in with a NULL-terminated string containing the reason.
 **************************************************************************/
 static bool is_allowed_to_take(struct player *pplayer, bool will_obs, 
                                char *msg)
@@ -2636,7 +2666,36 @@ static bool is_allowed_to_take(struct player *pplayer, bool will_obs,
     }
   } else if (!pplayer && !will_obs) {
     /* Auto-taking a new player */
-    return game.info.is_new_game && (S_S_INITIAL == server_state());
+
+    if (!game.info.is_new_game || server_state() != S_S_INITIAL) {
+      mystrlcpy(msg, _("You cannot take a new player at this time."),
+                MAX_LEN_MSG);
+      return FALSE;
+    }
+
+    if (player_count() >= game.info.max_players) {
+      my_snprintf(msg, MAX_LEN_MSG,
+                  /* TRANS: Do not translate "maxplayers". */
+                  PL_("You cannot take a new player because "
+                      "the maximum of %d player has already "
+                      "been reached (maxplayers setting).",
+                      "You cannot take a new player because "
+                      "the maximum of %d players has already "
+                      "been reached (maxplayers setting).",
+                      game.info.max_players),
+                  game.info.max_players);
+      return FALSE;
+    }
+
+    if (player_count() >= MAX_NUM_PLAYERS + MAX_NUM_BARBARIANS) {
+      mystrlcpy(msg, _("You cannot take a new player because there "
+                       "are no free player slots."),
+                MAX_LEN_MSG);
+      return FALSE;
+    }
+
+    return TRUE;
+
   } else if (is_barbarian(pplayer)) {
     if (!(allow = strchr(game.allow_take, 'b'))) {
       if (will_obs) {
@@ -2774,7 +2833,7 @@ static bool observe_command(struct connection *caller, char *str, bool check)
 
   /* check allowtake for permission */
   if (!is_allowed_to_take(pplayer, TRUE, msg)) {
-    cmd_reply(CMD_OBSERVE, caller, C_FAIL, msg);
+    cmd_reply(CMD_OBSERVE, caller, C_FAIL, "%s", msg);
     goto end;
   }
 
@@ -2941,14 +3000,14 @@ static bool take_command(struct connection *caller, char *str, bool check)
 
   /* check allowtake for permission */
   if (!is_allowed_to_take(pplayer, FALSE, msg)) {
-    cmd_reply(CMD_TAKE, caller, C_FAIL, msg);
+    cmd_reply(CMD_TAKE, caller, C_FAIL, "%s", msg);
     goto end;
   }
 
   /* taking your own player makes no sense. */
   if ((pplayer && !pconn->observer && pconn->player == pplayer)
       || (!pplayer && !pconn->observer && pconn->player)) {
-    cmd_reply(CMD_TAKE, caller, C_FAIL, _("%s already controls %s"),
+    cmd_reply(CMD_TAKE, caller, C_FAIL, _("%s already controls %s."),
               pconn->username,
               player_name(pconn->player));
     goto end;
@@ -2962,11 +3021,11 @@ static bool take_command(struct connection *caller, char *str, bool check)
       && (game.info.nplayers >= game.info.max_players
           || game.info.nplayers - game.info.nbarbarians >= game.playable_nations)) {
     cmd_reply(CMD_TAKE, caller, C_FAIL,
-              _("There is no free player slot for %s"),
+              _("There is no free player slot for %s."),
               pconn->username);
     goto end;
   }
-  assert(game.info.nplayers < MAX_NUM_PLAYERS + MAX_NUM_BARBARIANS);
+  assert(game.info.nplayers <= MAX_NUM_PLAYERS + MAX_NUM_BARBARIANS);
 
   res = TRUE;
   if (check) {
@@ -3073,7 +3132,7 @@ static bool take_command(struct connection *caller, char *str, bool check)
   send_conn_info(pconn->self, game.est_connections);
 
   if (res) {
-    cmd_reply(CMD_TAKE, caller, C_OK, _("%s now controls %s (%s, %s)"), 
+    cmd_reply(CMD_TAKE, caller, C_OK, _("%s now controls %s (%s, %s)."),
               pconn->username,
               player_name(pplayer), 
               is_barbarian(pplayer)
@@ -3085,7 +3144,7 @@ static bool take_command(struct connection *caller, char *str, bool check)
               ? _("Alive")
               : _("Dead"));
   } else {
-    cmd_reply(CMD_TAKE, caller, C_FAIL, _("%s failed to attach to any player"),
+    cmd_reply(CMD_TAKE, caller, C_FAIL, _("%s failed to attach to any player."),
               pconn->username);
   }
 
@@ -3276,7 +3335,7 @@ static void send_load_game_info(bool load_successful)
 /**************************************************************************
   ...
 **************************************************************************/
-bool load_command(struct connection *caller, char *filename, bool check)
+bool load_command(struct connection *caller, const char *filename, bool check)
 {
   struct timer *loadtimer, *uloadtimer;  
   struct section_file file;
@@ -3765,10 +3824,10 @@ static bool surrender_command(struct connection *caller, char *str, bool check)
 **************************************************************************/
 static void start_cmd_reply(struct connection *caller, bool notify, char *msg)
 {
-    cmd_reply(CMD_START_GAME, caller, C_FAIL, msg);
-    if (notify) {
-      notify_conn(NULL, NULL, E_SETTING, msg);
-    }
+  cmd_reply(CMD_START_GAME, caller, C_FAIL, "%s", msg);
+  if (notify) {
+    notify_conn(NULL, NULL, E_SETTING, "%s", msg);
+  }
 }
 
 /**************************************************************************
@@ -3776,6 +3835,8 @@ static void start_cmd_reply(struct connection *caller, bool notify, char *msg)
 **************************************************************************/
 bool start_command(struct connection *caller, bool check, bool notify)
 {
+  int human_players;
+
   switch (server_state()) {
   case S_S_INITIAL:
     /* Sanity check scenario */
@@ -3809,10 +3870,22 @@ bool start_command(struct connection *caller, bool check, bool notify)
       }
     }
 
+    human_players = 0;
+    players_iterate(plr) {
+      if (!plr->ai.control) {
+        human_players++;
+      }
+    } players_iterate_end;
+
     /* check min_players */
-    if (game.info.nplayers < game.info.min_players) {
+    if (human_players < game.info.min_players) {
       start_cmd_reply(caller, notify,
-                      _("Not enough players, game will not start."));
+                      _("Not enough human players, game will not start."));
+      return FALSE;
+    } else if (game.info.nplayers < 1) {
+      /* At least one player required */
+      start_cmd_reply(caller, notify,
+                      _("No players, game will not start."));
       return FALSE;
     } else if (game.info.nplayers - game.info.nbarbarians > game.playable_nations) {
       cmd_reply(CMD_START_GAME, caller, C_FAIL,
@@ -3862,6 +3935,7 @@ static bool cut_client_connection(struct connection *caller, char *name,
   enum m_pre_result match_result;
   struct connection *ptarget;
   struct player *pplayer;
+  bool was_connected;
 
   ptarget = find_conn_by_user_prefix(name, &match_result);
 
@@ -3872,7 +3946,8 @@ static bool cut_client_connection(struct connection *caller, char *name,
     return TRUE;
   }
 
-  pplayer = !ptarget->observer ? ptarget->player : NULL;
+  pplayer = ptarget->player;
+  was_connected = pplayer ? pplayer->is_connected : FALSE;
 
   cmd_reply(CMD_CUT, caller, C_DISCONNECTED,
 	    _("Cutting connection %s."), ptarget->username);
@@ -3880,7 +3955,7 @@ static bool cut_client_connection(struct connection *caller, char *name,
   close_connection(ptarget);
 
   /* if we cut the connection, unassign the login name */
-  if (pplayer) {
+  if (pplayer && was_connected && !pplayer->is_connected) {
     sz_strlcpy(pplayer->username, ANON_USER_NAME);
   }
   return TRUE;
@@ -3914,7 +3989,7 @@ static void show_help_intro(struct connection *caller, enum command_id help_cmd)
   astr_minsize(&abuf, strlen(help)+1);
   strcpy(abuf.str, help);
   wordwrap_string(abuf.str, 78);
-  cmd_reply(help_cmd, caller, C_COMMENT, abuf.str);
+  cmd_reply(help_cmd, caller, C_COMMENT, "%s", abuf.str);
 }
 
 /**************************************************************************
@@ -3985,13 +4060,13 @@ static void show_help_command_list(struct connection *caller,
       if (may_use(caller, i)) {
 	cat_snprintf(buf, sizeof(buf), "%-19s", commands[i].name);
 	if((++j % 4) == 0) {
-	  cmd_reply(help_cmd, caller, C_COMMENT, buf);
+	  cmd_reply(help_cmd, caller, C_COMMENT, "%s", buf);
 	  buf[0] = '\0';
 	}
       }
     }
     if (buf[0] != '\0')
-      cmd_reply(help_cmd, caller, C_COMMENT, buf);
+      cmd_reply(help_cmd, caller, C_COMMENT, "%s", buf);
   }
   cmd_reply(help_cmd, caller, C_COMMENT, horiz_line);
 }
diff --git a/server/stdinhand.h b/server/stdinhand.h
index 63945c1..e32527a 100644
--- a/server/stdinhand.h
+++ b/server/stdinhand.h
@@ -32,7 +32,8 @@ bool read_init_script(struct connection *caller, char *script_filename,
                       bool from_cmdline);
 void show_players(struct connection *caller);
 
-bool load_command(struct connection *caller, char *arg, bool check);
+bool load_command(struct connection *caller,
+		  const char *filename, bool check);
 bool start_command(struct connection *caller, bool check, bool notify);
 
 void toggle_ai_player_direct(struct connection *caller,
diff --git a/server/techtools.c b/server/techtools.c
index a72af82..a0f620d 100644
--- a/server/techtools.c
+++ b/server/techtools.c
@@ -575,7 +575,7 @@ void choose_tech_goal(struct player *plr, Tech_type_id tech)
 /****************************************************************************
   Initializes tech data for the player.
 ****************************************************************************/
-void init_tech(struct player *plr)
+void init_tech(struct player *plr, bool update)
 {
   tech_type_iterate(i) {
     set_invention(plr, i, TECH_UNKNOWN);
@@ -584,10 +584,12 @@ void init_tech(struct player *plr)
 
   get_player_research(plr)->techs_researched = 1;
 
-  /* Mark the reachable techs */
-  update_research(plr);
-  if (choose_goal_tech(plr) == A_UNSET) {
-    choose_random_tech(plr);
+  if (update) {
+    /* Mark the reachable techs */
+    update_research(plr);
+    if (choose_goal_tech(plr) == A_UNSET) {
+      choose_random_tech(plr);
+    }
   }
 }
 
diff --git a/server/techtools.h b/server/techtools.h
index 643d9cf..bab50a9 100644
--- a/server/techtools.h
+++ b/server/techtools.h
@@ -24,7 +24,7 @@ void do_tech_parasite_effect(struct player *pplayer);
 void found_new_tech(struct player *plr, Tech_type_id tech_found,
 		    bool was_discovery, bool saving_bulbs);
 void update_tech(struct player *plr, int bulbs);
-void init_tech(struct player *plr);
+void init_tech(struct player *plr, bool update);
 void choose_tech(struct player *plr, Tech_type_id tech);
 void choose_random_tech(struct player* plr);
 Tech_type_id choose_goal_tech(struct player *plr);
diff --git a/server/unittools.c b/server/unittools.c
index a4ae1a7..455a9bb 100644
--- a/server/unittools.c
+++ b/server/unittools.c
@@ -2132,7 +2132,7 @@ bool do_paradrop(struct unit *punit, struct tile *ptile)
       || is_non_allied_unit_tile(ptile, pplayer)) {
     map_show_circle(pplayer, ptile, unit_type(punit)->vision_radius_sq);
     maybe_make_contact(ptile, pplayer);
-    notify_player(pplayer, ptile, E_UNIT_LOST_ATT,
+    notify_player(pplayer, ptile, E_UNIT_LOST,
                      _("Your %s was killed by enemy units at the "
                        "paradrop destination."),
                      unit_name_translation(punit));
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1a7f0b0..edb7a5b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/utility/Makefile.in b/utility/Makefile.in
index 7dedd81..5e4f60f 100644
--- a/utility/Makefile.in
+++ b/utility/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/utility/ftwl/Makefile.in b/utility/ftwl/Makefile.in
index 612995f..cc682af 100644
--- a/utility/ftwl/Makefile.in
+++ b/utility/ftwl/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@
diff --git a/utility/md5.c b/utility/md5.c
index 0945f3a..2f6c557 100644
--- a/utility/md5.c
+++ b/utility/md5.c
@@ -62,9 +62,10 @@
 static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
 
 /**************************************************************************
- from a string, create an md5sum and store it in output in hex form
+  From a string, create an md5sum and store it in output in hex form.
 **************************************************************************/
-void create_md5sum(const char *input, int len, char output[DIGEST_HEX_BYTES])
+void create_md5sum(const char *input, int len,
+                   char output[DIGEST_HEX_BYTES + 1])
 {
   unsigned char bin_buffer[MAX_DIGEST_BIN_BYTES];
   size_t cnt;
diff --git a/utility/md5.h b/utility/md5.h
index 729a2a2..46eb96a 100644
--- a/utility/md5.h
+++ b/utility/md5.h
@@ -129,6 +129,7 @@ extern void *md5_buffer (const char *buffer, size_t len, void *resblock);
 
 #define MAX_DIGEST_BIN_BYTES DIGEST_BIN_BYTES
 
-void create_md5sum(const char *input, int len, char output[DIGEST_HEX_BYTES]);
+void create_md5sum(const char *input, int len,
+                   char output[DIGEST_HEX_BYTES + 1]);
 
 #endif
diff --git a/utility/netintf.c b/utility/netintf.c
index de4dd21..13c7004 100644
--- a/utility/netintf.c
+++ b/utility/netintf.c
@@ -338,12 +338,13 @@ const char *my_lookup_httpd(char *server, int *port, const char *url)
 {
   const char *purl, *str, *ppath, *pport;
 
-  if ((purl = getenv("http_proxy"))) {
+  if ((purl = getenv("http_proxy")) && purl[0] != '\0') {
     if (strncmp(purl, "http://", strlen("http://")) != 0) {
       return NULL;
     }
     str = purl;
   } else {
+    purl = NULL;
     if (strncmp(url, "http://", strlen("http://")) != 0) {
       return NULL;
     }
@@ -351,7 +352,7 @@ const char *my_lookup_httpd(char *server, int *port, const char *url)
   }
 
   str += strlen("http://");
-  
+
   pport = strchr(str, ':');
   ppath = strchr(str, '/');
 
diff --git a/utility/registry.c b/utility/registry.c
index 887faf2..f2ea563 100644
--- a/utility/registry.c
+++ b/utility/registry.c
@@ -1552,7 +1552,7 @@ int *secfile_lookup_int_vec(struct section_file *my_section_file,
   my_vsnprintf(buf, sizeof(buf), path, ap);
   va_end(ap);
 
-  *dimen = secfile_lookup_vec_dimen(my_section_file, buf);
+  *dimen = secfile_lookup_vec_dimen(my_section_file, "%s", buf);
   if (*dimen == 0) {
     return NULL;
   }
@@ -1584,7 +1584,7 @@ char **secfile_lookup_str_vec(struct section_file *my_section_file,
   my_vsnprintf(buf, sizeof(buf), path, ap);
   va_end(ap);
 
-  *dimen = secfile_lookup_vec_dimen(my_section_file, buf);
+  *dimen = secfile_lookup_vec_dimen(my_section_file, "%s", buf);
   if (*dimen == 0) {
     return NULL;
   }
diff --git a/utility/shared.c b/utility/shared.c
index 724b513..c4d13ce 100644
--- a/utility/shared.c
+++ b/utility/shared.c
@@ -40,6 +40,7 @@
 #ifdef WIN32_NATIVE
 #include <windows.h>
 #include <lmcons.h>	/* UNLEN */
+#include <shlobj.h>
 #endif
 
 #include "astring.h"
@@ -775,12 +776,36 @@ char *user_home_dir(void)
       home_dir = mystrdup(env);	        /* never free()d */
       freelog(LOG_VERBOSE, "HOME is %s", home_dir);
     } else {
+
 #ifdef WIN32_NATIVE
-      home_dir=fc_malloc(PATH_MAX);
-      if (!getcwd(home_dir,PATH_MAX)) {
-	free(home_dir);
-	home_dir=NULL;
-	freelog(LOG_ERROR, "Could not find home directory (HOME is not set)");
+
+      /* some documentation at: 
+       * http://justcheckingonall.wordpress.com/2008/05/16/find-shell-folders-win32/
+       * http://archives.seul.org/or/cvs/Oct-2004/msg00082.html */
+
+      LPITEMIDLIST pidl;
+      LPMALLOC pMalloc;
+      
+      if (SUCCEEDED(SHGetSpecialFolderLocation(NULL, CSIDL_APPDATA, &pidl))) {
+        
+        home_dir = fc_malloc(PATH_MAX);
+        
+        if (!SUCCEEDED(SHGetPathFromIDList(pidl, home_dir))) {
+          free(home_dir);
+          home_dir = NULL;
+          freelog(LOG_ERROR,
+            "Could not find home directory (SHGetPathFromIDList() failed)");
+        }
+        
+        SHGetMalloc(&pMalloc);
+        if (pMalloc) {
+          pMalloc->lpVtbl->Free(pMalloc, pidl);
+          pMalloc->lpVtbl->Release(pMalloc);
+        }
+
+      } else {
+        freelog(LOG_ERROR,
+          "Could not find home directory (SHGetSpecialFolderLocation() failed)");
       }
 #else
       freelog(LOG_ERROR, "Could not find home directory (HOME is not set)");
@@ -1663,9 +1688,15 @@ bool path_is_absolute(const char *filename)
     return FALSE;
   }
 
+#ifdef WIN32_NATIVE
+  if (strchr(filename, ':')) {
+    return TRUE;
+  }
+#else
   if (filename[0] == '/') {
     return TRUE;
   }
+#endif  
 
   return FALSE;
 }
diff --git a/version.in b/version.in
index e469ca6..3c0865e 100644
--- a/version.in
+++ b/version.in
@@ -6,13 +6,13 @@ FREECIV_VERSION_COMMENT("  are defined differently depending on          ")
 FREECIV_VERSION_COMMENT("  language used. Don't add comments             ")
 FREECIV_VERSION_COMMENT("  specific to some language into this file.     ")
 
-FREECIV_VERSION_INFO(2,1,5,[""])
+FREECIV_VERSION_INFO(2,1,8,[""])
 
 FREECIV_DEVEL_VERSION(0)
 FREECIV_BETA_VERSION(0)
 
-FREECIV_NEXT_VERSION(["2.1.6"])
-FREECIV_RELEASE_MONTH(7)
+FREECIV_NEXT_VERSION(["2.1.9"])
+FREECIV_RELEASE_MONTH(1)
 
 # Freeciv network capstring: see documentation in common/capstr.c
 #
@@ -24,4 +24,4 @@ FREECIV_RELEASE_MONTH(7)
 #   - Avoid adding a new manditory capability to the development branch for
 #     as long as possible.  We want to maintain network compatibility with
 #     the stable branch for as long as possible.
-FREECIV_NETWORK_CAPSTRING(["+2.1g CreatedName"])
+FREECIV_NETWORK_CAPSTRINGS(["+2.1g"],["CreatedName"])
diff --git a/win32/Makefile.in b/win32/Makefile.in
index 9fa21f6..671edaa 100644
--- a/win32/Makefile.in
+++ b/win32/Makefile.in
@@ -104,6 +104,7 @@ GMSGFMT = @GMSGFMT@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
 GZIP = @GZIP@
+HAVE_LIB = @HAVE_LIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
@@ -111,6 +112,7 @@ INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LDFLAGS = @LDFLAGS@
+LIB = @LIB@
 LIBGGZ_INCLUDES = @LIBGGZ_INCLUDES@
 LIBGGZ_LDFLAGS = @LIBGGZ_LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -120,12 +122,15 @@ LIB_GGZDMOD = @LIB_GGZDMOD@
 LIB_GGZMOD = @LIB_GGZMOD@
 LIB_GGZ_GTK = @LIB_GGZ_GTK@
 LN_S = @LN_S@
+LTLIB = @LTLIB@
+LTLIBICONV = @LTLIBICONV@
 MAINT = @MAINT@
 MAJOR_VERSION = @MAJOR_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-NETWORK_CAPSTRING = @NETWORK_CAPSTRING@
+NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
+NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 POFILES = @POFILES@

-- 
Civilization turn-based strategy game



More information about the Pkg-games-commits mailing list